Index: D:/eclipse301/eclipse/workspace/jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed-spring.xml
===================================================================
--- D:/eclipse301/eclipse/workspace/jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed-spring.xml	(revision 190581)
+++ D:/eclipse301/eclipse/workspace/jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed-spring.xml	(working copy)
@@ -385,7 +385,7 @@
   	   <constructor-arg index="1"><value>0</value></constructor-arg>
   	   
	   <constructor-arg index="2">
	    <list>

-  	   	<value>portlet/{mediaType}/jetspeed</value>

+  	   	<!--<value>portlet/{mediaType}/jetspeed</value>-->
   	   		
		<value>portlet/{mediaType}</value>
   	   		
		<value>layout/{mediaType}</value>
   	   		
		<value>generic/{mediaType}</value>  	   		
		
		
Index: D:/eclipse301/eclipse/workspace/jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
===================================================================
--- D:/eclipse301/eclipse/workspace/jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java	(revision 190581)
+++ D:/eclipse301/eclipse/workspace/jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java	(working copy)
@@ -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)