You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by th...@apache.org on 2006/05/03 01:39:03 UTC
svn commit: r399085 - in
/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice:
./ resources/stylesheets/ src/documentation/content/xdocs/
Author: thorsten
Date: Tue May 2 16:39:00 2006
New Revision: 399085
URL: http://svn.apache.org/viewcvs?rev=399085&view=rev
Log:
FOR-851
upgrade Voice plugin to use current Dispatcher
Applying patch provided by Gavin .
thanks Gavin. :)
Added:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/resources/stylesheets/document-to-mxml.xsl
- copied unchanged from r399079, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/resources/stylesheets/document2mxml.xsl
Removed:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/resources/stylesheets/document2mxml.xsl
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/build.xml
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/forrest.properties
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/output.xmap
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/src/documentation/content/xdocs/voice.fv
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/status.xml
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/build.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/build.xml?rev=399085&r1=399084&r2=399085&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/build.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/build.xml Tue May 2 16:39:00 2006
@@ -19,7 +19,7 @@
<property name="plugin-name" value="org.apache.forrest.plugin.output.voice"/>
<property name="forrest.version" value="0.8"/>
<property name="type" value="output"/>
- <property name="plugin-version" value="0.1"/>
+ <property name="plugin-version" value="0.2"/>
<property name="description" value="Voice"/>
<property name="author" value="Apache Forrest Project"/>
<property name="websiteURL" value="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.output.voice"/>
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/forrest.properties?rev=399085&r1=399084&r2=399085&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/forrest.properties (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/forrest.properties Tue May 2 16:39:00 2006
@@ -25,7 +25,7 @@
# FIXME: FOR-785
forrest.validate.skinconf=false
-project.required.plugins=org.apache.forrest.plugin.output.voice,org.apache.forrest.plugin.internal.structurer,org.apache.forrest.plugin.output.themer,org.apache.forrest.plugin.input.projectInfo
+project.required.plugins=org.apache.forrest.plugin.output.voice,org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core,org.apache.forrest.plugin.input.projectInfo
# View Configuration
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/output.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/output.xmap?rev=399085&r1=399084&r2=399085&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/output.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/output.xmap Tue May 2 16:39:00 2006
@@ -21,7 +21,7 @@
<!-- Voice -->
<map:match type="regexp" pattern="^(.*?)([^/]*).mxml$">
<map:generate src="cocoon://{1}{2}.xml"/>
- <map:transform src="resources/stylesheets/document2mxml.xsl"/>
+ <map:transform src="resources/stylesheets/document-to-mxml.xsl"/>
<map:serialize type="xml"/>
</map:match>
<map:match pattern="*.jsgf">
@@ -29,4 +29,4 @@
</map:match>
</map:pipeline>
</map:pipelines>
-</map:sitemap>
\ No newline at end of file
+</map:sitemap>
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/src/documentation/content/xdocs/voice.fv
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/src/documentation/content/xdocs/voice.fv?rev=399085&r1=399084&r2=399085&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/src/documentation/content/xdocs/voice.fv (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/src/documentation/content/xdocs/voice.fv Tue May 2 16:39:00 2006
@@ -16,25 +16,31 @@
limitations under the License.
-->
-<forrest:views xmlns:forrest="http://apache.org/forrest/templates/1.0">
- <forrest:view type="xhtml">
- <forrest:css url="default.css"/>
+<forrest:views xmlns:forrest="http://apache.org/forrest/templates/1.0"
+ xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+ <jx:set var="getRequest" value="#{$cocoon/parameters/getRequest}"/>
+ <jx:set var="getRequestExtension" value="#{$cocoon/parameters/getRequestExtension}" />
+ <forrest:view type="html" hooksXpath="/html/body"><!-- Was type="xhtml" -->
+ <forrest:contract name="branding-css-links">
+ <!-- More information around this contract
+ http://marc.theaimsgroup.com/?l=forrest-dev&m=113473237805195&w=2
+ -->
+ <!--Note: The forrest:properties element does not exit anymore (in comparison to a previous versions) -->
+ <forrest:property name="branding-css-links-input">
+ <css url="common.css"/>
+ </forrest:property>
+ </forrest:contract>
<forrest:contract name="voice-markup"/>
- <forrest:contract name="siteinfo-meta">
- <forrest:properties contract="siteinfo-meta">
- <forrest:property name="siteinfo-meta" nugget="get.build.info">
- <url>build-info</url>
- </forrest:property>
- </forrest:properties>
+ <forrest:contract name="siteinfo-meta" datauri="lm://project.build-info">
+ <forrest:property name="custom">
+ <meta http-equiv="content-type" content="text/html, charset=UTF-8"/>
+ </forrest:property>
</forrest:contract>
<forrest:hook name="container">
<forrest:hook name="header">
- <forrest:hook name="branding">
<forrest:contract name="branding-tagline">
- <forrest:properties contract="branding-tagline">
<forrest:property name="branding-tagline-name">VoiceXML Plugin</forrest:property>
<forrest:property name="branding-tagline-tagline">Your computer Reads and Listens</forrest:property>
- </forrest:properties>
</forrest:contract>
</forrest:hook>
<forrest:hook name="nav-main-hook">
@@ -44,47 +50,57 @@
</forrest:hook>
<forrest:hook name="page">
<forrest:hook name="leftbar">
- <forrest:contract name="nav-section"/>
- <forrest:contract name="search-input"/>
+ <forrest:contract name="nav-section"
+ dataURI="cocoon://#{$getRequest}.navigation.xml">
+ <forrest:property name="nav-section-toc" nugget="get.tov">
+ <jx:import
+ uri="cocoon://#{$cocoon/parameters/getRequest}.toc.xml"/>
+ </forrest:property>
+ <forrest:property name="expanding">true</forrest:property>
+ <!--<forrest:property name="toc" max-depth="2"/>-->
+ </forrest:contract>
+ <forrest:contract name="search-input">
+ <forrest:property name="input-size">18</forrest:property>
+ <forrest:property name="search-input">
+ <search name="MyProject" domain="mydomain" provider="google"/>
+ </forrest:property>
+ </forrest:contract>
</forrest:hook>
- <!-- You can group elements to a template and call it from any view.
- e.g.
- <forrest:hook name="export-link">
- <forrest:contract name="content-txt-link"/>
- <forrest:contract name="content-pdf-link"/>
- </forrest:hook>
- can be called as <forrest:call-template name="export-link"/>
- when saved as {project:resources}/templates/export-link.vt.xml
-
- <forrest:call-template name="export-link"/>
- -->
-
<forrest:hook name="content">
- <forrest:contract name="content-title"/>
- <forrest:contract name="content-minitoc"/>
- <forrest:contract name="content-main"/>
- <!--
- <forrest:contract name="content-include-html">
- <forrest:properties contract="content-include-html">
- <forrest:property name="content-include-html" nugget="get.nugget.include.html">
- <url>index.xml</url>
- </forrest:property>
- </forrest:properties>
+ <!-- FIXME - Problem with ndeSetTextSize() script from fontsize.js not compliant between Pelt and Leather-dev... -->
+ <!-- <forrest:hook class="trail">
+ <forrest:contract name="branding-fontsize"/>
+ </forrest:hook>-->
+ <forrest:contract name="content-title"
+ dataURI="cocoon://#{$getRequest}.title.xml"/>
+ <forrest:contract name="content-abstract"
+ dataURI="cocoon://#{$getRequest}.abstract.xml"/>
+ <forrest:contract name="content-minitoc"
+ dataURI="cocoon://#{$getRequest}.toc.xml">
+ <forrest:property name="content-minitoc-conf" max-depth="2"
+ min-sections="1" location="page"/>
</forrest:contract>
- <forrest:contract name="content-feeder">
- <forrest:properties contract="content-feeder">
- <forrest:property name="content-feeder" nugget="get.nugget.feeder">
- <url>/feeder/activitiesAndLearning.xml</url>
- </forrest:property>
- </forrest:properties>
+ <forrest:contract name="content-main"
+ dataURI="cocoon://#{$getRequest}.body.xml">
+ <forrest:property name="content-main-conf">
+ <headings type="underlined"/>
+ </forrest:property>
</forrest:contract>
- -->
- </forrest:hook>
+ </forrest:hook>
</forrest:hook>
- </forrest:hook>
+ <!--</forrest:hook>-->
<forrest:hook name="footer">
- <forrest:contract name="siteinfo-feedback"/>
- <forrest:contract name="siteinfo-last-published"/>
+ <forrest:contract name="siteinfo-feedback">
+ <forrest:property name="siteinfo-feedback">
+ <feedback to="the Webmaster"
+ href="mailto:webmaster@foo.com?subject=Feedback " >
+ Send feedback about the website to:
+ </feedback>
+ </forrest:property>
+ </forrest:contract>
+ <forrest:hook class="lastmodified">
+ <forrest:contract name="siteinfo-last-published"/>
+ </forrest:hook>
</forrest:hook>
</forrest:view>
</forrest:views>
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/status.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/status.xml?rev=399085&r1=399084&r2=399085&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/status.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.voice/status.xml Tue May 2 16:39:00 2006
@@ -40,6 +40,9 @@
<release version="0.1" date="unreleased">
<action dev="HANAX" type="add" context="code">
Initial plugin code.
+</action>
+ <action dev="Gavin" type="add" context="code">
+ Upgraded to Dispatcher.
</action>
</release>
</changes>