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 2005/06/23 04:59:28 UTC
svn commit: r193057 -
/portals/jetspeed-2/trunk/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
Author: taylor
Date: Wed Jun 22 19:59:27 2005
New Revision: 193057
URL: http://svn.apache.org/viewcvs?rev=193057&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-266
The content search pathes of page omit portlet-decorator
Modified:
portals/jetspeed-2/trunk/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
Modified: portals/jetspeed-2/trunk/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java?rev=193057&r1=193056&r2=193057&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java (original)
+++ portals/jetspeed-2/trunk/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java Wed Jun 22 19:59:27 2005
@@ -116,6 +116,10 @@
// define the lookup order
contentPathes.add(root.getType() + "/" + mediaType + "/" + layoutDecorator);
+ // Start added by jamesliao, 27-05-2005
+ contentPathes.add(ContentFragment.PORTLET + "/" + mediaType + "/" + defaultPortletDecorator);
+ // End
+
Iterator defaults = fallBackContentPathes.iterator();
while (defaults.hasNext())
{
@@ -127,6 +131,9 @@
else
{
contentPathes.set(0, root.getType() + "/" + mediaType + "/" + layoutDecorator);
+ // Start added by jamesliao, 27-05-2005, override the previous portlet-decorator
+ contentPathes.set(1, ContentFragment.PORTLET + "/" + mediaType + "/" + defaultPortletDecorator);
+ // End
}
if (layoutDecorator != null)
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org