taylor 2004/11/11 22:32:31
Modified: applications/demo project.xml
applications/demo/src/webapp/WEB-INF web.xml portlet.xml
Added: applications/demo/src/webapp/WEB-INF/velocity toolbox.xml
velocity.properties velocity-macros.vm
applications/demo/src/webapp/WEB-INF/view iframe-help.html
edit-prefs.vm
Log:
toying around with the stupid fw, code masterbation, start of site portlet
Revision Changes Path
1.1
jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/velocity/toolbox.xml
Index: toolbox.xml
===================================================================
<?xml version="1.0"?>
<toolbox>
</toolbox>
1.1
jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/velocity/velocity.properties
Index: velocity.properties
===================================================================
# Copyright 2004 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#----------------------------------------------------------------------------
# These are the default properties for the
# Velocity Runtime. These values are used when
# Runtime.init() is called, and when Runtime.init(properties)
# fails to find the specificed properties file.
#----------------------------------------------------------------------------
#----------------------------------------------------------------------------
# R U N T I M E L O G
#----------------------------------------------------------------------------
# This is the location of the Velocity Runtime log.
#----------------------------------------------------------------------------
runtime.log = velocity.log
#----------------------------------------------------------------------------
# T E M P L A T E E N C O D I N G
#----------------------------------------------------------------------------
template.encoding=8859_1
#----------------------------------------------------------------------------
# C O N T E N T T Y P E
#----------------------------------------------------------------------------
# This is the default content type for the VelocityServlet.
#----------------------------------------------------------------------------
default.contentType=text/html
#----------------------------------------------------------------------------
# F O R E A C H P R O P E R T I E S
#----------------------------------------------------------------------------
# These properties control how the counter is accessed in the #foreach
# directive. By default the reference $velocityCount will be available
# in the body of the #foreach directive. The default starting value
# for this reference is 1.
#----------------------------------------------------------------------------
counter.name = velocityCount
counter.initial.value = 1
#----------------------------------------------------------------------------
# I N C L U D E P R O P E R T I E S
#----------------------------------------------------------------------------
# These are the properties that governed the way #include'd content
# is governed.
#----------------------------------------------------------------------------
include.path=.
include.cache = false
include.output.errormsg.start = <!-- include error :
include.output.errormsg.end = see error log -->
#----------------------------------------------------------------------------
# P A R S E P R O P E R T I E S
#----------------------------------------------------------------------------
parse_directive.maxdepth = 10
#----------------------------------------------------------------------------
# T E M P L A T E L O A D E R S
#----------------------------------------------------------------------------
#
#
#----------------------------------------------------------------------------
template.loader.1.public.name = File
template.loader.1.description = Velocity File Template Loader
template.loader.1.class =
org.apache.velocity.runtime.loader.FileTemplateLoader
template.loader.1.template.path = .
template.loader.1.cache = false
template.loader.1.modificationCheckInterval = 2
velocimacro.library.autoreload = true
velocimacro.permissions.allow.inline.to.replace.global = true
velocimacro.library = /WEB-INF/VM_global_library.vm,
/WEB-INF/velocity/velocity-macros.vm
#template.loader.2.public.name = URL
#template.loader.2.description = Velocity URL Template Loader
#template.loader.2.class =
org.apache.velocity.runtime.loader.URLTemplateLoader
#template.loader.2.template.path = http://localhost/templates/
#template.loader.2.cache = false
#----------------------------------------------------------------------------
# E X T E R N A L S E R V I C E I N I T I A L I Z A T I O N
#----------------------------------------------------------------------------
# If this property is set to true then an external service will
# set certain system properties and initialize the Velocity
# Runtime. This method is used by Turbine to initialize the
# Velocity Runtime for the TurbineVelocityService.
#----------------------------------------------------------------------------
external.init = false
1.1
jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/velocity/velocity-macros.vm
Index: velocity-macros.vm
===================================================================
#macro (headerCell $body)
<th class="portlet-section-header">
<b>
$body
</b>
</th>
#end
#macro (entryCell $body)
<td class='portlet-section-body'>
$body
</td>
#end
#macro (entryCell2 $body $count)
#if (($count % 2) == 0)
<td class='portlet-section-body'>
#else
<td class='portlet-section-alternate'>
#end
$body
</td>
#end
#macro (formField $label $value $size $id $MESSAGES $ERRORS)
#if ($ERRORS)
#set ($eflag = "$!ERRORS.get($id)")
#else
#set ($eflag = "")
#end
<tr colspan="4" align="right">
#if ($!eflag == "")
<td width="5%" align="left"> </td>
#else
<td width="5%" class="portlet-msg-error" align="left"> </td>
#end
<td nowrap class="portlet-section-alternate"
align="right">$!MESSAGES.getString($label): </td>
<td class="portlet-section-body" align="left">
<input id="$!id" type="text" name="$!id" size="$!size" value="$!value"
class="portlet-form-label-field">
</td>
<td width="5%" class="portlet-form-label" align="left"> </td>
</tr>
#end
#macro (ErrorMessages $ERRORS)
#if ($ERRORS)
#if ($ERRORS.size() > 0)
#foreach ($msg in $ERRORS)
<div class="portlet-msg-error">
$msg<br/>
</div>
#end
<br/>
#end
#end
#end
#macro (OnePref $pf)
#set ($pv = $pf.Value)
#foreach ($x in $pv)
#set ($extr = $x)
#end
$pf.Key $!extr
#end
#macro (prefField $key $values $size)
#if ($ERRORS)
#set ($eflag = "$!ERRORS.get($id)")
#else
#set ($eflag = "")
#end
#set ($pv = $pf.Value)
#foreach ($x in $pv)
#set ($extr = $x)
#end
#foreach ($x in $values)
#set ($extr = $x)
#end
<tr colspan="4" align="right">
#if ($!eflag == "")
<td width="5%" align="left"> </td>
#else
<td width="5%" class="portlet-msg-error" align="left"> </td>
#end
<td nowrap class="portlet-section-alternate"
align="right">$!key: </td>
<td class="portlet-section-body" align="left">
<input id="$!id" type="text" name="$!key" size="$!size" value="$!extr"
class="portlet-form-label-field">
</td>
<td width="5%" class="portlet-form-label" align="left"> </td>
</tr>
#end
#macro (form4ColumnCell $label $value $size $id)
<tr colspan="4" align="right">
<td width="5%" class="portlet-form-label" align="left"> </td>
<td nowrap class="portlet-form-field-label"
align="right">$!label: </td>
<td class="portlet-form-input-field" align="left">
<input id="$!id" type="text" name="$!id" size="$!size" value="$!value">
</td>
<td width="5%" class="portlet-form-label" align="left"> </td>
</tr>
#end
1.1
jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/view/iframe-help.html
Index: iframe-help.html
===================================================================
<h1>Help Page</h1>
1.1
jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/view/edit-prefs.vm
Index: edit-prefs.vm
===================================================================
<h2 class="portlet-section-header">Edit Preferences</h2>
<form action="$renderResponse.createActionURL()" method="post">
<table>
#foreach ($pref in $prefs)
#prefField($pref.Key $pref.Value "40")
#end
</table>
<input type="submit" name="Save" value="Save" />
</form>
1.20 +175 -131 jakarta-jetspeed-2/applications/demo/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/project.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- project.xml 13 Oct 2004 20:01:46 -0000 1.19
+++ project.xml 12 Nov 2004 06:32:31 -0000 1.20
@@ -1,132 +1,176 @@
-<project>
- <extend>${basedir}/./../project.xml</extend>
- <pomVersion>3</pomVersion>
- <artifactId>demo</artifactId>
- <name>Jetspeed-2 Demo Portlet Application</name>
- <groupId>demo</groupId>
- <description>Demo Portlets Container</description>
- <shortDescription>Demo Portlets Container</shortDescription>
- <repository>
- <connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-jetspeed-2/applications/demo</connection>
-
<url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/applications/demo/</url>
- </repository>
- <dependencies>
- <dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- <version>1.0</version>
- <type>jar</type>
- <properties>
- <war.bundle>false</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.0.2</version>
- <type>jar</type>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>1.0.4</version>
- <type>jar</type>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>request</artifactId>
- <version>1.0.1</version>
- <type>jar</type>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.4-rc1</version>
- <type>jar</type>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
- <version>2.3</version>
- <type>jar</type>
- <properties>
- <war.bundle>false</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>jetspeed2</groupId>
- <artifactId>jetspeed-commons</artifactId>
- <version>2.0-a1-dev</version>
- <type>jar</type>
- <properties>
- <war.bundle>false</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>portals-bridges</groupId>
- <artifactId>portals-bridges-common</artifactId>
- <version>0.1</version>
- <type>jar</type>
- <properties>
- <war.bundle>false</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.8</version>
- <type>jar</type>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
- <type>jar</type>
- <url>http://jakarta.apache.org/commons/logging.html</url>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- </dependencies>
- <build>
- <sourceDirectory>src/java</sourceDirectory>
- <resources>
- <resource>
- <directory>${basedir}/src/java/</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- <filtering>false</filtering>
- </resource>
- </resources>
- </build>
- <reports>
- <report>maven-jdepend-plugin</report>
- <report>maven-checkstyle-plugin</report>
- <report>maven-pmd-plugin</report>
- <report>maven-changelog-plugin</report>
- <report>maven-file-activity-plugin</report>
- <report>maven-developer-activity-plugin</report>
- <report>maven-license-plugin</report>
- <report>maven-javadoc-plugin</report>
- <report>maven-jxr-plugin</report>
- <report>maven-junit-report-plugin</report>
- <report>maven-tasklist-plugin</report>
- </reports>
- <properties/>
+<project>
+ <extend>${basedir}/./../project.xml</extend>
+ <pomVersion>3</pomVersion>
+ <artifactId>demo</artifactId>
+ <name>Jetspeed-2 Demo Portlet Application</name>
+ <groupId>demo</groupId>
+ <description>Demo Portlets Container</description>
+ <shortDescription>Demo Portlets Container</shortDescription>
+ <repository>
+ <connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-jetspeed-2/applications/demo</connection>
+
<url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/applications/demo/</url>
+ </repository>
+ <dependencies>
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>1.0</version>
+ <type>jar</type>
+ <properties>
+ <war.bundle>false</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.5</version>
+ <type>jar</type>
+ <url>http://jakarta.apache.org/commons/digester.html</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.6.1</version>
+ <type>jar</type>
+ <url>http://jakarta.apache.org/commons/beanutils.html</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.0.2</version>
+ <type>jar</type>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.0.4</version>
+ <type>jar</type>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>request</artifactId>
+ <version>1.0.1</version>
+ <type>jar</type>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.4-rc1</version>
+ <type>jar</type>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>servletapi</groupId>
+ <artifactId>servletapi</artifactId>
+ <version>2.3</version>
+ <type>jar</type>
+ <properties>
+ <war.bundle>false</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>jetspeed2</groupId>
+ <artifactId>jetspeed-commons</artifactId>
+ <version>2.0-a1-dev</version>
+ <type>jar</type>
+ <properties>
+ <war.bundle>false</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>portals-bridges</groupId>
+ <artifactId>portals-bridges-common</artifactId>
+ <version>0.1</version>
+ <type>jar</type>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>portals-bridges</groupId>
+ <artifactId>portals-bridges-velocity</artifactId>
+ <version>0.1</version>
+ <type>jar</type>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>velocity</id>
+ <version>1.4</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>velocity-tools:velocity-tools-view</id>
+ <version>1.1-beta1</version>
+ <url>http://jakarta.apache.org/velocity</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ <type>jar</type>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.3</version>
+ <type>jar</type>
+ <url>http://jakarta.apache.org/commons/logging.html</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ </dependencies>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java/</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </build>
+ <reports>
+ <report>maven-jdepend-plugin</report>
+ <report>maven-checkstyle-plugin</report>
+ <report>maven-pmd-plugin</report>
+ <report>maven-changelog-plugin</report>
+ <report>maven-file-activity-plugin</report>
+ <report>maven-developer-activity-plugin</report>
+ <report>maven-license-plugin</report>
+ <report>maven-javadoc-plugin</report>
+ <report>maven-jxr-plugin</report>
+ <report>maven-junit-report-plugin</report>
+ <report>maven-tasklist-plugin</report>
+ </reports>
+ <properties/>
</project>
1.9 +21 -0
jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- web.xml 30 May 2004 15:09:04 -0000 1.8
+++ web.xml 12 Nov 2004 06:32:31 -0000 1.9
@@ -27,6 +27,27 @@
<servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
</servlet>
+ <!-- Define Velocity Servlet -->
+ <servlet>
+ <servlet-name>velocity</servlet-name>
+
<servlet-class>org.apache.portals.bridges.velocity.BridgesVelocityViewServlet</servlet-class>
+ <init-param>
+ <param-name>org.apache.velocity.toolbox</param-name>
+ <param-value>/WEB-INF/velocity/toolbox.xml</param-value>
+ </init-param>
+ <init-param>
+ <param-name>org.apache.velocity.properties</param-name>
+
<param-value>/WEB-INF/velocity/velocity.properties</param-value>
+ </init-param>
+ <load-on-startup>10</load-on-startup>
+ </servlet>
+
+ <!-- Map *.vm files to Velocity -->
+ <servlet-mapping>
+ <servlet-name>velocity</servlet-name>
+ <url-pattern>*.vm</url-pattern>
+ </servlet-mapping>
+
<servlet-mapping>
<servlet-name>
JetspeedContainer
1.22 +29 -53
jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/portlet.xml
Index: portlet.xml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/portlet.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- portlet.xml 29 Oct 2004 22:52:44 -0000 1.21
+++ portlet.xml 12 Nov 2004 06:32:31 -0000 1.22
@@ -320,42 +320,16 @@
<description>
Prototype of the IFRAME portlet
</description>
- <init-param>
- <name>viewSource</name>
- <value>http://portals.apache.org/jetspeed-2/</value>
- <description>
- Source URL in view mode.
- </description>
- </init-param>
- <init-param>
- <name>maximizedViewSource</name>
- <value>http://portals.apache.org/</value>
- <description>
- Source URL in maximized view mode.
- </description>
- </init-param>
- <init-param>
- <name>editSource</name>
- <value>http://wiki.apache.org/portals/Jetspeed2</value>
- <description>
- Source URL in edit mode.
- </description>
- </init-param>
- <init-param>
- <name>helpSource</name>
- <value>http://www.apache.org/</value>
- <description>
- Source URL in help mode.
- </description>
- </init-param>
- <init-param>
- <name>enableSourcePreferences</name>
- <value>true</value>
- <description>
- Enble preferences for all source URL parameters.
- </description>
- </init-param>
-
<portlet-class>org.apache.jetspeed.portlet.IFramePortlet</portlet-class>
+ <init-param>
+ <name>EditPage</name>
+ <value>/WEB-INF/view/edit-prefs.vm</value>
+ </init-param>
+ <init-param>
+ <name>HelpPage</name>
+ <value>/WEB-INF/view/iframe-help.html</value>
+ </init-param>
+
+
<portlet-class>org.apache.jetspeed.portlet.IFrameGenericPortlet</portlet-class>
<expiration-cache>-1</expiration-cache>
<supports>
<mime-type>text/html</mime-type>
@@ -365,29 +339,31 @@
</supports>
<portlet-preferences>
<preference>
- <name>editSource</name>
- </preference>
- <preference>
- <name>maximizedEditSource</name>
- </preference>
- <preference>
- <name>viewSource</name>
- </preference>
- <preference>
- <name>maximizedViewSource</name>
- </preference>
- <preference>
- <name>helpSource</name>
- </preference>
- <preference>
- <name>maximizedHelpSource</name>
+ <name>SRC</name>
+ <value>http://portals.apache.org</value>
</preference>
+ <preference>
+ <name>HEIGHT</name>
+ <value>100%</value>
+ </preference>
+ <preference>
+ <name>WIDTH</name>
+ <value>100%</value>
+ </preference>
+ <preference>
+ <name>MAX-HEIGHT</name>
+ <value>800</value>
+ </preference>
+ <preference>
+ <name>MAX-WIDTH</name>
+ <value>100%</value>
+ </preference>
</portlet-preferences>
<supported-locale>en</supported-locale>
<portlet-info>
<title>IFrame Prototype Portlet</title>
<short-title>IFrame</short-title>
- <keywords>test</keywords>
+ <keywords>iframe,frame</keywords>
</portlet-info>
</portlet>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
