Develop and Download Open Source Software

Portal Application Laboratory

Browse CVS Repository

/[OSDN]/pal/pal-portal/portal/patches/layout-portlets/src/webapp/WEB-INF/portlet.xml

Diff of /pal/pal-portal/portal/patches/layout-portlets/src/webapp/WEB-INF/portlet.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.3 by shinsuke, Wed Mar 7 22:14:22 2007 UTC revision 1.4 by shinsuke, Wed Mar 14 22:10:57 2007 UTC
# Line 44  Index: layout-portlets/src/webapp/WEB-IN Line 44  Index: layout-portlets/src/webapp/WEB-IN
44      <init-param>      <init-param>
45         <name>ViewPage</name>         <name>ViewPage</name>
46         <value>columns</value>         <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>  
47  @@ -78,58 +50,15 @@  @@ -78,58 +50,15 @@
48         <portlet-mode>help</portlet-mode>               <portlet-mode>help</portlet-mode>      
49       </supports>       </supports>
# Line 115  Index: layout-portlets/src/webapp/WEB-IN Line 106  Index: layout-portlets/src/webapp/WEB-IN
106       <init-param>       <init-param>
107         <name>ViewPage</name>         <name>ViewPage</name>
108         <value>columns</value>         <value>columns</value>
109  @@ -150,13 +79,9 @@  @@ -150,10 +79,6 @@
110         <name>layoutType</name>         <name>layoutType</name>
111         <value>TwoColumns</value>         <value>TwoColumns</value>
112       </init-param>       </init-param>
# Line 125  Index: layout-portlets/src/webapp/WEB-IN Line 116  Index: layout-portlets/src/webapp/WEB-IN
116  -    </init-param> -->  -    </init-param> -->
117       <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>       <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
118       <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>       <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
119  -    <expiration-cache>0</expiration-cache>       <expiration-cache>0</expiration-cache>
 +    <expiration-cache>-1</expiration-cache>  
      <supports>  
        <mime-type>text/html</mime-type>  
        <portlet-mode>view</portlet-mode>  
120  @@ -164,17 +89,15 @@  @@ -164,17 +89,15 @@
121         <portlet-mode>help</portlet-mode>               <portlet-mode>help</portlet-mode>      
122       </supports>       </supports>
# Line 162  Index: layout-portlets/src/webapp/WEB-IN Line 149  Index: layout-portlets/src/webapp/WEB-IN
149       </init-param>       </init-param>
150       <init-param>       <init-param>
151         <name>layoutType</name>         <name>layoutType</name>
152  @@ -197,26 +120,23 @@  @@ -202,21 +125,18 @@
      </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>  
153         <mime-type>text/html</mime-type>         <mime-type>text/html</mime-type>
154         <portlet-mode>view</portlet-mode>         <portlet-mode>view</portlet-mode>
155         <portlet-mode>edit</portlet-mode>         <portlet-mode>edit</portlet-mode>
# Line 197  Index: layout-portlets/src/webapp/WEB-IN Line 178  Index: layout-portlets/src/webapp/WEB-IN
178       <init-param>       <init-param>
179         <name>ViewPage</name>         <name>ViewPage</name>
180         <value>columns</value>         <value>columns</value>
181  @@ -227,40 +147,38 @@  @@ -227,15 +147,15 @@
182       </init-param>       </init-param>
183       <init-param>       <init-param>
184         <name>columns</name>         <name>columns</name>
# Line 216  Index: layout-portlets/src/webapp/WEB-IN Line 197  Index: layout-portlets/src/webapp/WEB-IN
197       </init-param>       </init-param>
198       <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>       <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
199       <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>       <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
200  -    <expiration-cache>0</expiration-cache>  @@ -244,23 +164,21 @@
 +    <expiration-cache>-1</expiration-cache>  
      <supports>  
201         <mime-type>text/html</mime-type>         <mime-type>text/html</mime-type>
202         <portlet-mode>view</portlet-mode>         <portlet-mode>view</portlet-mode>
203         <portlet-mode>edit</portlet-mode>         <portlet-mode>edit</portlet-mode>
# Line 250  Index: layout-portlets/src/webapp/WEB-IN Line 229  Index: layout-portlets/src/webapp/WEB-IN
229       </init-param>       </init-param>
230       <init-param>       <init-param>
231         <name>MaxPage</name>         <name>MaxPage</name>
232  @@ -268,37 +186,35 @@  @@ -268,15 +186,15 @@
233       </init-param>       </init-param>
234       <init-param>       <init-param>
235         <name>columns</name>         <name>columns</name>
# Line 269  Index: layout-portlets/src/webapp/WEB-IN Line 248  Index: layout-portlets/src/webapp/WEB-IN
248       </init-param>       </init-param>
249       <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>       <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
250       <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>       <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
251  -    <expiration-cache>0</expiration-cache>  @@ -285,20 +203,18 @@
 +    <expiration-cache>-1</expiration-cache>  
      <supports>  
252         <mime-type>text/html</mime-type>         <mime-type>text/html</mime-type>
253         <portlet-mode>view</portlet-mode>         <portlet-mode>view</portlet-mode>
254         <portlet-mode>edit</portlet-mode>         <portlet-mode>edit</portlet-mode>
# Line 299  Index: layout-portlets/src/webapp/WEB-IN Line 276  Index: layout-portlets/src/webapp/WEB-IN
276       <init-param>       <init-param>
277         <name>ViewPage</name>         <name>ViewPage</name>
278         <value>columns</value>         <value>columns</value>
279  @@ -309,35 +225,35 @@  @@ -309,15 +225,15 @@
280       </init-param>       </init-param>
281       <init-param>       <init-param>
282         <name>columns</name>         <name>columns</name>
# Line 318  Index: layout-portlets/src/webapp/WEB-IN Line 295  Index: layout-portlets/src/webapp/WEB-IN
295       </init-param>       </init-param>
296       <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>       <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
297       <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>       <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
298  -    <expiration-cache>0</expiration-cache>  @@ -325,19 +241,19 @@
 +    <expiration-cache>-1</expiration-cache>  
299       <supports>       <supports>
300         <mime-type>text/html</mime-type>         <mime-type>text/html</mime-type>
301         <portlet-mode>view</portlet-mode>         <portlet-mode>view</portlet-mode>
# Line 347  Index: layout-portlets/src/webapp/WEB-IN Line 323  Index: layout-portlets/src/webapp/WEB-IN
323       <init-param>       <init-param>
324         <name>ViewPage</name>         <name>ViewPage</name>
325         <value>columns</value>         <value>columns</value>
326  @@ -348,35 +264,35 @@  @@ -348,15 +264,15 @@
327       </init-param>       </init-param>
328       <init-param>       <init-param>
329         <name>columns</name>         <name>columns</name>
# Line 366  Index: layout-portlets/src/webapp/WEB-IN Line 342  Index: layout-portlets/src/webapp/WEB-IN
342       </init-param>       </init-param>
343       <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>       <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
344       <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>       <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
345  -    <expiration-cache>0</expiration-cache>  @@ -364,19 +280,19 @@
 +    <expiration-cache>-1</expiration-cache>  
346       <supports>       <supports>
347         <mime-type>text/html</mime-type>         <mime-type>text/html</mime-type>
348         <portlet-mode>view</portlet-mode>         <portlet-mode>view</portlet-mode>
# Line 404  Index: layout-portlets/src/webapp/WEB-IN Line 379  Index: layout-portlets/src/webapp/WEB-IN
379       </init-param>       </init-param>
380       <init-param>       <init-param>
381         <name>layoutType</name>         <name>layoutType</name>
382  @@ -399,22 +315,23 @@  @@ -403,18 +319,19 @@
      </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>  
383       <supports>       <supports>
384         <mime-type>text/html</mime-type>         <mime-type>text/html</mime-type>
385         <portlet-mode>view</portlet-mode>         <portlet-mode>view</portlet-mode>
# Line 437  Index: layout-portlets/src/webapp/WEB-IN Line 407  Index: layout-portlets/src/webapp/WEB-IN
407       <init-param>       <init-param>
408         <name>ViewPage</name>         <name>ViewPage</name>
409         <value>columns</value>         <value>columns</value>
410  @@ -425,38 +342,38 @@  @@ -425,15 +342,15 @@
411       </init-param>       </init-param>
412       <init-param>       <init-param>
413         <name>columns</name>         <name>columns</name>
# Line 456  Index: layout-portlets/src/webapp/WEB-IN Line 426  Index: layout-portlets/src/webapp/WEB-IN
426       </init-param>       </init-param>
427       <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>       <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
428       <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>       <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
429  -    <expiration-cache>0</expiration-cache>  @@ -441,22 +358,22 @@
 +    <expiration-cache>-1</expiration-cache>  
430       <supports>       <supports>
431         <mime-type>text/html</mime-type>         <mime-type>text/html</mime-type>
432         <portlet-mode>view</portlet-mode>         <portlet-mode>view</portlet-mode>
# Line 490  Index: layout-portlets/src/webapp/WEB-IN Line 459  Index: layout-portlets/src/webapp/WEB-IN
459       </init-param>       </init-param>
460       <init-param>       <init-param>
461         <name>MaxPage</name>         <name>MaxPage</name>
462  @@ -472,29 +389,25 @@  @@ -472,7 +389,7 @@
463       </init-param>       </init-param>
464       <init-param>       <init-param>
465         <name>layoutType</name>         <name>layoutType</name>
# Line 499  Index: layout-portlets/src/webapp/WEB-IN Line 468  Index: layout-portlets/src/webapp/WEB-IN
468       </init-param>       </init-param>
469       <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>       <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
470       <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>       <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
471  -    <expiration-cache>0</expiration-cache>  @@ -480,21 +397,17 @@
 +    <expiration-cache>-1</expiration-cache>  
472       <supports>       <supports>
473         <mime-type>text/html</mime-type>         <mime-type>text/html</mime-type>
474         <portlet-mode>view</portlet-mode>         <portlet-mode>view</portlet-mode>
# Line 529  Index: layout-portlets/src/webapp/WEB-IN Line 497  Index: layout-portlets/src/webapp/WEB-IN
497       <init-param>       <init-param>
498         <name>ViewPage</name>         <name>ViewPage</name>
499         <value>columns</value>         <value>columns</value>
500  @@ -505,38 +418,36 @@  @@ -505,15 +418,15 @@
501       </init-param>       </init-param>
502       <init-param>       <init-param>
503         <name>columns</name>         <name>columns</name>
# Line 548  Index: layout-portlets/src/webapp/WEB-IN Line 516  Index: layout-portlets/src/webapp/WEB-IN
516       </init-param>       </init-param>
517       <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>       <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
518       <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>       <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
519  -    <expiration-cache>0</expiration-cache>  @@ -523,20 +436,18 @@
 +    <expiration-cache>-1</expiration-cache>  
      <supports>  
        <mime-type>text/html</mime-type>  
520         <portlet-mode>view</portlet-mode>         <portlet-mode>view</portlet-mode>
521       </supports>       </supports>
522       <portlet-info>       <portlet-info>
# Line 579  Index: layout-portlets/src/webapp/WEB-IN Line 544  Index: layout-portlets/src/webapp/WEB-IN
544       </init-param>       </init-param>
545       <init-param>       <init-param>
546         <name>MaxPage</name>         <name>MaxPage</name>
547  @@ -556,24 +467,21 @@  @@ -560,20 +471,17 @@
      </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>  
548       <supports>       <supports>
549         <mime-type>text/html</mime-type>         <mime-type>text/html</mime-type>
550         <portlet-mode>view</portlet-mode>         <portlet-mode>view</portlet-mode>
# Line 611  Index: layout-portlets/src/webapp/WEB-IN Line 571  Index: layout-portlets/src/webapp/WEB-IN
571       <init-param>       <init-param>
572         <name>ViewPage</name>         <name>ViewPage</name>
573         <value>columns</value>         <value>columns</value>
574  @@ -584,30 +492,29 @@  @@ -584,15 +492,15 @@
575       </init-param>       </init-param>
576       <init-param>       <init-param>
577         <name>columns</name>         <name>columns</name>
# Line 630  Index: layout-portlets/src/webapp/WEB-IN Line 590  Index: layout-portlets/src/webapp/WEB-IN
590       </init-param>       </init-param>
591       <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>       <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
592       <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>       <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
593  -    <expiration-cache>0</expiration-cache>  @@ -600,14 +508,13 @@
 +    <expiration-cache>-1</expiration-cache>  
594       <supports>       <supports>
595         <mime-type>text/html</mime-type>         <mime-type>text/html</mime-type>
596         <portlet-mode>view</portlet-mode>         <portlet-mode>view</portlet-mode>
Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
About OSDN
Find Software
Develop Software
Help