--- pal/pal-portal/portal/patches/layout-portlets/src/webapp/WEB-INF/portlet.xml	2007/03/07 22:14:22	1.3
+++ pal/pal-portal/portal/patches/layout-portlets/src/webapp/WEB-INF/portlet.xml	2007/03/14 22:10:57	1.4
@@ -44,15 +44,6 @@
     <init-param>
        <name>ViewPage</name>
        <value>columns</value>
-@@ -70,7 +42,7 @@
-     </init-param>
-     <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
-     <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
--    <expiration-cache>0</expiration-cache>
-+    <expiration-cache>-1</expiration-cache>
-     <supports>
-       <mime-type>text/html</mime-type>
-       <portlet-mode>view</portlet-mode>
 @@ -78,58 +50,15 @@
        <portlet-mode>help</portlet-mode>      
      </supports>
@@ -115,7 +106,7 @@
      <init-param>
        <name>ViewPage</name>
        <value>columns</value>
-@@ -150,13 +79,9 @@
+@@ -150,10 +79,6 @@
        <name>layoutType</name>
        <value>TwoColumns</value>
      </init-param>
@@ -125,11 +116,7 @@
 -    </init-param> -->
      <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
      <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
--    <expiration-cache>0</expiration-cache>
-+    <expiration-cache>-1</expiration-cache>
-     <supports>
-       <mime-type>text/html</mime-type>
-       <portlet-mode>view</portlet-mode>
+     <expiration-cache>0</expiration-cache>
 @@ -164,17 +89,15 @@
        <portlet-mode>help</portlet-mode>      
      </supports>
@@ -162,13 +149,7 @@
      </init-param>
      <init-param>
        <name>layoutType</name>
-@@ -197,26 +120,23 @@
-     </init-param>
-     <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
-     <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
--    <expiration-cache>0</expiration-cache>
-+    <expiration-cache>-1</expiration-cache>
-     <supports>
+@@ -202,21 +125,18 @@
        <mime-type>text/html</mime-type>
        <portlet-mode>view</portlet-mode>
        <portlet-mode>edit</portlet-mode>
@@ -197,7 +178,7 @@
      <init-param>
        <name>ViewPage</name>
        <value>columns</value>
-@@ -227,40 +147,38 @@
+@@ -227,15 +147,15 @@
      </init-param>
      <init-param>
        <name>columns</name>
@@ -216,9 +197,7 @@
      </init-param>
      <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
      <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
--    <expiration-cache>0</expiration-cache>
-+    <expiration-cache>-1</expiration-cache>
-     <supports>
+@@ -244,23 +164,21 @@
        <mime-type>text/html</mime-type>
        <portlet-mode>view</portlet-mode>
        <portlet-mode>edit</portlet-mode>
@@ -250,7 +229,7 @@
      </init-param>
      <init-param>
        <name>MaxPage</name>
-@@ -268,37 +186,35 @@
+@@ -268,15 +186,15 @@
      </init-param>
      <init-param>
        <name>columns</name>
@@ -269,9 +248,7 @@
      </init-param>
      <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
      <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
--    <expiration-cache>0</expiration-cache>
-+    <expiration-cache>-1</expiration-cache>
-     <supports>
+@@ -285,20 +203,18 @@
        <mime-type>text/html</mime-type>
        <portlet-mode>view</portlet-mode>
        <portlet-mode>edit</portlet-mode>
@@ -299,7 +276,7 @@
      <init-param>
        <name>ViewPage</name>
        <value>columns</value>
-@@ -309,35 +225,35 @@
+@@ -309,15 +225,15 @@
      </init-param>
      <init-param>
        <name>columns</name>
@@ -318,8 +295,7 @@
      </init-param>
      <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
      <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
--    <expiration-cache>0</expiration-cache>
-+    <expiration-cache>-1</expiration-cache>
+@@ -325,19 +241,19 @@
      <supports>
        <mime-type>text/html</mime-type>
        <portlet-mode>view</portlet-mode>
@@ -347,7 +323,7 @@
      <init-param>
        <name>ViewPage</name>
        <value>columns</value>
-@@ -348,35 +264,35 @@
+@@ -348,15 +264,15 @@
      </init-param>
      <init-param>
        <name>columns</name>
@@ -366,8 +342,7 @@
      </init-param>
      <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
      <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
--    <expiration-cache>0</expiration-cache>
-+    <expiration-cache>-1</expiration-cache>
+@@ -364,19 +280,19 @@
      <supports>
        <mime-type>text/html</mime-type>
        <portlet-mode>view</portlet-mode>
@@ -404,12 +379,7 @@
      </init-param>
      <init-param>
        <name>layoutType</name>
-@@ -399,22 +315,23 @@
-     </init-param>
-     <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
-     <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
--    <expiration-cache>0</expiration-cache>
-+    <expiration-cache>-1</expiration-cache>
+@@ -403,18 +319,19 @@
      <supports>
        <mime-type>text/html</mime-type>
        <portlet-mode>view</portlet-mode>
@@ -437,7 +407,7 @@
      <init-param>
        <name>ViewPage</name>
        <value>columns</value>
-@@ -425,38 +342,38 @@
+@@ -425,15 +342,15 @@
      </init-param>
      <init-param>
        <name>columns</name>
@@ -456,8 +426,7 @@
      </init-param>
      <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
      <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
--    <expiration-cache>0</expiration-cache>
-+    <expiration-cache>-1</expiration-cache>
+@@ -441,22 +358,22 @@
      <supports>
        <mime-type>text/html</mime-type>
        <portlet-mode>view</portlet-mode>
@@ -490,7 +459,7 @@
      </init-param>
      <init-param>
        <name>MaxPage</name>
-@@ -472,29 +389,25 @@
+@@ -472,7 +389,7 @@
      </init-param>
      <init-param>
        <name>layoutType</name>
@@ -499,8 +468,7 @@
      </init-param>
      <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
      <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
--    <expiration-cache>0</expiration-cache>
-+    <expiration-cache>-1</expiration-cache>
+@@ -480,21 +397,17 @@
      <supports>
        <mime-type>text/html</mime-type>
        <portlet-mode>view</portlet-mode>
@@ -529,7 +497,7 @@
      <init-param>
        <name>ViewPage</name>
        <value>columns</value>
-@@ -505,38 +418,36 @@
+@@ -505,15 +418,15 @@
      </init-param>
      <init-param>
        <name>columns</name>
@@ -548,10 +516,7 @@
      </init-param>
      <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
      <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
--    <expiration-cache>0</expiration-cache>
-+    <expiration-cache>-1</expiration-cache>
-     <supports>
-       <mime-type>text/html</mime-type>
+@@ -523,20 +436,18 @@
        <portlet-mode>view</portlet-mode>
      </supports>
      <portlet-info>
@@ -579,12 +544,7 @@
      </init-param>
      <init-param>
        <name>MaxPage</name>
-@@ -556,24 +467,21 @@
-     </init-param>
-     <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
-     <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
--    <expiration-cache>0</expiration-cache>
-+    <expiration-cache>-1</expiration-cache>
+@@ -560,20 +471,17 @@
      <supports>
        <mime-type>text/html</mime-type>
        <portlet-mode>view</portlet-mode>
@@ -611,7 +571,7 @@
      <init-param>
        <name>ViewPage</name>
        <value>columns</value>
-@@ -584,30 +492,29 @@
+@@ -584,15 +492,15 @@
      </init-param>
      <init-param>
        <name>columns</name>
@@ -630,8 +590,7 @@
      </init-param>
      <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
      <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
--    <expiration-cache>0</expiration-cache>
-+    <expiration-cache>-1</expiration-cache>
+@@ -600,14 +508,13 @@
      <supports>
        <mime-type>text/html</mime-type>
        <portlet-mode>view</portlet-mode>