Author: hoang_to Date: 2011-04-21 04:06:47 -0400 (Thu, 21 Apr 2011) New Revision: 6312 Removed: portal/branches/global-portlet-metadata/webui/portal/src/main/java/org/exoplatform/portal/application/PortletStatisticLifecycle.java Modified: portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/ActionProcessingPerformanceFilter.java portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/EventHandlingPerformanceFilter.java portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/RenderPerformanceFilter.java portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/ResourceServingPerformanceFilter.java portal/branches/global-portlet-metadata/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/DashboardPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/TabbedDashboardPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/gadget/GadgetPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AccountPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AdminToolbarPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/ApplicationRegistryPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/GroupNavigationPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/OrganizationPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PageManagementPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PortalNavigationPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/RegisterPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/StarToolbarPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserInfoPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarDashboardPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarGroupPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarSitePortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BannerPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BreadcumbsPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FCKEditorPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FooterPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/HomePagePortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/IFramePortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LoginPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LogoPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/NavigationPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/PortalNavigationPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/SitemapPortlet/webui/configuration.xml Log: Remove legacy portlet monitoring Modified: portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/ActionProcessingPerformanceFilter.java =================================================================== --- portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/ActionProcessingPerformanceFilter.java 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/ActionProcessingPerformanceFilter.java 2011-04-21 08:06:47 UTC (rev 6312) @@ -21,6 +21,7 @@ import java.io.IOException; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; +import javax.portlet.PortletConfig; import javax.portlet.PortletException; import javax.portlet.filter.ActionFilter; import javax.portlet.filter.FilterChain; @@ -39,6 +40,24 @@ public void doFilter(ActionRequest request, ActionResponse response, FilterChain chain) throws IOException, PortletException { + long startTime = System.currentTimeMillis(); + + chain.doFilter(request, response); + + String portletName = ""; + + PortletConfig portletConfig = (PortletConfig)request.getAttribute("javax.portlet.config"); + if(portletConfig != null) + { + portletName = portletConfig.getPortletName(); + } + + String portletWindowID = portletName + "-" + request.getWindowID(); + + long endTime = System.currentTimeMillis(); + + System.out.println("Processing action on portlet " + portletWindowID + " takes " + (endTime - startTime) + " ms"); + } public void destroy() Modified: portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/EventHandlingPerformanceFilter.java =================================================================== --- portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/EventHandlingPerformanceFilter.java 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/EventHandlingPerformanceFilter.java 2011-04-21 08:06:47 UTC (rev 6312) @@ -21,6 +21,7 @@ import java.io.IOException; import javax.portlet.EventRequest; import javax.portlet.EventResponse; +import javax.portlet.PortletConfig; import javax.portlet.PortletException; import javax.portlet.filter.EventFilter; import javax.portlet.filter.FilterChain; @@ -39,6 +40,25 @@ public void doFilter(EventRequest request, EventResponse response, FilterChain chain) throws IOException, PortletException { + long startTime = System.currentTimeMillis(); + + chain.doFilter(request, response); + + String portletName = ""; + + PortletConfig portletConfig = (PortletConfig)request.getAttribute("javax.portlet.config"); + if(portletConfig != null) + { + portletName = portletConfig.getPortletName(); + } + + String portletWindowID = portletName + "-" + request.getWindowID(); + + String eventName = request.getEvent().getName(); + + long endTime = System.currentTimeMillis(); + + System.out.println("Handling the event " + eventName + " on portlet window " + portletWindowID + " takes " + (endTime - startTime) + " ms"); } public void destroy() Modified: portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/RenderPerformanceFilter.java =================================================================== --- portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/RenderPerformanceFilter.java 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/RenderPerformanceFilter.java 2011-04-21 08:06:47 UTC (rev 6312) @@ -46,6 +46,8 @@ { long startTime = System.currentTimeMillis(); + chain.doFilter(request, response); + String portletName = ""; PortletConfig portletConfig = (PortletConfig)request.getAttribute("javax.portlet.config"); @@ -56,11 +58,9 @@ String portletWindowID = portletName + "-" + request.getWindowID(); - chain.doFilter(request, response); - long endTime = System.currentTimeMillis(); - System.out.println("RENDERING PORTLET " + portletWindowID + " TAKES " + (endTime - startTime) + " MILLISECONDS"); + System.out.println("Rendering portlet window " + portletWindowID + " takes " + (endTime - startTime) + " ms"); } Modified: portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/ResourceServingPerformanceFilter.java =================================================================== --- portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/ResourceServingPerformanceFilter.java 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/ResourceServingPerformanceFilter.java 2011-04-21 08:06:47 UTC (rev 6312) @@ -19,6 +19,7 @@ package org.exoplatform.portal.pc.filter; import java.io.IOException; +import javax.portlet.PortletConfig; import javax.portlet.PortletException; import javax.portlet.ResourceRequest; import javax.portlet.ResourceResponse; @@ -38,6 +39,24 @@ public void doFilter(ResourceRequest request, ResourceResponse response, FilterChain chain) throws IOException, PortletException { + long startTime = System.currentTimeMillis(); + + chain.doFilter(request, response); + + String portletName = ""; + + PortletConfig portletConfig = (PortletConfig)request.getAttribute("javax.portlet.config"); + if(portletConfig != null) + { + portletName = portletConfig.getPortletName(); + } + + String portletWindowID = portletName + "-" + request.getWindowID(); + + long endTime = System.currentTimeMillis(); + + System.out.println("Serving resource request to resource " + request.getResourceID() + " on portlet window " + portletWindowID + " takes " + + (endTime - startTime) + " ms"); } public void destroy() Modified: portal/branches/global-portlet-metadata/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/DashboardPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/DashboardPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/DashboardPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/TabbedDashboardPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/TabbedDashboardPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/TabbedDashboardPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/gadget/GadgetPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/gadget/GadgetPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/gadget/GadgetPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AccountPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AccountPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AccountPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AdminToolbarPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AdminToolbarPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AdminToolbarPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/ApplicationRegistryPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/ApplicationRegistryPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/ApplicationRegistryPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/GroupNavigationPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/GroupNavigationPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/GroupNavigationPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/OrganizationPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/OrganizationPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/OrganizationPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PageManagementPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PageManagementPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PageManagementPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PortalNavigationPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PortalNavigationPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PortalNavigationPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/RegisterPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/RegisterPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/RegisterPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/StarToolbarPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/StarToolbarPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/StarToolbarPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserInfoPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserInfoPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserInfoPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarDashboardPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarDashboardPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarDashboardPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarGroupPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarGroupPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarGroupPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarSitePortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarSitePortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarSitePortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BannerPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BannerPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BannerPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BreadcumbsPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BreadcumbsPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BreadcumbsPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FCKEditorPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FCKEditorPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FCKEditorPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FooterPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FooterPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FooterPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/HomePagePortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/HomePagePortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/HomePagePortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/IFramePortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/IFramePortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/IFramePortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LoginPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LoginPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LoginPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LogoPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LogoPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LogoPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/NavigationPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/NavigationPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/NavigationPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/PortalNavigationPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/PortalNavigationPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/PortalNavigationPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/SitemapPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/SitemapPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/SitemapPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -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> Deleted: portal/branches/global-portlet-metadata/webui/portal/src/main/java/org/exoplatform/portal/application/PortletStatisticLifecycle.java =================================================================== --- portal/branches/global-portlet-metadata/webui/portal/src/main/java/org/exoplatform/portal/application/PortletStatisticLifecycle.java 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/webui/portal/src/main/java/org/exoplatform/portal/application/PortletStatisticLifecycle.java 2011-04-21 08:06:47 UTC (rev 6312) @@ -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