raphael 02/05/04 11:03:20
Modified: webapp/WEB-INF/psml info.psml
webapp/WEB-INF/psml/anon/html default.psml
webapp/WEB-INF/psml/anon/html/en news.psml
webapp/WEB-INF/psml/anon/html/es news.psml
webapp/WEB-INF/psml/anon/wml default.psml
webapp/WEB-INF/psml/anon/wml/en default.psml
webapp/WEB-INF/psml/group/Jetspeed default.psml news.psml
webapp/WEB-INF/psml/group/apache default.psml news.psml
webapp/WEB-INF/psml/role/admin default.psml
webapp/WEB-INF/psml/role/user default.psml
webapp/WEB-INF/psml/user/admin/html default.psml
webapp/WEB-INF/psml/user/admin/wml default.psml
webapp/WEB-INF/psml/user/turbine/wml default.psml
Log:
fix PSML files to always use registry entries instead
of direct class instanciation for controls and controllers
Revision Changes Path
1.4 +2 -2 jakarta-jetspeed/webapp/WEB-INF/psml/info.psml
Index: info.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/info.psml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- info.psml 27 May 2001 15:36:17 -0000 1.3
+++ info.psml 4 May 2002 18:03:19 -0000 1.4
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<portlets user="default" xmlns="http://xml.apache.org/jetspeed/2000/psml";>
- <controller name="RowColumnPortletController"/>
+ <controller name="ColumnController"/>
<skin name="orange-grey"/>
<entry type="ref" parent="PortletInfoPortlet">
- <control name="org.apache.jetspeed.portal.controls.FullScreenControl"/>
+ <control name="FullScreenControl"/>
</entry>
</portlets>
1.9 +38 -28 jakarta-jetspeed/webapp/WEB-INF/psml/anon/html/default.psml
Index: default.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/anon/html/default.psml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- default.psml 23 Mar 2002 22:18:17 -0000 1.8
+++ default.psml 4 May 2002 18:03:19 -0000 1.9
@@ -13,26 +13,32 @@
<skin name="orange-grey"/>
<portlets>
- <controller name="RowColumnPortletController">
+ <controller name="TwoColumns">
<parameter name="sizes" value="66%,34%"/>
- <parameter name="mode" value="row"/>
</controller>
<metainfo>
<title>Home Page</title>
</metainfo>
- <portlets>
- <controller name="RowColumnPortletController"/>
- <entry parent="JetspeedContent"/>
- </portlets>
-
- <portlets>
- <controller name="RowColumnPortletController"/>
-
- <entry parent="Jetspeed"/>
- <entry parent="Welcome"/>
- </portlets>
+ <entry parent="JetspeedContent">
+ <layout>
+ <property name="row" value="0"/>
+ <property name="column" value="0"/>
+ </layout>
+ </entry>
+ <entry parent="Jetspeed">
+ <layout>
+ <property name="row" value="0"/>
+ <property name="column" value="1"/>
+ </layout>
+ </entry>
+ <entry parent="Welcome">
+ <layout>
+ <property name="row" value="1"/>
+ <property name="column" value="1"/>
+ </layout>
+ </entry>
</portlets>
@@ -76,26 +82,30 @@
</portlets>
<portlets>
- <controller name="RowColumnPortletController">
- <parameter name="mode" value="row"/>
- </controller>
+ <controller name="TwoColumns" />
<metainfo>
<title>Dynamic</title>
</metainfo>
- <portlets>
- <controller name="RowColumnPortletController"/>
-
- <entry parent="JetspeedContent"/>
- </portlets>
-
- <portlets>
- <controller name="RowColumnPortletController"/>
-
- <entry parent="HelloVelocity"/>
- <entry parent="HelloVelocityCached"/>
- </portlets>
+ <entry parent="JetspeedContent">
+ <layout>
+ <property name="row" value="0"/>
+ <property name="column" value="0"/>
+ </layout>
+ </entry>
+ <entry parent="HelloVelocity">
+ <layout>
+ <property name="row" value="0"/>
+ <property name="column" value="1"/>
+ </layout>
+ </entry>
+ <entry parent="HelloVelocityCached">
+ <layout>
+ <property name="row" value="1"/>
+ <property name="column" value="1"/>
+ </layout>
+ </entry>
</portlets>
</portlets>
1.3 +4 -22 jakarta-jetspeed/webapp/WEB-INF/psml/anon/html/en/news.psml
Index: news.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/anon/html/en/news.psml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- news.psml 31 Jan 2002 12:24:28 -0000 1.2
+++ news.psml 4 May 2002 18:03:19 -0000 1.3
@@ -4,28 +4,10 @@
<title>News Page</title>
</metainfo>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController">
- <parameter name="sizes" value="100%"/>
- <parameter name="mode" value="row"/>
- </controller>
+ <controller name="ColumnController" />
+ <skin name="orange-red" />
- <skin>
- <property name="selected-color" value="#990000"/>
- <property name="background-color" value="#FFFFFF"/>
- <property name="title-color" value="#FFCC00"/>
- </skin>
-
- <portlets>
- <skin>
- <property name="background-color" value="#eeeeee"/>
- </skin>
-
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
-
- <entry type="ref" parent="Apacheweek"/>
-
- <entry type="ref" parent="XMLHack"/>
-
- </portlets>
+ <entry type="ref" parent="Apacheweek"/>
+ <entry type="ref" parent="XMLHack"/>
</portlets>
1.3 +7 -24 jakarta-jetspeed/webapp/WEB-INF/psml/anon/html/es/news.psml
Index: news.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/anon/html/es/news.psml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- news.psml 31 Jan 2002 12:24:28 -0000 1.2
+++ news.psml 4 May 2002 18:03:20 -0000 1.3
@@ -4,32 +4,15 @@
<title>P�gina de Noticias</title>
</metainfo>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController">
- <parameter name="sizes" value="100%"/>
- <parameter name="mode" value="row"/>
- </controller>
+ <controller name="ColumnController" />
+ <skin name="orange-red" />
- <skin>
- <property name="selected-color" value="#990000"/>
- <property name="background-color" value="#FFFFFF"/>
- <property name="title-color" value="#FFCC00"/>
- </skin>
+ <entry parent="http://barrapunto.com/barrapunto.rdf";>
+ <parameter name="itemdisplayed" value="5"/>
+ </entry>
- <portlets>
- <skin>
- <property name="background-color" value="#eeeeee"/>
- </skin>
+ <entry type="ref" parent="Apacheweek"/>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
-
- <entry parent="http://barrapunto.com/barrapunto.rdf";>
- <parameter name="itemdisplayed" value="5"/>
- </entry>
-
- <entry type="ref" parent="Apacheweek"/>
-
- <entry type="ref" parent="XMLHack"/>
-
- </portlets>
+ <entry type="ref" parent="XMLHack"/>
</portlets>
1.5 +1 -1 jakarta-jetspeed/webapp/WEB-INF/psml/anon/wml/default.psml
Index: default.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/anon/wml/default.psml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- default.psml 3 Dec 2001 03:16:07 -0000 1.4
+++ default.psml 4 May 2002 18:03:20 -0000 1.5
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<portlets xmlns="http://xml.apache.org/jetspeed/2000/psml";>
-<controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
+<controller name="FlowPortletController"/>
<control name="ClearPortletControl"/>
<portlets>
1.4 +1 -1 jakarta-jetspeed/webapp/WEB-INF/psml/anon/wml/en/default.psml
Index: default.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/anon/wml/en/default.psml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- default.psml 3 Dec 2001 03:16:07 -0000 1.3
+++ default.psml 4 May 2002 18:03:20 -0000 1.4
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<portlets xmlns="http://xml.apache.org/jetspeed/2000/psml";>
-<controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
+<controller name="FlowPortletController"/>
<control name="ClearPortletControl"/>
<portlets>
1.3 +3 -13 jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/default.psml
Index: default.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/default.psml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default.psml 31 Jan 2002 12:24:29 -0000 1.2
+++ default.psml 4 May 2002 18:03:20 -0000 1.3
@@ -4,24 +4,15 @@
<title>Default Jetspeed Group page</title>
</metainfo>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController">
- <parameter name="sizes" value="50%,50%"/>
- <parameter name="mode" value="row"/>
- </controller>
-
- <skin>
- <property name="selected-color" value="#990000"/>
- <property name="background-color" value="#FFFFFF"/>
- <property name="title-color" value="#FFCC00"/>
- </skin>
+ <controller name="RowController" />
+
+ <skin name="orange-red" />
<portlets>
<skin>
<property name="background-color" value="#eeeeee"/>
</skin>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
-
<entry type="ref" parent="Apacheweek"/>
<entry type="ref" parent="Mozilla">
@@ -31,7 +22,6 @@
</portlets>
<portlets>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
<entry type="ref" parent="XMLHack"/>
</portlets>
1.3 +4 -23 jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/news.psml
Index: news.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/group/Jetspeed/news.psml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- news.psml 31 Jan 2002 12:24:29 -0000 1.2
+++ news.psml 4 May 2002 18:03:20 -0000 1.3
@@ -4,28 +4,9 @@
<title>Default Jetspeed News page</title>
</metainfo>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController">
- <parameter name="sizes" value="100%"/>
- <parameter name="mode" value="row"/>
- </controller>
-
- <skin>
- <property name="selected-color" value="#990000"/>
- <property name="background-color" value="#FFFFFF"/>
- <property name="title-color" value="#FFCC00"/>
- </skin>
-
- <portlets>
- <skin>
- <property name="background-color" value="#eeeeee"/>
- </skin>
-
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
-
- <entry type="ref" parent="Apacheweek"/>
-
- <entry type="ref" parent="XMLHack"/>
-
- </portlets>
+ <controller name="ColumnController" />
+ <skin name="orange-red" />
+ <entry type="ref" parent="Apacheweek"/>
+ <entry type="ref" parent="XMLHack"/>
</portlets>
1.4 +1 -15 jakarta-jetspeed/webapp/WEB-INF/psml/group/apache/default.psml
Index: default.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/group/apache/default.psml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- default.psml 19 Apr 2002 04:36:12 -0000 1.3
+++ default.psml 4 May 2002 18:03:20 -0000 1.4
@@ -4,34 +4,20 @@
<title>Default Apache Group page</title>
</metainfo>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController">
- <parameter name="sizes" value="50%,50%"/>
- <parameter name="mode" value="row"/>
- </controller>
-
- <skin>
- <property name="selected-color" value="#990000"/>
- <property name="background-color" value="#FFFFFF"/>
- <property name="title-color" value="#FFCC00"/>
- </skin>
+ <controller name="RowController"/>
<portlets>
<skin>
<property name="background-color" value="#eeeeee"/>
</skin>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
-
<entry type="ref" parent="Apacheweek"/>
-
<entry type="ref" parent="Mozilla">
<parameter name="itemDisplayed" value="5"/>
</entry>
-
</portlets>
<portlets>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
<entry type="ref" parent="XMLHack"/>
</portlets>
1.4 +3 -9 jakarta-jetspeed/webapp/WEB-INF/psml/group/apache/news.psml
Index: news.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/group/apache/news.psml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- news.psml 19 Apr 2002 04:36:12 -0000 1.3
+++ news.psml 4 May 2002 18:03:20 -0000 1.4
@@ -4,16 +4,10 @@
<title>Default Apache News page</title>
</metainfo>
- <controller name="RowColumnPortletController"/>
+ <controller name="ColumnController"/>
- <portlets id='5001'>
+ <entry id='5001' type="ref" parent="Apacheweek"/>
- <controller name="RowColumnPortletController"/>
-
- <entry id='5002' type="ref" parent="Apacheweek"/>
-
- <entry id='5003' type="ref" parent="XMLHack"/>
-
- </portlets>
+ <entry id='5002' type="ref" parent="XMLHack"/>
</portlets>
1.2 +23 -29 jakarta-jetspeed/webapp/WEB-INF/psml/role/admin/default.psml
Index: default.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/role/admin/default.psml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default.psml 30 Jul 2001 04:35:53 -0000 1.1
+++ default.psml 4 May 2002 18:03:20 -0000 1.2
@@ -1,35 +1,29 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<portlets user="default" xmlns="http://xml.apache.org/jetspeed/2000/psml";>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController">
- <parameter name="sizes" value="50%,50%"/>
- <parameter name="mode" value="row"/>
- </controller>
+ <controller name="TwoColumns" />
+ <skin name="orange-red" />
- <skin>
- <property name="selected-color" value="#990000"/>
- <property name="background-color" value="#FFFFFF"/>
- <property name="title-color" value="#FFCC00"/>
- </skin>
-
- <portlets>
- <skin>
- <property name="background-color" value="#eeeeee"/>
- </skin>
-
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
-
- <entry type="ref" parent="Apacheweek"/>
-
- <entry type="ref" parent="Mozilla">
- <parameter name="itemDisplayed" value="5"/>
- </entry>
-
- </portlets>
-
- <portlets>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
- <entry type="ref" parent="XMLHack"/>
- </portlets>
+ <entry type="ref" parent="Apacheweek">
+ <layout>
+ <property name="row" value="0"/>
+ <property name="column" value="0"/>
+ </layout>
+ </entry>
+
+ <entry type="ref" parent="Mozilla">
+ <parameter name="itemDisplayed" value="5"/>
+ <layout>
+ <property name="row" value="1"/>
+ <property name="column" value="0"/>
+ </layout>
+ </entry>
+
+ <entry type="ref" parent="XMLHack">
+ <layout>
+ <property name="row" value="0"/>
+ <property name="column" value="1"/>
+ </layout>
+ </entry>
</portlets>
1.2 +23 -29 jakarta-jetspeed/webapp/WEB-INF/psml/role/user/default.psml
Index: default.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/role/user/default.psml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default.psml 30 Jul 2001 04:35:53 -0000 1.1
+++ default.psml 4 May 2002 18:03:20 -0000 1.2
@@ -1,35 +1,29 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<portlets user="default" xmlns="http://xml.apache.org/jetspeed/2000/psml";>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController">
- <parameter name="sizes" value="50%,50%"/>
- <parameter name="mode" value="row"/>
- </controller>
+ <controller name="TwoColumns" />
+ <skin name="orange-red" />
- <skin>
- <property name="selected-color" value="#990000"/>
- <property name="background-color" value="#FFFFFF"/>
- <property name="title-color" value="#FFCC00"/>
- </skin>
-
- <portlets>
- <skin>
- <property name="background-color" value="#eeeeee"/>
- </skin>
-
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
-
- <entry type="ref" parent="Apacheweek"/>
-
- <entry type="ref" parent="Mozilla">
- <parameter name="itemDisplayed" value="5"/>
- </entry>
-
- </portlets>
-
- <portlets>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
- <entry type="ref" parent="XMLHack"/>
- </portlets>
+ <entry type="ref" parent="Apacheweek">
+ <layout>
+ <property name="row" value="0"/>
+ <property name="column" value="0"/>
+ </layout>
+ </entry>
+
+ <entry type="ref" parent="Mozilla">
+ <parameter name="itemDisplayed" value="5"/>
+ <layout>
+ <property name="row" value="1"/>
+ <property name="column" value="0"/>
+ </layout>
+ </entry>
+
+ <entry type="ref" parent="XMLHack">
+ <layout>
+ <property name="row" value="0"/>
+ <property name="column" value="1"/>
+ </layout>
+ </entry>
</portlets>
1.11 +1 -1
jakarta-jetspeed/webapp/WEB-INF/psml/user/admin/html/default.psml
Index: default.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/user/admin/html/default.psml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- default.psml 19 Apr 2002 04:36:12 -0000 1.10
+++ default.psml 4 May 2002 18:03:20 -0000 1.11
@@ -7,7 +7,7 @@
<control name="TabControl"/>
<skin name="orange-grey"/>
<portlets id='301'>
- <controller name="RowColumnPortletController"/>
+ <controller name="ColumnController"/>
<metainfo>
<title>Content</title>
</metainfo>
1.2 +1 -1 jakarta-jetspeed/webapp/WEB-INF/psml/user/admin/wml/default.psml
Index: default.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/user/admin/wml/default.psml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default.psml 6 Dec 2001 06:03:39 -0000 1.1
+++ default.psml 4 May 2002 18:03:20 -0000 1.2
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<portlets xmlns="http://www.apache.org/2000/02/CVS";>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
+ <controller name="FlowPortletController"/>
<control name="ClearPortletControl"/>
<portlets>
<controller name="ColumnController"/>
1.4 +1 -1
jakarta-jetspeed/webapp/WEB-INF/psml/user/turbine/wml/default.psml
Index: default.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/user/turbine/wml/default.psml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- default.psml 6 Dec 2001 06:03:39 -0000 1.3
+++ default.psml 4 May 2002 18:03:20 -0000 1.4
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<portlets xmlns="http://www.apache.org/2000/02/CVS";>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
+ <controller name="FlowPortletController"/>
<control name="ClearPortletControl"/>
<portlets>
<controller name="ColumnController"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
