You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by wo...@apache.org on 2009/11/24 19:57:17 UTC
svn commit: r883813 - in /portals/jetspeed-2/portal/trunk:
components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
jetspeed-api/src/main/java/org/apache/jetspeed/PortalReservedParameters.java
Author: woonsan
Date: Tue Nov 24 18:57:17 2009
New Revision: 883813
URL: http://svn.apache.org/viewvc?rev=883813&view=rev
Log:
JS2-1086: Adding a metadata field for jetspeed-portlet.xml to define portlet preview image url. Also small clean up in using timeout metadata in portlet renderer.
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/PortalReservedParameters.java
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java?rev=883813&r1=883812&r2=883813&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java Tue Nov 24 18:57:17 2009
@@ -363,18 +363,15 @@
timeoutFields = portletDefinition.getMetadata().getFields(PortalReservedParameters.PORTLET_EXTENDED_DESCRIPTOR_RENDER_TIMEOUT);
}
- if (timeoutFields != null)
+ if (timeoutFields != null && !timeoutFields.isEmpty())
{
- for (LocalizedField timeoutField : timeoutFields)
+ try
{
- try
- {
- timeoutMetadata = Long.parseLong(timeoutField.getValue());
- }
- catch (NumberFormatException nfe)
- {
- log.warn("Invalid timeout metadata: " + nfe.getMessage());
- }
+ timeoutMetadata = Long.parseLong(timeoutFields.iterator().next().getValue());
+ }
+ catch (NumberFormatException nfe)
+ {
+ log.warn("Invalid timeout metadata: " + nfe.getMessage());
}
}
return timeoutMetadata;
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/PortalReservedParameters.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/PortalReservedParameters.java?rev=883813&r1=883812&r2=883813&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/PortalReservedParameters.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/PortalReservedParameters.java Tue Nov 24 18:57:17 2009
@@ -97,6 +97,7 @@
* which never participate with other portlets.
*/
public static final String PORTLET_EXTENDED_DESCRIPTOR_NON_STANDARD_ACTION = "nonStandardAction";
+
/**
* A portlet can have a specific setting for the timeout duration that the portal will wait
* before it gives up on rendering the portlet. This value overrides the system setting.
@@ -105,6 +106,12 @@
public static final String PORTLET_EXTENDED_DESCRIPTOR_RENDER_TIMEOUT = "timeout";
/**
+ * A portlet can have a specific setting for the preview image.
+ * The portlet preview image url
+ */
+ public static final String PORTLET_EXTENDED_DESCRIPTOR_PREVIEW_IMAGE = "portlet.preview.image";
+
+ /**
* Until version 2.1, Jetspeed merged portal request parameters with portlet specific
* parameters, effectively allowing "shared" parameters.
* <p>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org