Shinsuke SUGAYA
shins****@users*****
2007年 3月 8日 (木) 07:14:22 JST
Update of /cvsroot/pal/pal-portal/portal/patches/layout-portlets/src/webapp/WEB-INF In directory sf-cvs:/tmp/cvs-serv16262/portal/patches/layout-portlets/src/webapp/WEB-INF Modified Files: portlet.xml Log Message: update for 2.1 pal-portal/portal/patches/layout-portlets/src/webapp/WEB-INF/portlet.xml 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-portal/portal/patches/layout-portlets/src/webapp/WEB-INF/portlet.xml.diff?r1=1.2&r2=1.3 =================================================================== RCS file: pal-portal/portal/patches/layout-portlets/src/webapp/WEB-INF/portlet.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- portlet.xml 2006/11/14 22:05:37 1.2 +++ portlet.xml 2007/03/07 22:14:22 1.3 @@ -1,12 +1,41 @@ Index: layout-portlets/src/webapp/WEB-INF/portlet.xml =================================================================== ---- layout-portlets/src/webapp/WEB-INF/portlet.xml ($B%j%S%8%g%s(B 472432) +--- layout-portlets/src/webapp/WEB-INF/portlet.xml ($B%j%S%8%g%s(B 514361) +++ layout-portlets/src/webapp/WEB-INF/portlet.xml ($B:n6H%3%T!<(B) -@@ -18,10 +18,8 @@ +@@ -16,38 +16,10 @@ - <portlet id="VelocityOneColumn"> + <portlet-app id="jetspeed" version="1.0"> + +- <portlet id="SimpleLayoutPortlet"> +- <description>The SimpleLayoutPortlet requires a ViewPage layout template set through the portlet preferences +- which provides its own layout algorithm</description> +- <portlet-name>SimpleLayout</portlet-name> +- <display-name>Simple readonly fixed Layout</display-name> +- <init-param> +- <name>ViewPage</name> +- <value>columns</value> +- </init-param> +- <init-param> +- <name>MaxPage</name> +- <value>maximized</value> +- </init-param> +- <portlet-class>org.apache.jetspeed.portlets.layout.LayoutPortlet</portlet-class> +- <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle> +- <expiration-cache>0</expiration-cache> +- <supports> +- <mime-type>text/html</mime-type> +- <portlet-mode>view</portlet-mode> +- </supports> +- <portlet-info> +- <title>SimpleLayoutPortlet</title> +- <short-title>SimpleLayout</short-title> +- </portlet-info> +- </portlet> +- +- <portlet id="VelocityOneColumn"> ++<portlet id="VelocityOneColumn"> <portlet-name>VelocityOneColumn</portlet-name> -- <display-name>One Column Layout Using Velocity</display-name> +- <display-name>One Column</display-name> - <display-name xml:lang="ja">Velocity$B$rMxMQ$7$?(B 1 $BNs%l%$%"%&%H(B</display-name> - <display-name xml:lang="zh">$B4pP2(BVelocity$BE*(B??$BNsI[6I(B</display-name> - <display-name xml:lang="zh-TW">$B4p1w(BVelocity$BE*SENs$(D0h$B6I(B</display-name> @@ -15,13 +44,28 @@ <init-param> <name>ViewPage</name> <value>columns</value> -@@ -57,53 +55,10 @@ +@@ -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> + <portlet-info> +- <title>One Column</title> ++ <title>VelocityOneColumn</title> + <short-title>OneColumn</short-title> </portlet-info> </portlet> -<portlet id="VelocityOneColumnTable"> - <portlet-name>VelocityOneColumnTable</portlet-name> -- <display-name>One Column Layout Using Velocity And Tables</display-name> +- <display-name>One Column with Tables</display-name> - <display-name xml:lang="ja">Velocity $B$H%F!<%V%k$rMxMQ$7$?(B 1 $BNs%l%$%"%&%H(B</display-name> - <display-name xml:lang="zh">$B4pP2(BVelocity$BI=3JE*(B??$BNsI[6I(B</display-name> - <display-name xml:lang="zh-TW">$B4p1w(BVelocity$BI=3JE*SENs$(D0h$B6I(B</display-name> @@ -47,7 +91,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>-1</expiration-cache> +- <expiration-cache>0</expiration-cache> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>view</portlet-mode> @@ -55,14 +99,14 @@ - <portlet-mode>help</portlet-mode> - </supports> - <portlet-info> -- <title>VelocityOneColumnTable</title> +- <title>One Column with Tables</title> - <short-title>OneColumnTable</short-title> - </portlet-info> -</portlet> - <portlet id="VelocityTwoColumns"> <portlet-name>VelocityTwoColumns</portlet-name> -- <display-name>Two Columns Layout Using Velocity</display-name> +- <display-name>Two Columns</display-name> - <display-name xml:lang="ja">Velocity $B$rMxMQ$7$?(B 2 $BNs%l%$%"%&%H(B</display-name> - <display-name xml:lang="zh">$B4pP2(BVelocity$BE*APNsI[6I(B</display-name> - <display-name xml:lang="zh-TW">$B4p1w(BVelocity$BE*RVNs$(D0h$B6I(B</display-name> @@ -71,13 +115,34 @@ <init-param> <name>ViewPage</name> <value>columns</value> -@@ -139,12 +94,10 @@ +@@ -150,13 +79,9 @@ + <name>layoutType</name> + <value>TwoColumns</value> + </init-param> +- <!-- <init-param> +- <name>editorType</name> +- <value>desktop</value> +- </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> +@@ -164,17 +89,15 @@ + <portlet-mode>help</portlet-mode> + </supports> + <portlet-info> +- <title>Two Columns</title> ++ <title>VelocityTwoColumns</title> + <short-title>TwoColumns</short-title> </portlet-info> </portlet> -<portlet id="VelocityTwoColumnsSmallLeft"> - <portlet-name>VelocityTwoColumnsSmallLeft</portlet-name> -- <display-name>Two Columns with a small Left column for navigation controls using Velocity</display-name> +- <display-name>Two Columns (15%/85%)</display-name> - <display-name xml:lang="ja">Velocity $B$rMxMQ$7$?:8B&$K%J%S%2!<%7%g%s%3%s%H%m!<%kMQ$N>.$5$JNs$r;}$D(B 2 $BNs(B</display-name> - <display-name xml:lang="zh">$B4pP2(BVelocity$B!$(B??$B9R(B????$B:uE*APNsI[6I(B</display-name> - <display-name xml:lang="zh-TW">$B4p1w(BVelocity$B!$F39RMs3S:uE*RVNs$(D0h$B6I(B</display-name> @@ -88,7 +153,7 @@ <init-param> <name>ViewPage</name> <value>columns</value> -@@ -159,7 +112,7 @@ +@@ -189,7 +112,7 @@ </init-param> <init-param> <name>sizes</name> @@ -97,7 +162,13 @@ </init-param> <init-param> <name>layoutType</name> -@@ -172,21 +125,18 @@ +@@ -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> <mime-type>text/html</mime-type> <portlet-mode>view</portlet-mode> <portlet-mode>edit</portlet-mode> @@ -105,8 +176,8 @@ + <portlet-mode>help</portlet-mode> </supports> <portlet-info> -- <title>VelocityTwoColumnsSmallLeft</title> -- <short-title>TwoColumnsSmallLeft</short-title> +- <title>Two Columns (15%/85%)</title> +- <short-title>Two Columns (15%/85%)</short-title> + <title>VelocityTwoColumns</title> + <short-title>TwoColumns</short-title> </portlet-info> @@ -115,7 +186,7 @@ - -<portlet id="VelocityThreeColumns"> - <portlet-name>VelocityThreeColumns</portlet-name> -- <display-name>Three Columns Layout Using Velocity</display-name> +- <display-name>Three Columns</display-name> - <display-name xml:lang="ja">Velocity $B$rMxMQ$7$?(B 3 $BNs%l%$%"%&%H(B</display-name> - <display-name xml:lang="zh">$B4pP2(BVelocity$BE*(B3$BNsI[6I(B</display-name> - <display-name xml:lang="zh-TW">$B4p1w(BVelocity$BE*(B3$BNs$(D0h$B6I(B</display-name> @@ -126,7 +197,7 @@ <init-param> <name>ViewPage</name> <value>columns</value> -@@ -197,15 +147,15 @@ +@@ -227,40 +147,38 @@ </init-param> <init-param> <name>columns</name> @@ -145,7 +216,9 @@ </init-param> <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class> <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle> -@@ -214,23 +164,21 @@ +- <expiration-cache>0</expiration-cache> ++ <expiration-cache>-1</expiration-cache> + <supports> <mime-type>text/html</mime-type> <portlet-mode>view</portlet-mode> <portlet-mode>edit</portlet-mode> @@ -153,7 +226,7 @@ + <portlet-mode>help</portlet-mode> </supports> <portlet-info> -- <title>VelocityThreeColumns</title> +- <title>Three Columns</title> - <short-title>ThreeColumns</short-title> + <title>VelocityTwoColumns</title> + <short-title>TwoColumns</short-title> @@ -162,7 +235,7 @@ -<portlet id="VelocityThreeColumnsTable"> - <portlet-name>VelocityThreeColumnsTable</portlet-name> -- <display-name>Three Columns Layout Using Velocity And Tables</display-name> +- <display-name>Three Columns with Tables</display-name> - <display-name xml:lang="ja">Velocity $B$H%F!<%V%k$rMxMQ$7$?(B 3 $BNs%l%$%"%&%H(B</display-name> - <display-name xml:lang="zh">$B4pP2(BVelocity$BI=3JE*(B3$BNsI[6I(B</display-name> - <display-name xml:lang="zh-TW">$B4p1w(BVelocity$BI=3JE*(B3$BNs$(D0h$B6I(B</display-name> @@ -177,7 +250,7 @@ </init-param> <init-param> <name>MaxPage</name> -@@ -238,15 +186,15 @@ +@@ -268,37 +186,35 @@ </init-param> <init-param> <name>columns</name> @@ -196,7 +269,9 @@ </init-param> <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class> <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle> -@@ -255,20 +203,18 @@ +- <expiration-cache>0</expiration-cache> ++ <expiration-cache>-1</expiration-cache> + <supports> <mime-type>text/html</mime-type> <portlet-mode>view</portlet-mode> <portlet-mode>edit</portlet-mode> @@ -204,7 +279,7 @@ + <portlet-mode>help</portlet-mode> </supports> <portlet-info> -- <title>VelocityThreeColumnsTable</title> +- <title>Three Columns with Tables</title> - <short-title>ThreeColumnsTable</short-title> + <title>VelocityTwoColumns</title> + <short-title>TwoColumns</short-title> @@ -213,7 +288,7 @@ -<portlet id="VelocityOneColumnNoActions"> - <portlet-name>VelocityOneColumnNoActions</portlet-name> -- <display-name>One Column Layout Using Velocity with No Page Actions allowed</display-name> +- <display-name>One Column - No Actions</display-name> - <display-name xml:lang="ja">$B%Z!<%8%"%/%7%g%s$N$J$$(B Velocity $B$rMxMQ$7$?(B 1 $BNs%l%$%"%&%H(B</display-name> - <display-name xml:lang="zh">$BKWM-(B??$BLL>u(B??$B!"4pP2(BVelocity$BE*(B??$BNsI[6I(B</display-name> - <display-name xml:lang="zh-TW">$B]sM-JGLL(B??$BBV!"4p1w(BVelocity$BE*SENs$(D0h$B6I(B</display-name> @@ -224,59 +299,27 @@ <init-param> <name>ViewPage</name> <value>columns</value> -@@ -279,50 +225,11 @@ +@@ -309,35 +225,35 @@ </init-param> <init-param> <name>columns</name> - <value>1</value> -- </init-param> -- <init-param> -- <name>sizes</name> -- <value>100%</value> -- </init-param> -- <init-param> -- <name>layoutType</name> -- <value>OneColumn</value> -- </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>-1</expiration-cache> -- <supports> -- <mime-type>text/html</mime-type> -- <portlet-mode>view</portlet-mode> -- </supports> -- <portlet-info> -- <title>VelocityOneColumn</title> -- <short-title>OneColumn</short-title> -- </portlet-info> --</portlet> -- --<portlet id="VelocityTwoColumnsNoActions"> -- <portlet-name>VelocityTwoColumnsNoActions</portlet-name> -- <display-name>Two Columns Layout Using Velocity with No Page Actions allowed</display-name> -- <display-name xml:lang="ja">$B%Z!<%8%"%/%7%g%s$N$J$$(B Velocity $B$rMxMQ$7$?(B 2 $BNs%l%$%"%&%H(B</display-name> -- <display-name xml:lang="zh">$BKWM-(B??$BLL>u(B??$B!"4pP2(BVelocity$BE*APNsI[6I(B</display-name> -- <display-name xml:lang="zh-TW">$B]sM-JGLL(B??$BBV!"4p1w(BVelocity$BE*RVNs$(D0h$B6I(B</display-name> -- <init-param> -- <name>ViewPage</name> -- <value>columns</value> -- </init-param> -- <init-param> -- <name>MaxPage</name> -- <value>maximized</value> -- </init-param> -- <init-param> -- <name>columns</name> - <value>2</value> ++ <value>2</value> </init-param> <init-param> <name>sizes</name> -- <value>50%,50%</value> +- <value>100%</value> + <value>75%,25%</value> </init-param> <init-param> <name>layoutType</name> -@@ -334,6 +241,8 @@ +- <value>OneColumn</value> ++ <value>TwoColumns</value> + </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> @@ -284,17 +327,19 @@ + <portlet-mode>help</portlet-mode> </supports> <portlet-info> - <title>VelocityTwoColumns</title> -@@ -341,12 +250,10 @@ +- <title>One Column - No Actions</title> +- <short-title>OneColumnNoActions</short-title> ++ <title>VelocityTwoColumns</title> ++ <short-title>TwoColumns</short-title> </portlet-info> </portlet> --<portlet id="VelocityThreeColumnsNoActions"> -- <portlet-name>VelocityThreeColumnsNoActions</portlet-name> -- <display-name>Three Columns Layout Using Velocity with No Actions allowed</display-name> -- <display-name xml:lang="ja">$B%Z!<%8%"%/%7%g%s$N$J$$(B Velocity $B$rMxMQ$7$?(B 3 $BNs%l%$%"%&%H(B</display-name> -- <display-name xml:lang="zh">$BKWM-(B??$BLL>u(B??$B!"4pP2(BVelocity$BE*(B3$BNsI[6I(B</display-name> -- <display-name xml:lang="zh-TW">$B]sM-JGLL(B??$BBV!"4p1w(BVelocity$BE*(B3$BNs$(D0h$B6I(B</display-name> +-<portlet id="VelocityTwoColumnsNoActions"> +- <portlet-name>VelocityTwoColumnsNoActions</portlet-name> +- <display-name>Two Columns Layout - No Actions</display-name> +- <display-name xml:lang="ja">$B%Z!<%8%"%/%7%g%s$N$J$$(B Velocity $B$rMxMQ$7$?(B 2 $BNs%l%$%"%&%H(B</display-name> +- <display-name xml:lang="zh">$BKWM-(B??$BLL>u(B??$B!"4pP2(BVelocity$BE*APNsI[6I(B</display-name> +- <display-name xml:lang="zh-TW">$B]sM-JGLL(B??$BBV!"4p1w(BVelocity$BE*RVNs$(D0h$B6I(B</display-name> +<portlet id="VelocityThreeColumns"> + <portlet-name>VelocityThreeColumns</portlet-name> + <display-name>Three Columns Layout(33/33/33)</display-name> @@ -302,7 +347,27 @@ <init-param> <name>ViewPage</name> <value>columns</value> -@@ -373,18 +280,19 @@ +@@ -348,35 +264,35 @@ + </init-param> + <init-param> + <name>columns</name> +- <value>2</value> ++ <value>3</value> + </init-param> + <init-param> + <name>sizes</name> +- <value>50%,50%</value> ++ <value>33%,33%,33%</value> + </init-param> + <init-param> + <name>layoutType</name> +- <value>TwoColumns</value> ++ <value>ThreeColumns</value> + </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> @@ -310,17 +375,19 @@ + <portlet-mode>help</portlet-mode> </supports> <portlet-info> - <title>VelocityThreeColumns</title> - <short-title>ThreeColumns</short-title> +- <title>Two Columns - No Actions</title> +- <short-title>TwoColumnsNoActions</short-title> ++ <title>VelocityThreeColumns</title> ++ <short-title>ThreeColumns</short-title> </portlet-info> </portlet> --<portlet id="VelocityTwoColumns2575NoActions"> -- <portlet-name>VelocityTwoColumns2575NoActions</portlet-name> -- <display-name>Two Columns Layout Using Velocity with No Page Actions allowed</display-name> -- <display-name xml:lang="ja">$B%Z!<%8%"%/%7%g%s$N$J$$(B Velocity $B$rMxMQ$7$?(B 2 $BNs%l%$%"%&%H(B</display-name> -- <display-name xml:lang="zh">$BKWM-(B??$BLL>u(B??$B!"4pP2(BVelocity$BE*APNsI[6I(B</display-name> -- <display-name xml:lang="zh-TW">$B]sM-JGLL(B??$BBV!"4p1w(BVelocity$BE*RVNs$(D0h$B6I(B</display-name> -+ + +-<portlet id="VelocityThreeColumnsNoActions"> +- <portlet-name>VelocityThreeColumnsNoActions</portlet-name> +- <display-name>Three Columns - No Actions</display-name> +- <display-name xml:lang="ja">$B%Z!<%8%"%/%7%g%s$N$J$$(B Velocity $B$rMxMQ$7$?(B 3 $BNs%l%$%"%&%H(B</display-name> +- <display-name xml:lang="zh">$BKWM-(B??$BLL>u(B??$B!"4pP2(BVelocity$BE*(B3$BNsI[6I(B</display-name> +- <display-name xml:lang="zh-TW">$B]sM-JGLL(B??$BBV!"4p1w(BVelocity$BE*(B3$BNs$(D0h$B6I(B</display-name> +<portlet id="VelocityThreeColumns206020"> + <portlet-name>VelocityThreeColumns206020</portlet-name> + <display-name>Three Columns Layout(20/60/20)</display-name> @@ -328,26 +395,21 @@ <init-param> <name>ViewPage</name> <value>columns</value> -@@ -395,15 +303,15 @@ - </init-param> - <init-param> - <name>columns</name> -- <value>2</value> -+ <value>3</value> +@@ -391,7 +307,7 @@ </init-param> <init-param> <name>sizes</name> -- <value>25%,75%</value> +- <value>33%,33%,33%</value> + <value>20%,60%,20%</value> </init-param> <init-param> <name>layoutType</name> -- <value>TwoColumns</value> -+ <value>ThreeColumns</value> +@@ -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> -@@ -411,19 +319,19 @@ +- <expiration-cache>0</expiration-cache> ++ <expiration-cache>-1</expiration-cache> <supports> <mime-type>text/html</mime-type> <portlet-mode>view</portlet-mode> @@ -355,19 +417,19 @@ + <portlet-mode>help</portlet-mode> </supports> <portlet-info> -- <title>VelocityTwoColumns2575NoActions</title> -- <short-title>VelocityTwoColumns2575NoActions</short-title> +- <title>Three Columns - No Actions</title> +- <short-title>ThreeColumnsNoActions</short-title> + <title>VelocityThreeColumns</title> + <short-title>ThreeColumns</short-title> </portlet-info> </portlet> - --<portlet id="VelocityTwoColumns2575"> -- <portlet-name>VelocityTwoColumns2575</portlet-name> -- <display-name>25/75 Two Columns Layout Using Velocity</display-name> -- <display-name xml:lang="ja">Velocity $B$rMxMQ$7$?(B 25/75 $B$N(B 2 $BNs%l%$%"%&%H(B</display-name> -- <display-name xml:lang="zh">$B4pP2(BVelocity$BE*APNsI[6I(B</display-name> -- <display-name xml:lang="zh-TW">$B4p1w(BVelocity$BE*RVNs$(D0h$B6I(B</display-name> +-<portlet id="VelocityTwoColumns2575NoActions"> +- <portlet-name>VelocityTwoColumns2575NoActions</portlet-name> +- <display-name>Two Columns (25%/75%) No Actions</display-name> +- <display-name xml:lang="ja">$B%Z!<%8%"%/%7%g%s$N$J$$(B Velocity $B$rMxMQ$7$?(B 2 $BNs%l%$%"%&%H(B</display-name> +- <display-name xml:lang="zh">$BKWM-(B??$BLL>u(B??$B!"4pP2(BVelocity$BE*APNsI[6I(B</display-name> +- <display-name xml:lang="zh-TW">$B]sM-JGLL(B??$BBV!"4p1w(BVelocity$BE*RVNs$(D0h$B6I(B</display-name> ++ +<portlet id="VelocityFourColumns"> + <portlet-name>VelocityFourColumns</portlet-name> + <display-name>Four Layout</display-name> @@ -375,7 +437,7 @@ <init-param> <name>ViewPage</name> <value>columns</value> -@@ -434,15 +342,15 @@ +@@ -425,38 +342,38 @@ </init-param> <init-param> <name>columns</name> @@ -394,23 +456,28 @@ </init-param> <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class> <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle> -@@ -454,20 +362,18 @@ - <portlet-mode>help</portlet-mode> +- <expiration-cache>0</expiration-cache> ++ <expiration-cache>-1</expiration-cache> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>view</portlet-mode> ++ <portlet-mode>edit</portlet-mode> ++ <portlet-mode>help</portlet-mode> </supports> <portlet-info> -- <title>VelocityTwoColumns2575NoActions</title> +- <title>Two Columns (25%/75%) No Actions</title> - <short-title>VelocityTwoColumns2575NoActions</short-title> + <title>VelocityFourColumns</title> + <short-title>FourColumns</short-title> </portlet-info> </portlet> - --<portlet id="VelocityTwoColumnsSmallLeftNoActions"> -- <portlet-name>VelocityTwoColumnsSmallLeftNoActions</portlet-name> -- <display-name>Two Columns with a small Left column for navigation controls using Velocity and No Actions</display-name> -- <display-name xml:lang="ja">$B%"%/%7%g%s$N$J$$(B Velocity $B$rMxMQ$7$?:8B&$K%J%S%2!<%7%g%s%3%s%H%m!<%kMQ$N>.$5$JNs$r;}$D(B 2 $BNs(B</display-name> -- <display-name xml:lang="zh">$BKWM-(B??$BLL>u(B??$B!"4pP2(BVelocity$B!$(B??$B9R(B????$B:uE*(B??$BNsI[6I(B</display-name> -- <display-name xml:lang="zh-TW">$B]sM-JGLL(B??$BBV!"4p1w(BVelocity$B!$F39RMs3S:uE*RVNs$(D0h$B6I(B</display-name> +-<portlet id="VelocityTwoColumns2575"> +- <portlet-name>VelocityTwoColumns2575</portlet-name> +- <display-name>Two Columns (25%/75%)</display-name> +- <display-name xml:lang="ja">Velocity $B$rMxMQ$7$?(B 25/75 $B$N(B 2 $BNs%l%$%"%&%H(B</display-name> +- <display-name xml:lang="zh">$B4pP2(BVelocity$BE*APNsI[6I(B</display-name> +- <display-name xml:lang="zh-TW">$B4p1w(BVelocity$BE*RVNs$(D0h$B6I(B</display-name> + +<!--portlet id="FrameLayoutPortlet"> + <portlet-name>FrameLayoutPortlet</portlet-name> @@ -423,12 +490,7 @@ </init-param> <init-param> <name>MaxPage</name> -@@ -479,11 +385,11 @@ - </init-param> - <init-param> - <name>sizes</name> -- <value>15%,85%</value> -+ <value>25%,75%</value> +@@ -472,29 +389,25 @@ </init-param> <init-param> <name>layoutType</name> @@ -437,36 +499,37 @@ </init-param> <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class> <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle> -@@ -493,20 +399,18 @@ +- <expiration-cache>0</expiration-cache> ++ <expiration-cache>-1</expiration-cache> + <supports> + <mime-type>text/html</mime-type> <portlet-mode>view</portlet-mode> +- <portlet-mode>edit</portlet-mode> +- <portlet-mode>help</portlet-mode> </supports> <portlet-info> -- <title>VelocityTwoColumnsSmallLeftNoActions</title> -- <short-title>TwoColumnsSmallLeftNoActions</short-title> +- <title>Two Columns (25%/75%)</title> +- <short-title>VelocityTwoColumns2575</short-title> + <title>Frame Layout Portlet</title> + <short-title>Frame Layout</short-title> </portlet-info> -</portlet> +</portlet--> --<portlet id="FrameLayoutPortlet"> -- <portlet-name>FrameLayoutPortlet</portlet-name> -- <display-name>Frame Layout Portlet</display-name> -- <display-name xml:lang="ja">$B%U%l!<%`%l%$%"%&%H%]!<%H%l%C%H(B</display-name> -- <display-name xml:lang="zh">$B[Z2MI[6I(BPortlet</display-name> -- <display-name xml:lang="zh-TW">$B[Z2M$(D0h$B6I(BPortlet</display-name> +-<portlet id="VelocityTwoColumnsSmallLeftNoActions"> +- <portlet-name>VelocityTwoColumnsSmallLeftNoActions</portlet-name> +- <display-name>Two Columns (15%,85%) No Actions</display-name> +- <display-name xml:lang="ja">$B%"%/%7%g%s$N$J$$(B Velocity $B$rMxMQ$7$?:8B&$K%J%S%2!<%7%g%s%3%s%H%m!<%kMQ$N>.$5$JNs$r;}$D(B 2 $BNs(B</display-name> +- <display-name xml:lang="zh">$BKWM-(B??$BLL>u(B??$B!"4pP2(BVelocity$B!$(B??$B9R(B????$B:uE*(B??$BNsI[6I(B</display-name> +- <display-name xml:lang="zh-TW">$B]sM-JGLL(B??$BBV!"4p1w(BVelocity$B!$F39RMs3S:uE*RVNs$(D0h$B6I(B</display-name> +<portlet id="VelocityOneColumnNoActions"> + <portlet-name>VelocityOneColumnNoActions</portlet-name> + <display-name>One Column Layout with No Page Actions allowed</display-name> + <display-name xml:lang="ja">$B%Z!<%8%"%/%7%g%s$N$J$$(B 1 $BNs%l%$%"%&%H(B</display-name> <init-param> <name>ViewPage</name> -- <value>frames</value> -+ <value>columns</value> - </init-param> - <init-param> - <name>MaxPage</name> -@@ -514,15 +418,15 @@ + <value>columns</value> +@@ -505,38 +418,36 @@ </init-param> <init-param> <name>columns</name> @@ -475,22 +538,25 @@ </init-param> <init-param> <name>sizes</name> -- <value>25%,75%</value> +- <value>15%,85%</value> + <value>100%</value> </init-param> <init-param> <name>layoutType</name> -- <value>Frame</value> +- <value>TwoColumns</value> + <value>OneColumn</value> </init-param> <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class> <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle> -@@ -532,20 +436,18 @@ +- <expiration-cache>0</expiration-cache> ++ <expiration-cache>-1</expiration-cache> + <supports> + <mime-type>text/html</mime-type> <portlet-mode>view</portlet-mode> </supports> <portlet-info> -- <title>Frame Layout Portlet</title> -- <short-title>Frame Layout</short-title> +- <title>Two Columns (15%,85%) No Actions</title> +- <short-title>2 Columns 15,85 No Actions</short-title> + <title>VelocityOneColumn</title> + <short-title>OneColumn</short-title> </portlet-info> @@ -498,7 +564,7 @@ -<portlet id="VelocityTwoColumnsTable"> - <portlet-name>VelocityTwoColumnsTable</portlet-name> -- <display-name>Two Columns Layout Using Velocity And Tables</display-name> +- <display-name>Two Columns with Tables</display-name> - <display-name xml:lang="ja">Velocity $B$H%F!<%V%k$rMxMQ$7$?(B 2 $BNs%l%$%"%&%H(B</display-name> - <display-name xml:lang="zh">$B4pP2(BVelocity$BI=3JE*APNsI[6I(B</display-name> - <display-name xml:lang="zh-TW">$B4p1w(BVelocity$BI=3JE*RVNs$(D0h$B6I(B</display-name> @@ -513,7 +579,12 @@ </init-param> <init-param> <name>MaxPage</name> -@@ -569,20 +471,17 @@ +@@ -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> <supports> <mime-type>text/html</mime-type> <portlet-mode>view</portlet-mode> @@ -521,8 +592,8 @@ - <portlet-mode>help</portlet-mode> </supports> <portlet-info> -- <title>VelocityTwoColumnsTable</title> -- <short-title>TwoColumnsTable</short-title> +- <title>Two Columns with Tables</title> +- <short-title>Two Columns Tables</short-title> + <title>VelocityTwoColumns</title> + <short-title>TwoColumns</short-title> </portlet-info> @@ -530,7 +601,7 @@ -<portlet id="VelocityFourColumns"> - <portlet-name>VelocityFourColumns</portlet-name> -- <display-name>Four Layout Using Velocity</display-name> +- <display-name>Four Columns</display-name> - <display-name xml:lang="zh">$B4pP2(BVelocity$BI=3JE*(B4$BNsI[6I(B</display-name> - <display-name xml:lang="zh-TW">$B4p1w(BVelocity$BI=3JE*(B4$BNs$(D0h$B6I(B</display-name> +<portlet id="VelocityThreeColumnsNoActions"> @@ -540,7 +611,7 @@ <init-param> <name>ViewPage</name> <value>columns</value> -@@ -593,15 +492,15 @@ +@@ -584,30 +492,29 @@ </init-param> <init-param> <name>columns</name> @@ -559,7 +630,8 @@ </init-param> <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class> <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle> -@@ -609,14 +508,13 @@ +- <expiration-cache>0</expiration-cache> ++ <expiration-cache>-1</expiration-cache> <supports> <mime-type>text/html</mime-type> <portlet-mode>view</portlet-mode> @@ -567,7 +639,7 @@ - <portlet-mode>help</portlet-mode> </supports> <portlet-info> -- <title>VelocityFourColumns</title> +- <title>Four Columns</title> - <short-title>FourColumns</short-title> + <title>VelocityThreeColumns</title> + <short-title>ThreeColumns</short-title>
