svnno****@sourc*****
svnno****@sourc*****
2007年 10月 18日 (木) 14:00:17 JST
Revision: 639
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=639
Author: shinsuke
Date: 2007-10-18 14:00:16 +0900 (Thu, 18 Oct 2007)
Log Message:
-----------
removed unneede patch. updated version. added some layouts.
Modified Paths:
--------------
pal-portal/trunk/build.properties
pal-portal/trunk/portal/patches/layout-portlets/src/webapp/WEB-INF/portlet.xml
pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml
Removed Paths:
-------------
pal-portal/trunk/portal/patches/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapMemberShipDaoImpl.java
-------------- next part --------------
Modified: pal-portal/trunk/build.properties
===================================================================
--- pal-portal/trunk/build.properties 2007-10-18 04:29:24 UTC (rev 638)
+++ pal-portal/trunk/build.properties 2007-10-18 05:00:16 UTC (rev 639)
@@ -4,7 +4,7 @@
container.name=PAL Portal
container.separator=/
container.version.major=1
-container.version.minor=0
+container.version.minor=0.1-dev
container.info.file=commons/src/java/org/apache/jetspeed/container/resources/ContainerInfo.properties
portlets.home=${basedir}/portlets
portlets.build.dir=${portlets.home}/build
@@ -67,7 +67,7 @@
# Jetspeed SVN revision
#jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/
jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/branches/JETSPEED-2.1.3/
-jetspeed2.revision=574906
+jetspeed2.revision=584942
# Dependencies for Jetspeed
jetspeed.version=2.1.2_pal-${portal.version}
@@ -169,7 +169,6 @@
components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources.properties,\
components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_en.properties,\
components/security/src/java/org/apache/jetspeed/security/impl/AuthenticationProviderProxyImpl.java,\
-components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapMemberShipDaoImpl.java,\
components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapUserSecurityHandler.java,\
components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultUserSecurityHandler.java,\
components/security/src/java/org/apache/jetspeed/security/spi/impl/SecurityAccessImpl.java,\
Deleted: pal-portal/trunk/portal/patches/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapMemberShipDaoImpl.java
===================================================================
--- pal-portal/trunk/portal/patches/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapMemberShipDaoImpl.java 2007-10-18 04:29:24 UTC (rev 638)
+++ pal-portal/trunk/portal/patches/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapMemberShipDaoImpl.java 2007-10-18 05:00:16 UTC (rev 639)
@@ -1,13 +0,0 @@
-Index: components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapMemberShipDaoImpl.java
-===================================================================
---- components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapMemberShipDaoImpl.java (リビジョン 569682)
-+++ components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapMemberShipDaoImpl.java (作業コピー)
-@@ -57,7 +57,7 @@
- */
- public String[] searchGroupMemberShipByGroup(final String userPrincipalUid, SearchControls cons) throws NamingException {
-
-- String query = "(&(" + getGroupMembershipAttribute() + "=" + userPrincipalUid + ")" + getGroupFilter() + ")";
-+ String query = "(&(" + getGroupMembershipAttribute() + "=" + getUserDN(userPrincipalUid) + ")" + getGroupFilter() + ")";
-
- if (logger.isDebugEnabled())
- {
Modified: pal-portal/trunk/portal/patches/layout-portlets/src/webapp/WEB-INF/portlet.xml
===================================================================
--- pal-portal/trunk/portal/patches/layout-portlets/src/webapp/WEB-INF/portlet.xml 2007-10-18 04:29:24 UTC (rev 638)
+++ pal-portal/trunk/portal/patches/layout-portlets/src/webapp/WEB-INF/portlet.xml 2007-10-18 05:00:16 UTC (rev 639)
@@ -1,8 +1,8 @@
Index: layout-portlets/src/webapp/WEB-INF/portlet.xml
===================================================================
---- layout-portlets/src/webapp/WEB-INF/portlet.xml (リビジョン 569682)
+--- layout-portlets/src/webapp/WEB-INF/portlet.xml (リビジョン 574906)
+++ layout-portlets/src/webapp/WEB-INF/portlet.xml (作業コピー)
-@@ -18,38 +18,10 @@
+@@ -18,12 +18,11 @@
<portlet-app id="jetspeed" version="1.0">
@@ -12,45 +12,138 @@
- <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 id="VelocityOneColumn">
++ <portlet-name>VelocityOneColumn</portlet-name>
++ <display-name>One Column Layout</display-name>
++ <display-name xml:lang="ja">1 列レイアウト</display-name>
++ <init-param>
+ <name>ViewPage</name>
+ <value>columns</value>
+ </init-param>
+@@ -31,26 +30,42 @@
+ <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>
++ <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>0</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>
++ <supports>
++ <mime-type>text/vnd.wap.wml</mime-type>
++ <portlet-mode>view</portlet-mode>
++ </supports>
+ <portlet-info>
- <title>SimpleLayoutPortlet</title>
- <short-title>SimpleLayout</short-title>
-- </portlet-info>
++ <title>VelocityOneColumn</title>
++ <short-title>OneColumn</short-title>
+ </portlet-info>
- </portlet>
-
- <portlet id="VelocityOneColumn">
-+<portlet id="VelocityOneColumn">
- <portlet-name>VelocityOneColumn</portlet-name>
+- <portlet-name>VelocityOneColumn</portlet-name>
- <display-name>One Column</display-name>
- <display-name xml:lang="ja">Velocityを利用した 1 列レイアウト</display-name>
- <display-name xml:lang="zh">基于Velocity的单列布局</display-name>
- <display-name xml:lang="zh-TW">基於Velocity的單列佈局</display-name>
-+ <display-name>One Column Layout</display-name>
-+ <display-name xml:lang="ja">1 列レイアウト</display-name>
- <init-param>
+- <init-param>
++</portlet>
++
++<portlet id="VelocityTwoColumns">
++ <portlet-name>VelocityTwoColumns</portlet-name>
++ <display-name>Two Columns Layout(50/50)</display-name>
++ <display-name xml:lang="ja">2 列レイアウト(50/50)</display-name>
++ <init-param>
<name>ViewPage</name>
<value>columns</value>
-@@ -84,58 +56,15 @@
- <portlet-mode>view</portlet-mode>
+ </init-param>
+@@ -60,15 +75,15 @@
+ </init-param>
+ <init-param>
+ <name>columns</name>
+- <value>1</value>
++ <value>2</value>
+ </init-param>
+ <init-param>
+ <name>sizes</name>
+- <value>100%</value>
++ <value>50%,50%</value>
+ </init-param>
+ <init-param>
+ <name>layoutType</name>
+- <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>
+@@ -79,25 +94,58 @@
+ <portlet-mode>edit</portlet-mode>
+ <portlet-mode>help</portlet-mode>
</supports>
++ <portlet-info>
++ <title>VelocityTwoColumns</title>
++ <short-title>TwoColumns</short-title>
++ </portlet-info>
++</portlet>
++
++<portlet id="VelocityTwoColumns3366">
++ <portlet-name>VelocityTwoColumns3366</portlet-name>
++ <display-name>Two Columns Layout(33/66)</display-name>
++ <display-name xml:lang="ja">2 列レイアウト(33/66)</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>
++ </init-param>
++ <init-param>
++ <name>sizes</name>
++ <value>33%,66%</value>
++ </init-param>
++ <init-param>
++ <name>layoutType</name>
++ <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>
+ <supports>
+- <mime-type>text/vnd.wap.wml</mime-type>
+- <portlet-mode>view</portlet-mode>
++ <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>One Column</title>
-+ <title>VelocityOneColumn</title>
- <short-title>OneColumn</short-title>
+- <short-title>OneColumn</short-title>
++ <title>VelocityTwoColumns</title>
++ <short-title>TwoColumns</short-title>
</portlet-info>
</portlet>
@@ -60,53 +153,72 @@
- <display-name xml:lang="ja">Velocity とテーブルを利用した 1 列レイアウト</display-name>
- <display-name xml:lang="zh">基于Velocity表格的单列布局</display-name>
- <display-name xml:lang="zh-TW">基於Velocity表格的單列佈局</display-name>
-- <init-param>
-- <name>ViewPage</name>
++<portlet id="VelocityTwoColumns2575">
++ <portlet-name>VelocityTwoColumns2575</portlet-name>
++ <display-name>Two Columns Layout(25/75)</display-name>
++ <display-name xml:lang="ja">2 列レイアウト(25/75)</display-name>
+ <init-param>
+ <name>ViewPage</name>
- <value>tcolumns</value>
-- </init-param>
-- <init-param>
-- <name>MaxPage</name>
-- <value>maximized</value>
-- </init-param>
-- <init-param>
-- <name>columns</name>
++ <value>columns</value>
+ </init-param>
+ <init-param>
+ <name>MaxPage</name>
+@@ -105,15 +153,15 @@
+ </init-param>
+ <init-param>
+ <name>columns</name>
- <value>1</value>
-- </init-param>
-- <init-param>
-- <name>sizes</name>
++ <value>2</value>
+ </init-param>
+ <init-param>
+ <name>sizes</name>
- <value>100%</value>
-- </init-param>
-- <init-param>
-- <name>layoutType</name>
++ <value>25%,75%</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>0</expiration-cache>
-- <supports>
-- <mime-type>text/html</mime-type>
-- <portlet-mode>view</portlet-mode>
-- <portlet-mode>edit</portlet-mode>
++ <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>
+@@ -122,20 +170,18 @@
+ <mime-type>text/html</mime-type>
+ <portlet-mode>view</portlet-mode>
+ <portlet-mode>edit</portlet-mode>
- <portlet-mode>help</portlet-mode>
-- </supports>
-- <portlet-info>
++ <portlet-mode>help</portlet-mode>
+ </supports>
+ <portlet-info>
- <title>One Column with Tables</title>
- <short-title>OneColumnTable</short-title>
-- </portlet-info>
--</portlet>
--
- <portlet id="VelocityTwoColumns">
- <portlet-name>VelocityTwoColumns</portlet-name>
++ <title>VelocityTwoColumns</title>
++ <short-title>TwoColumns</short-title>
+ </portlet-info>
+ </portlet>
+
+-<portlet id="VelocityTwoColumns">
+- <portlet-name>VelocityTwoColumns</portlet-name>
- <display-name>Two Columns</display-name>
- <display-name xml:lang="ja">Velocity を利用した 2 列レイアウト</display-name>
- <display-name xml:lang="zh">基于Velocity的双列布局</display-name>
- <display-name xml:lang="zh-TW">基於Velocity的雙列佈局</display-name>
-+ <display-name>Two Columns Layout(50/50)</display-name>
-+ <display-name xml:lang="ja">2 列レイアウト(50/50)</display-name>
++<portlet id="VelocityTwoColumns2080">
++ <portlet-name>VelocityTwoColumns2080</portlet-name>
++ <display-name>Two Columns Layout(20/80)</display-name>
++ <display-name xml:lang="ja">2 列レイアウト(20/80)</display-name>
<init-param>
<name>ViewPage</name>
<value>columns</value>
-@@ -156,10 +85,6 @@
+@@ -150,16 +196,12 @@
+ </init-param>
+ <init-param>
+ <name>sizes</name>
+- <value>50%,50%</value>
++ <value>20%,80%</value>
+ </init-param>
+ <init-param>
<name>layoutType</name>
<value>TwoColumns</value>
</init-param>
@@ -117,8 +229,12 @@
<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>
-@@ -170,17 +95,15 @@
- <portlet-mode>help</portlet-mode>
+@@ -167,20 +209,18 @@
+ <mime-type>text/html</mime-type>
+ <portlet-mode>view</portlet-mode>
+ <portlet-mode>edit</portlet-mode>
+- <portlet-mode>help</portlet-mode>
++ <portlet-mode>help</portlet-mode>
</supports>
<portlet-info>
- <title>Two Columns</title>
@@ -133,23 +249,14 @@
- <display-name xml:lang="ja">Velocity を利用した左側にナビゲーションコントロール用の小さな列を持つ 2 列</display-name>
- <display-name xml:lang="zh">基于Velocity，导航栏较窄的双列布局</display-name>
- <display-name xml:lang="zh-TW">基於Velocity，導航欄較窄的雙列佈局</display-name>
-+<portlet id="VelocityTwoColumns2575">
-+ <portlet-name>VelocityTwoColumns2575</portlet-name>
-+ <display-name>Two Columns Layout(25/75)</display-name>
-+ <display-name xml:lang="ja">2 列レイアウト(25/75)</display-name>
++<portlet id="VelocityTwoColumns1585">
++ <portlet-name>VelocityTwoColumns1585</portlet-name>
++ <display-name>Two Columns Layout(15/85)</display-name>
++ <display-name xml:lang="ja">2 列レイアウト(15/85)</display-name>
<init-param>
<name>ViewPage</name>
<value>columns</value>
-@@ -195,7 +118,7 @@
- </init-param>
- <init-param>
- <name>sizes</name>
-- <value>15%,85%</value>
-+ <value>25%,75%</value>
- </init-param>
- <init-param>
- <name>layoutType</name>
-@@ -208,21 +131,18 @@
+@@ -208,21 +248,57 @@
<mime-type>text/html</mime-type>
<portlet-mode>view</portlet-mode>
<portlet-mode>edit</portlet-mode>
@@ -164,21 +271,59 @@
</portlet-info>
</portlet>
--
++<portlet id="VelocityTwoColumns1090">
++ <portlet-name>VelocityTwoColumns1090</portlet-name>
++ <display-name>Two Columns Layout(10/90)</display-name>
++ <display-name xml:lang="ja">2 列レイアウト(10/90)</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>
++ </init-param>
++ <init-param>
++ <name>sizes</name>
++ <value>10%,90%</value>
++ </init-param>
++ <init-param>
++ <name>layoutType</name>
++ <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>
++ <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>VelocityTwoColumns</title>
++ <short-title>TwoColumns</short-title>
++ </portlet-info>
++</portlet>
+
-<portlet id="VelocityThreeColumns">
- <portlet-name>VelocityThreeColumns</portlet-name>
- <display-name>Three Columns</display-name>
- <display-name xml:lang="ja">Velocity を利用した 3 列レイアウト</display-name>
- <display-name xml:lang="zh">基于Velocity的3列布局</display-name>
- <display-name xml:lang="zh-TW">基於Velocity的3列佈局</display-name>
-+<portlet id="VelocityTwoColumns3366">
-+ <portlet-name>VelocityTwoColumns3366</portlet-name>
-+ <display-name>Two Columns Layout(33/66)</display-name>
-+ <display-name xml:lang="ja">2 列レイアウト(33/66)</display-name>
++<portlet id="VelocityTwoColumns595">
++ <portlet-name>VelocityTwoColumns595</portlet-name>
++ <display-name>Two Columns Layout(5/95)</display-name>
++ <display-name xml:lang="ja">2 列レイアウト(5/95)</display-name>
<init-param>
<name>ViewPage</name>
<value>columns</value>
-@@ -233,15 +153,15 @@
+@@ -233,15 +309,15 @@
</init-param>
<init-param>
<name>columns</name>
@@ -188,7 +333,7 @@
<init-param>
<name>sizes</name>
- <value>33%,33%,33%</value>
-+ <value>33%,66%</value>
++ <value>5%,95%</value>
</init-param>
<init-param>
<name>layoutType</name>
@@ -197,7 +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>
-@@ -250,23 +170,21 @@
+@@ -250,23 +326,21 @@
<mime-type>text/html</mime-type>
<portlet-mode>view</portlet-mode>
<portlet-mode>edit</portlet-mode>
@@ -229,7 +374,7 @@
</init-param>
<init-param>
<name>MaxPage</name>
-@@ -274,15 +192,15 @@
+@@ -274,15 +348,15 @@
</init-param>
<init-param>
<name>columns</name>
@@ -248,7 +393,7 @@
</init-param>
<portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
<resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
-@@ -291,20 +209,18 @@
+@@ -291,20 +365,18 @@
<mime-type>text/html</mime-type>
<portlet-mode>view</portlet-mode>
<portlet-mode>edit</portlet-mode>
@@ -276,7 +421,7 @@
<init-param>
<name>ViewPage</name>
<value>columns</value>
-@@ -315,15 +231,15 @@
+@@ -315,15 +387,15 @@
</init-param>
<init-param>
<name>columns</name>
@@ -295,7 +440,7 @@
</init-param>
<portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
<resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
-@@ -335,19 +251,19 @@
+@@ -335,19 +407,19 @@
<supports>
<mime-type>text/vnd.wap.wml</mime-type>
<portlet-mode>view</portlet-mode>
@@ -316,44 +461,37 @@
- <display-name xml:lang="ja">ページアクションのない Velocity を利用した 2 列レイアウト</display-name>
- <display-name xml:lang="zh">没有页面状态、基于Velocity的双列布局</display-name>
- <display-name xml:lang="zh-TW">沒有頁面狀態、基於Velocity的雙列佈局</display-name>
-+<portlet id="VelocityThreeColumns">
-+ <portlet-name>VelocityThreeColumns</portlet-name>
-+ <display-name>Three Columns Layout(33/33/33)</display-name>
-+ <display-name xml:lang="ja">3 列レイアウト(33/33/33)</display-name>
++<portlet id="VelocityTwoColumns8020">
++ <portlet-name>VelocityTwoColumns8020</portlet-name>
++ <display-name>Two Columns Layout(80/20)</display-name>
++ <display-name xml:lang="ja">2 列レイアウト(80/20)</display-name>
<init-param>
<name>ViewPage</name>
<value>columns</value>
-@@ -358,15 +274,15 @@
+@@ -362,7 +434,7 @@
</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>
++ <value>80%,20%</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>
-@@ -374,19 +290,19 @@
- <supports>
+@@ -375,18 +447,22 @@
<mime-type>text/html</mime-type>
<portlet-mode>view</portlet-mode>
+ </supports>
++ <supports>
++ <mime-type>text/vnd.wap.wml</mime-type>
++ <portlet-mode>view</portlet-mode>
+ <portlet-mode>edit</portlet-mode>
-+ <portlet-mode>help</portlet-mode>
- </supports>
++ <portlet-mode>help</portlet-mode>
++ </supports>
<portlet-info>
- <title>Two Columns - No Actions</title>
- <short-title>TwoColumnsNoActions</short-title>
-+ <title>VelocityThreeColumns</title>
-+ <short-title>ThreeColumns</short-title>
++ <title>VelocityTwoColumns</title>
++ <short-title>TwoColumns</short-title>
</portlet-info>
</portlet>
@@ -363,34 +501,47 @@
- <display-name xml:lang="ja">ページアクションのない Velocity を利用した 3 列レイアウト</display-name>
- <display-name xml:lang="zh">没有页面状态、基于Velocity的3列布局</display-name>
- <display-name xml:lang="zh-TW">沒有頁面狀態、基於Velocity的3列佈局</display-name>
-+<portlet id="VelocityThreeColumns206020">
-+ <portlet-name>VelocityThreeColumns206020</portlet-name>
-+ <display-name>Three Columns Layout(20/60/20)</display-name>
-+ <display-name xml:lang="ja">3 列レイアウト(20/60/20)</display-name>
++<portlet id="VelocityTwoColumns8515">
++ <portlet-name>VelocityTwoColumns8515</portlet-name>
++ <display-name>Two Columns Layout(85/15)</display-name>
++ <display-name xml:lang="ja">2 列レイアウト(85/15)</display-name>
<init-param>
<name>ViewPage</name>
<value>columns</value>
-@@ -401,7 +317,7 @@
+@@ -397,15 +473,15 @@
</init-param>
<init-param>
+ <name>columns</name>
+- <value>3</value>
++ <value>2</value>
+ </init-param>
+ <init-param>
<name>sizes</name>
- <value>33%,33%,33%</value>
-+ <value>20%,60%,20%</value>
++ <value>85%,15%</value>
</init-param>
<init-param>
<name>layoutType</name>
-@@ -413,18 +329,19 @@
- <supports>
+- <value>ThreeColumns</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>
+@@ -414,17 +490,22 @@
<mime-type>text/html</mime-type>
<portlet-mode>view</portlet-mode>
+ </supports>
++ <supports>
++ <mime-type>text/vnd.wap.wml</mime-type>
++ <portlet-mode>view</portlet-mode>
+ <portlet-mode>edit</portlet-mode>
+ <portlet-mode>help</portlet-mode>
- </supports>
++ </supports>
<portlet-info>
- <title>Three Columns - No Actions</title>
- <short-title>ThreeColumnsNoActions</short-title>
-+ <title>VelocityThreeColumns</title>
-+ <short-title>ThreeColumns</short-title>
++ <title>VelocityTwoColumns</title>
++ <short-title>TwoColumns</short-title>
</portlet-info>
</portlet>
-<portlet id="VelocityTwoColumns2575NoActions">
@@ -400,89 +551,119 @@
- <display-name xml:lang="zh">没有页面状态、基于Velocity的双列布局</display-name>
- <display-name xml:lang="zh-TW">沒有頁面狀態、基於Velocity的雙列佈局</display-name>
+
-+<portlet id="VelocityFourColumns">
-+ <portlet-name>VelocityFourColumns</portlet-name>
-+ <display-name>Four Layout</display-name>
-+ <display-name xml:lang="ja">4 列レイアウト</display-name>
++<portlet id="VelocityTwoColumns9010">
++ <portlet-name>VelocityTwoColumns9010</portlet-name>
++ <display-name>Two Columns Layout(90/10)</display-name>
++ <display-name xml:lang="ja">2 列レイアウト(90/10)</display-name>
<init-param>
<name>ViewPage</name>
<value>columns</value>
-@@ -435,15 +352,15 @@
+@@ -439,7 +520,7 @@
</init-param>
<init-param>
- <name>columns</name>
-- <value>2</value>
-+ <value>4</value>
- </init-param>
- <init-param>
<name>sizes</name>
- <value>25%,75%</value>
-+ <value>20%,30%,30%,20%</value>
++ <value>90%,10%</value>
</init-param>
<init-param>
<name>layoutType</name>
-- <value>TwoColumns</value>
-+ <value>FourColumns</value>
- </init-param>
- <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
- <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
-@@ -451,22 +368,22 @@
- <supports>
+@@ -452,18 +533,22 @@
<mime-type>text/html</mime-type>
<portlet-mode>view</portlet-mode>
+ </supports>
++ <supports>
++ <mime-type>text/vnd.wap.wml</mime-type>
++ <portlet-mode>view</portlet-mode>
+ <portlet-mode>edit</portlet-mode>
-+ <portlet-mode>help</portlet-mode>
- </supports>
++ <portlet-mode>help</portlet-mode>
++ </supports>
<portlet-info>
- <title>Two Columns (25%/75%) No Actions</title>
- <short-title>VelocityTwoColumns2575NoActions</short-title>
-+ <title>VelocityFourColumns</title>
-+ <short-title>FourColumns</short-title>
++ <title>VelocityTwoColumns</title>
++ <short-title>TwoColumns</short-title>
</portlet-info>
</portlet>
--
+
-<portlet id="VelocityTwoColumns2575">
- <portlet-name>VelocityTwoColumns2575</portlet-name>
- <display-name>Two Columns (25%/75%)</display-name>
- <display-name xml:lang="ja">Velocity を利用した 25/75 の 2 列レイアウト</display-name>
- <display-name xml:lang="zh">基于Velocity的双列布局</display-name>
- <display-name xml:lang="zh-TW">基於Velocity的雙列佈局</display-name>
-+
-+<!--portlet id="FrameLayoutPortlet">
-+ <portlet-name>FrameLayoutPortlet</portlet-name>
-+ <display-name>Frame Layout</display-name>
-+ <display-name xml:lang="ja">フレームレイアウト</display-name>
++<portlet id="VelocityTwoColumns955">
++ <portlet-name>VelocityTwoColumns955</portlet-name>
++ <display-name>Two Columns Layout(95/5)</display-name>
++ <display-name xml:lang="ja">2 列レイアウト(95/5)</display-name>
<init-param>
<name>ViewPage</name>
-- <value>columns</value>
-+ <value>frames</value>
+ <value>columns</value>
+@@ -478,7 +563,7 @@
</init-param>
<init-param>
- <name>MaxPage</name>
-@@ -482,7 +399,7 @@
+ <name>sizes</name>
+- <value>25%,75%</value>
++ <value>95%,5%</value>
</init-param>
<init-param>
<name>layoutType</name>
-- <value>TwoColumns</value>
-+ <value>Frame</value>
- </init-param>
- <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
- <resource-bundle>org.apache.jetspeed.portlets.layout.resources.LayoutResource</resource-bundle>
-@@ -490,21 +407,17 @@
+@@ -490,21 +575,62 @@
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>view</portlet-mode>
-- <portlet-mode>edit</portlet-mode>
-- <portlet-mode>help</portlet-mode>
++ </supports>
++ <supports>
++ <mime-type>text/vnd.wap.wml</mime-type>
++ <portlet-mode>view</portlet-mode>
+ <portlet-mode>edit</portlet-mode>
++ <portlet-mode>help</portlet-mode>
++ </supports>
++ <portlet-info>
++ <title>VelocityTwoColumns</title>
++ <short-title>TwoColumns</short-title>
++ </portlet-info>
++</portlet>
++
++<portlet id="VelocityThreeColumns">
++ <portlet-name>VelocityThreeColumns</portlet-name>
++ <display-name>Three Columns Layout(33/33/33)</display-name>
++ <display-name xml:lang="ja">3 列レイアウト(33/33/33)</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>3</value>
++ </init-param>
++ <init-param>
++ <name>sizes</name>
++ <value>33%,33%,33%</value>
++ </init-param>
++ <init-param>
++ <name>layoutType</name>
++ <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>
++ <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>Two Columns (25%/75%)</title>
- <short-title>VelocityTwoColumns2575</short-title>
-+ <title>Frame Layout Portlet</title>
-+ <short-title>Frame Layout</short-title>
++ <title>VelocityThreeColumns</title>
++ <short-title>ThreeColumns</short-title>
</portlet-info>
--</portlet>
-+</portlet-->
+ </portlet>
-<portlet id="VelocityTwoColumnsSmallLeftNoActions">
- <portlet-name>VelocityTwoColumnsSmallLeftNoActions</portlet-name>
@@ -490,40 +671,44 @@
- <display-name xml:lang="ja">アクションのない Velocity を利用した左側にナビゲーションコントロール用の小さな列を持つ 2 列</display-name>
- <display-name xml:lang="zh">没有页面状态、基于Velocity，导航栏较窄的单列布局</display-name>
- <display-name xml:lang="zh-TW">沒有頁面狀態、基於Velocity，導航欄較窄的雙列佈局</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">ページアクションのない 1 列レイアウト</display-name>
++<portlet id="VelocityThreeColumns206020">
++ <portlet-name>VelocityThreeColumns206020</portlet-name>
++ <display-name>Three Columns Layout(20/60/20)</display-name>
++ <display-name xml:lang="ja">3 列レイアウト(20/60/20)</display-name>
<init-param>
<name>ViewPage</name>
<value>columns</value>
-@@ -515,15 +428,15 @@
+@@ -515,15 +641,15 @@
</init-param>
<init-param>
<name>columns</name>
- <value>2</value>
-+ <value>1</value>
++ <value>3</value>
</init-param>
<init-param>
<name>sizes</name>
- <value>15%,85%</value>
-+ <value>100%</value>
++ <value>20%,60%,20%</value>
</init-param>
<init-param>
<name>layoutType</name>
- <value>TwoColumns</value>
-+ <value>OneColumn</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>
-@@ -533,20 +446,18 @@
+@@ -531,22 +657,22 @@
+ <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>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>
++ <title>VelocityThreeColumns</title>
++ <short-title>ThreeColumns</short-title>
</portlet-info>
</portlet>
@@ -533,10 +718,10 @@
- <display-name xml:lang="ja">Velocity とテーブルを利用した 2 列レイアウト</display-name>
- <display-name xml:lang="zh">基于Velocity表格的双列布局</display-name>
- <display-name xml:lang="zh-TW">基於Velocity表格的雙列佈局</display-name>
-+<portlet id="VelocityTwoColumnsNoActions">
-+ <portlet-name>VelocityTwoColumnsNoActions</portlet-name>
-+ <display-name>Two Columns Layout with No Page Actions allowed</display-name>
-+ <display-name xml:lang="ja">ページアクションのない 2 列レイアウト</display-name>
++<portlet id="VelocityThreeColumns157015">
++ <portlet-name>VelocityThreeColumns157015</portlet-name>
++ <display-name>Three Columns Layout(15/70/15)</display-name>
++ <display-name xml:lang="ja">3 列レイアウト(15/70/15)</display-name>
<init-param>
<name>ViewPage</name>
- <value>tcolumns</value>
@@ -544,68 +729,208 @@
</init-param>
<init-param>
<name>MaxPage</name>
-@@ -570,20 +481,17 @@
- <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>Two Columns with Tables</title>
-- <short-title>Two Columns Tables</short-title>
-+ <title>VelocityTwoColumns</title>
-+ <short-title>TwoColumns</short-title>
- </portlet-info>
- </portlet>
-
--<portlet id="VelocityFourColumns">
-- <portlet-name>VelocityFourColumns</portlet-name>
-- <display-name>Four Columns</display-name>
-- <display-name xml:lang="zh">基于Velocity表格的4列布局</display-name>
-- <display-name xml:lang="zh-TW">基於Velocity表格的4列佈局</display-name>
-+<portlet id="VelocityThreeColumnsNoActions">
-+ <portlet-name>VelocityThreeColumnsNoActions</portlet-name>
-+ <display-name>Three Columns Layout with No Actions allowed</display-name>
-+ <display-name xml:lang="ja">ページアクションのない 3 列レイアウト</display-name>
- <init-param>
- <name>ViewPage</name>
- <value>columns</value>
-@@ -594,15 +502,15 @@
+@@ -554,15 +680,15 @@
</init-param>
<init-param>
<name>columns</name>
-- <value>4</value>
+- <value>2</value>
+ <value>3</value>
</init-param>
<init-param>
<name>sizes</name>
-- <value>20%,30%,30%,20%</value>
-+ <value>33%,33%,33%</value>
+- <value>50%,50%</value>
++ <value>15%,70%,15%</value>
</init-param>
<init-param>
<name>layoutType</name>
-- <value>FourColumns</value>
+- <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>
-@@ -610,14 +518,13 @@
- <supports>
+@@ -571,19 +697,18 @@
<mime-type>text/html</mime-type>
<portlet-mode>view</portlet-mode>
-- <portlet-mode>edit</portlet-mode>
+ <portlet-mode>edit</portlet-mode>
- <portlet-mode>help</portlet-mode>
++ <portlet-mode>help</portlet-mode>
</supports>
<portlet-info>
-- <title>Four Columns</title>
-- <short-title>FourColumns</short-title>
+- <title>Two Columns with Tables</title>
+- <short-title>Two Columns Tables</short-title>
+ <title>VelocityThreeColumns</title>
+ <short-title>ThreeColumns</short-title>
</portlet-info>
</portlet>
--
+
+ <portlet id="VelocityFourColumns">
+ <portlet-name>VelocityFourColumns</portlet-name>
+- <display-name>Four Columns</display-name>
+- <display-name xml:lang="zh">基于Velocity表格的4列布局</display-name>
+- <display-name xml:lang="zh-TW">基於Velocity表格的4列佈局</display-name>
++ <display-name>Four Layout</display-name>
++ <display-name xml:lang="ja">4 列レイアウト</display-name>
+ <init-param>
+ <name>ViewPage</name>
+ <value>columns</value>
+@@ -614,10 +739,159 @@
+ <portlet-mode>help</portlet-mode>
+ </supports>
+ <portlet-info>
+- <title>Four Columns</title>
++ <title>VelocityFourColumns</title>
+ <short-title>FourColumns</short-title>
+ </portlet-info>
+ </portlet>
+
++<!--portlet id="FrameLayoutPortlet">
++ <portlet-name>FrameLayoutPortlet</portlet-name>
++ <display-name>Frame Layout</display-name>
++ <display-name xml:lang="ja">フレームレイアウト</display-name>
++ <init-param>
++ <name>ViewPage</name>
++ <value>frames</value>
++ </init-param>
++ <init-param>
++ <name>MaxPage</name>
++ <value>maximized</value>
++ </init-param>
++ <init-param>
++ <name>columns</name>
++ <value>2</value>
++ </init-param>
++ <init-param>
++ <name>sizes</name>
++ <value>25%,75%</value>
++ </init-param>
++ <init-param>
++ <name>layoutType</name>
++ <value>Frame</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>
++ <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>
++ </portlet-info>
++</portlet-->
+
++<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">ページアクションのない 1 列レイアウト</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>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>0</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 with No Page Actions allowed</display-name>
++ <display-name xml:lang="ja">ページアクションのない 2 列レイアウト</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>
++ </init-param>
++ <init-param>
++ <name>sizes</name>
++ <value>50%,50%</value>
++ </init-param>
++ <init-param>
++ <name>layoutType</name>
++ <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>
++ <supports>
++ <mime-type>text/html</mime-type>
++ <portlet-mode>view</portlet-mode>
++ </supports>
++ <portlet-info>
++ <title>VelocityTwoColumns</title>
++ <short-title>TwoColumns</short-title>
++ </portlet-info>
++</portlet>
++
++<portlet id="VelocityThreeColumnsNoActions">
++ <portlet-name>VelocityThreeColumnsNoActions</portlet-name>
++ <display-name>Three Columns Layout with No Actions allowed</display-name>
++ <display-name xml:lang="ja">ページアクションのない 3 列レイアウト</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>3</value>
++ </init-param>
++ <init-param>
++ <name>sizes</name>
++ <value>33%,33%,33%</value>
++ </init-param>
++ <init-param>
++ <name>layoutType</name>
++ <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>
++ <supports>
++ <mime-type>text/html</mime-type>
++ <portlet-mode>view</portlet-mode>
++ </supports>
++ <portlet-info>
++ <title>VelocityThreeColumns</title>
++ <short-title>ThreeColumns</short-title>
++ </portlet-info>
++</portlet>
++
++
</portlet-app>
Modified: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml
===================================================================
--- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml 2007-10-18 04:29:24 UTC (rev 638)
+++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml 2007-10-18 05:00:16 UTC (rev 639)
@@ -1,8 +1,8 @@
Index: src/webapp/WEB-INF/assembly/pipelines.xml
===================================================================
---- src/webapp/WEB-INF/assembly/pipelines.xml (リビジョン 574906)
+--- src/webapp/WEB-INF/assembly/pipelines.xml (リビジョン 584942)
+++ src/webapp/WEB-INF/assembly/pipelines.xml (作業コピー)
-@@ -418,6 +418,7 @@
+@@ -419,6 +419,7 @@
<list>
<ref bean="capabilityValve"/>
<ref bean="localizationValve"/>