[gatein-commits] gatein SVN: r6452 - in portal/trunk: packaging/jetty/pkg/src/main/resources/jetty/gatein/conf and 1 other directory.
Author: julien_viet
Date: 2011-05-09 10:09:37 -0400 (Mon, 09 May 2011)
New Revision: 6452
Added:
portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/portlet.xml
Modified:
portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java
Log:
GTNPORTAL-1889 : fix configuration (it was broken due to me) + missing portlet.xml file
for Jetty
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-09
13:32:31 UTC (rev 6451)
+++
portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java 2011-05-09
14:09:37 UTC (rev 6452)
@@ -53,7 +53,7 @@
{
md.setResourceBundleFactoryName(ExoResourceBundleFactory.class.getName());
- String globalPortletLocation =
PropertyManager.getProperty("gatein.portlet.conf");
+ String globalPortletLocation =
PropertyManager.getProperty("gatein.portlet.config");
if (globalPortletLocation != null)
{
try
Added: portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/portlet.xml
===================================================================
--- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/portlet.xml
(rev 0)
+++
portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/portlet.xml 2011-05-09
14:09:37 UTC (rev 6452)
@@ -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...
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>