raphael 01/05/29 16:17:39
Modified: webapp/WEB-INF/conf admin.xreg controllers.xreg
portlets.xreg skins.xreg
webapp/WEB-INF/psml/anon/html default.psml
webapp/WEB-INF/psml/anon/html/en default.psml
webapp/WEB-INF/psml/user/admin/html default.psml
webapp/WEB-INF/psml/user/turbine/html default.psml
webapp/WEB-INF/psml/user/turbine/wml default.psml
Added: webapp/WEB-INF/templates/vm/portlets hello-customize.vm
hello.vm
Log:
initial landing of VelocityPortlet and VelocityPortletAction
+ test Velocity Portlet (HelloVelocity)
+ modification of PSML files to test it out
Revision Changes Path
1.3 +9 -0 jakarta-jetspeed/webapp/WEB-INF/conf/admin.xreg
Index: admin.xreg
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/admin.xreg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- admin.xreg 2001/05/28 15:17:32 1.2
+++ admin.xreg 2001/05/29 23:17:28 1.3
@@ -31,6 +31,15 @@
</meta-info>
</portlet-entry>
+ <portlet-entry type="ref" parent="Velocity" name="Login" hidden="true">
+ <parameter name="template" value="login" />
+ <parameter name="action" value="portlets.Login" />
+ <meta-info>
+ <title>Login</title>
+ <description>Login portlet</description>
+ </meta-info>
+ </portlet-entry>
+
<!-- BEGIN ADMIN PORTLETS -->
<portlet-entry type="instance" name="GlobalAdminPortlet" hidden="true">
1.2 +3 -0 jakarta-jetspeed/webapp/WEB-INF/conf/controllers.xreg
Index: controllers.xreg
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/controllers.xreg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- controllers.xreg 2001/05/02 10:52:34 1.1
+++ controllers.xreg 2001/05/29 23:17:29 1.2
@@ -10,11 +10,13 @@
<portlet-controller-entry name="DefaultPortletController">
<classname>org.apache.jetspeed.portal.controllers.DefaultPortletController</classname>
<media-type ref="html"/>
+ <media-type ref="wml"/>
</portlet-controller-entry>
<portlet-controller-entry name="FlowPortletController">
<classname>org.apache.jetspeed.portal.controllers.FlowPortletController</classname>
<media-type ref="html"/>
+ <media-type ref="wml"/>
</portlet-controller-entry>
<portlet-controller-entry name="GridPortletController">
@@ -25,6 +27,7 @@
<portlet-controller-entry name="RowColumnPortletController">
<classname>org.apache.jetspeed.portal.controllers.RowColumnPortletController</classname>
<media-type ref="html"/>
+ <media-type ref="wml"/>
</portlet-controller-entry>
</registry>
1.3 +13 -0 jakarta-jetspeed/webapp/WEB-INF/conf/portlets.xreg
Index: portlets.xreg
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/portlets.xreg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- portlets.xreg 2001/05/28 15:14:37 1.2
+++ portlets.xreg 2001/05/29 23:17:30 1.3
@@ -20,6 +20,10 @@
<media-type ref="wml"/>
</portlet-entry>
+ <portlet-entry type="abstract" name="Velocity">
+ <classname>org.apache.jetspeed.portal.portlets.VelocityPortlet</classname>
+ </portlet-entry>
+
<portlet-entry type="abstract" name="HTML">
<classname>org.apache.jetspeed.portal.portlets.FileServerPortlet</classname>
<media-type ref="html"/>
@@ -40,6 +44,15 @@
<classname>org.apache.jetspeed.portal.portlets.JetspeedContent</classname>
<parameter name="provider-name" value="jetspeed"/>
<media-type ref="html"/>
+ </portlet-entry>
+
+ <portlet-entry type="ref" parent="Velocity" name="HelloVelocity">
+ <parameter name="template" value="hello" />
+ <parameter name="action" value="portlets.HelloAction" />
+ <meta-info>
+ <title>HelloVelocity</title>
+ <description>Simple Velocity Portlet Example</description>
+ </meta-info>
</portlet-entry>
<portlet-entry type="ref" parent="HTML" name="Search">
1.2 +9 -0 jakarta-jetspeed/webapp/WEB-INF/conf/skins.xreg
Index: skins.xreg
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/skins.xreg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- skins.xreg 2001/05/27 15:35:41 1.1
+++ skins.xreg 2001/05/29 23:17:30 1.2
@@ -20,4 +20,13 @@
<property name="highlight-background-color" value="#FFCC00"/>
</skin-entry>
+ <skin-entry name="orange-red">
+ <property name="text-color" value="#000000"/>
+ <property name="background-color" value="#ffffff"/>
+ <property name="title-text-color" value="#000000"/>
+ <property name="title-background-color" value="#ffcc00"/>
+ <property name="highlight-text-color" value="#ffffff"/>
+ <property name="highlight-background-color" value="#990000"/>
+ </skin-entry>
+
</registry>
1.4 +3 -3 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- default.psml 2001/05/27 15:36:17 1.3
+++ default.psml 2001/05/29 23:17:32 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";>
+<portlets xmlns="http://xml.apache.org/jetspeed/2000/psml";>
+ <control name="TabControl"/>
<controller name="CardPortletController">
<parameter name="parameter" value="pane"/>
</controller>
- <control name="PanedPortletControl"/>
<skin name="orange-grey"/>
<portlets>
@@ -50,7 +50,7 @@
<parameter name="ruler-size" value="0"/>
</controller>
- <control name="PanedPortletControl"/>
+ <control name="TabControl"/>
<layout>
<property name="row" value="0"/>
1.4 +35 -12 jakarta-jetspeed/webapp/WEB-INF/psml/anon/html/en/default.psml
Index: default.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/anon/html/en/default.psml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- default.psml 2001/05/27 15:36:18 1.3
+++ default.psml 2001/05/29 23:17:33 1.4
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<portlets user="default" xmlns="http://xml.apache.org/jetspeed/2000/psml";>
+<portlets xmlns="http://xml.apache.org/jetspeed/2000/psml";>
+ <control name="TabControl"/>
+
<controller name="CardPortletController">
<parameter name="parameter" value="pane"/>
</controller>
- <control name="PanedPortletControl"/>
<skin name="orange-grey"/>
<portlets>
@@ -21,14 +22,14 @@
<portlets>
<controller name="RowColumnPortletController"/>
- <entry type="ref" parent="JetspeedContent"/>
+ <entry parent="JetspeedContent"/>
</portlets>
<portlets>
<controller name="RowColumnPortletController"/>
- <entry type="ref" parent="Jetspeed"/>
- <entry type="ref" parent="Welcome"/>
+ <entry parent="Jetspeed"/>
+ <entry parent="Welcome"/>
</portlets>
</portlets>
@@ -40,7 +41,7 @@
</controller>
<metainfo>
- <title>RSS Sources</title>
+ <title>RSS</title>
</metainfo>
<portlets>
@@ -50,37 +51,59 @@
<parameter name="ruler-size" value="0"/>
</controller>
- <control name="PanedPortletControl"/>
+ <control name="TabControl"/>
<layout>
<property name="row" value="0"/>
<property name="column" value="0"/>
</layout>
- <entry type="ref"
parent="http://jakarta.apache.org/jetspeed/channels/jetspeed.rss";>
+ <entry parent="http://jakarta.apache.org/jetspeed/channels/jetspeed.rss";>
<control name="ClearPortletControl"/>
</entry>
- <entry type="ref"
parent="http://jakarta.apache.org/jetspeed/channels/turbine.rss";>
+ <entry parent="http://jakarta.apache.org/jetspeed/channels/turbine.rss";>
<control name="ClearPortletControl"/>
</entry>
- <entry type="ref" parent="http://www.mozilla.org/news.rdf";>
+ <entry parent="http://www.mozilla.org/news.rdf";>
<control name="ClearPortletControl"/>
<parameter name="itemdisplayed" value="5"/>
</entry>
- <entry type="ref"
parent="http://www.apacheweek.com/issues/apacheweek-headlines.xml";>
+ <entry parent="http://www.apacheweek.com/issues/apacheweek-headlines.xml";>
<control name="ClearPortletControl"/>
<parameter name="showtitle" value="false"/>
<parameter name="showdescription" value="false"/>
</entry>
- <entry type="ref" parent="http://www.xmlhack.com/rsscat.php";>
+ <entry parent="http://www.xmlhack.com/rsscat.php";>
<control name="ClearPortletControl"/>
</entry>
</portlets>
</portlets>
+ <portlets>
+ <controller name="RowColumnPortletController">
+ <parameter name="mode" value="row"/>
+ </controller>
+
+ <metainfo>
+ <title>Dynamic</title>
+ </metainfo>
+
+ <portlets>
+ <controller name="RowColumnPortletController"/>
+
+ <entry parent="JetspeedContent"/>
+ </portlets>
+
+ <portlets>
+ <controller name="RowColumnPortletController"/>
+
+ <entry parent="HelloVelocity"/>
+ </portlets>
+
+ </portlets>
</portlets>
1.2 +8 -25
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default.psml 2001/01/29 08:45:14 1.1
+++ default.psml 2001/05/29 23:17:34 1.2
@@ -1,15 +1,11 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<portlets user="default" xmlns="http://xml.apache.org/jetspeed/2000/psml";>
+<portlets xmlns="http://xml.apache.org/jetspeed/2000/psml";>
- <skin>
- <property name="selected-color" value="#FFCC00"/>
- <property name="title-color" value="#dddddd"/>
- <property name="width" value="100%"/>
- </skin>
+ <skin name="orange-grey"/>
- <control name="org.apache.jetspeed.portal.controls.PanedPortletControl"/>
+ <control name="TabControl"/>
- <controller name="org.apache.jetspeed.portal.controllers.CardPortletController">
+ <controller name="CardPortletController">
<parameter name="parameter" value="pane"/>
</controller>
@@ -17,12 +13,8 @@
<metainfo>
<title>Content</title>
</metainfo>
- <controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
+ <controller name="RowColumnPortletController"/>
- <skin>
- <property name="title-color" value="#FFCC00"/>
- </skin>
-
<entry type="ref" parent="AdminInfo"/>
<entry type="ref" parent="Search"/>
</portlets>
@@ -31,19 +23,10 @@
<metainfo>
<title>Admin</title>
</metainfo>
+
+ <control name="MenuControl"/>
- <skin>
- <property name="selected-color" value="#FFCC00"/>
- <property name="title-color" value="#dddddd"/>
- </skin>
-
- <control name="org.apache.jetspeed.portal.controls.PanedPortletControl">
- <parameter name="position" value="west"/>
- <parameter name="tab-width" value="150"/>
- <parameter name="ruler-size" value="0"/>
- </control>
-
- <controller name="org.apache.jetspeed.portal.controllers.CardPortletController">
+ <controller name="CardPortletController">
<parameter name="parameter" value="select-panel"/>
</controller>
1.6 +8 -7
jakarta-jetspeed/webapp/WEB-INF/psml/user/turbine/html/default.psml
Index: default.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/user/turbine/html/default.psml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- default.psml 2001/05/27 15:36:19 1.5
+++ default.psml 2001/05/29 23:17:36 1.6
@@ -1,22 +1,23 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<portlets user="default" xmlns="http://xml.apache.org/jetspeed/2000/psml";>
+<portlets xmlns="http://xml.apache.org/jetspeed/2000/psml";>
<controller name="RowColumnPortletController">
<parameter name="sizes" value="70%,30%"/>
<parameter name="mode" value="row"/>
</controller>
- <skin name="orange-grey"/>
+ <skin name="orange-red"/>
<portlets>
- <entry type="ref"
parent="http://jakarta.apache.org/jetspeed/channels/turbine.rss"/>
- <entry type="ref"
parent="http://jakarta.apache.org/jetspeed/channels/jetspeed.rss"/>
- <entry type="ref" parent="http://www.xmlhack.com/rsscat.php"/>
+ <entry parent="HelloVelocity"/>
+ <entry parent="http://jakarta.apache.org/jetspeed/channels/jetspeed.rss"/>
+ <entry parent="http://www.xmlhack.com/rsscat.php"/>
</portlets>
<portlets>
- <entry type="ref" parent="http://www.mozilla.org/news.rdf"/>
- <entry type="ref"
parent="http://www.apacheweek.com/issues/apacheweek-headlines.xml"/>
+ <entry parent="http://jakarta.apache.org/jetspeed/channels/turbine.rss"/>
+ <entry parent="http://www.mozilla.org/news.rdf"/>
+ <entry parent="http://www.apacheweek.com/issues/apacheweek-headlines.xml"/>
</portlets>
</portlets>
1.2 +4 -5
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default.psml 2001/05/08 19:58:54 1.1
+++ default.psml 2001/05/29 23:17:37 1.2
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
-<portlets user="turbine" xmlns="http://www.apache.org/2000/02/CVS";>
+<portlets user="turbine" xmlns="http://xml.apache.org/jetspeed/2000/psml";>
<controller name="org.apache.jetspeed.portal.controllers.WMLCardController"/>
<portlets>
-<controller
name="org.apache.jetspeed.portal.controllers.RowColumnPortletController"/>
+<controller name="RowColumnPortletController"/>
<entry type="ref" parent="Apacheweek">
<control name="org.apache.jetspeed.portal.controls.TitleControl"/>
<parameter name="showDescription" value="true"/>
@@ -20,7 +20,6 @@
<entry type="ref" parent="Stocks">
<control name="org.apache.jetspeed.portal.controls.TitleControl"/>
-</entry><
-
-/portlets>
+</entry>
+</portlets>
</portlets>
1.1
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/hello-customize.vm
Index: hello-customize.vm
===================================================================
#if (!$text)
#set ( $text = "HelloWorld" )
#end
<form action="$jlink" method="post">
<input type="hidden" name="$jlink.ActionKey" value="controls.CustomizeDone" />
<p>Please Enter the new text for this portlet:
<br /><input name="text" value="$text" size="30" />
<input type="submit" name="eventSubmit_doUpdate" value="OK" />
</p>
</form>
1.1 jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/hello.vm
Index: hello.vm
===================================================================
#if (!$text)
#set ( $text = "HelloWorld" )
#end
<form action="$jlink" method="post">
<font color="$!{skin.Color}">
<h2>$text</h2>
<p>If you want to change this text, please enter it below :
<br /><input name="text" value="$text" size="30" />
<input type="submit" name="eventSubmit_doUpdate" value="Update" />
</p>
</font>
</form>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
