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 ta...@apache.org on 2007/10/24 07:04:17 UTC
svn commit: r587787 - in /portals/jetspeed-2/branches/JETSPEED-2.1.3:
layout-portlets/src/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java
xdocs/guides/guide-aggregation.xml
Author: taylor
Date: Tue Oct 23 22:04:16 2007
New Revision: 587787
URL: http://svn.apache.org/viewvc?rev=587787&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-785
Modified:
portals/jetspeed-2/branches/JETSPEED-2.1.3/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java
portals/jetspeed-2/branches/JETSPEED-2.1.3/xdocs/guides/guide-aggregation.xml
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java?rev=587787&r1=587786&r2=587787&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java Tue Oct 23 22:04:16 2007
@@ -162,7 +162,7 @@
TemplateDescriptor template = null;
Configuration props = getConfiguration(request, helpPage);
String ext = (String) props.getString(TEMPLATE_EXTENSION_KEY);
- String path = helpPage + "/" + JetspeedPowerTool.LAYOUT_TEMPLATE_TYPE + ext;
+ String path = helpPage + "/" + JetspeedPowerTool.LAYOUT_TEMPLATE_TYPE + "-help" + ext;
template = jpt.getTemplate(path, JetspeedPowerTool.LAYOUT_TEMPLATE_TYPE);
if (template == null)
{
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/xdocs/guides/guide-aggregation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/xdocs/guides/guide-aggregation.xml?rev=587787&r1=587786&r2=587787&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/xdocs/guides/guide-aggregation.xml (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/xdocs/guides/guide-aggregation.xml Tue Oct 23 22:04:16 2007
@@ -58,6 +58,12 @@
<td>no*</td>
<td>yes</td>
</tr>
+ <tr>
+ <td>AsyncPageAggregator + CommonJ</td>
+ <td>A multi-threaded, asynchronous PSML page aggregator running CommonJ Work Monitor threads, tested only with IBM Websphere 6.1 only.</td>
+ <td>yes</td>
+ <td>yes</td>
+ </tr>
</table>
<i>* multi-threading is accomplished with the Jetspeed Desktop combined with the PortletAggregator</i>
</section>
@@ -228,7 +234,7 @@
</bean>
]]>
<p>
- Also replace all references to org.apache.jetspeed.aggregator.WorkerMonitor with org.apache.jetspeed.aggregator.CommonjWorkerMonitor in WEB-INF/assembly/aggregation.xml:
+ Also replace all references to org.apache.jetspeed.aggregator.WorkerMonitor with org.apache.jetspeed.aggregator.CommonjWorkerMonitor in WEB-INF/assembly/aggregation.xml.
</p>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org