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 2005/07/05 22:17:20 UTC
svn commit: r209312 - in /forrest/trunk/whiteboard/plugins:
org.apache.forrest.plugin.internal.view/
org.apache.forrest.plugin.internal.view/lib/
org.apache.forrest.plugin.internal.view/resources/stylesheets/
org.apache.forrest.plugin.internal.view/res...
Author: thorsten
Date: Tue Jul 5 13:17:18 2005
New Revision: 209312
URL: http://svn.apache.org/viewcvs?rev=209312&view=rev
Log:
Merged views from locationmap_branch back to trunk -r190293:head
Added:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/lib/
- copied from r209310, forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.internal.view/lib/
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/lib/databases-block.jar (props changed)
- copied unchanged from r209310, forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.internal.view/lib/databases-block.jar
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/lib/eventcache-block.jar (props changed)
- copied unchanged from r209310, forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.internal.view/lib/eventcache-block.jar
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/lib/jms-block.jar (props changed)
- copied unchanged from r209310, forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.internal.view/lib/jms-block.jar
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/lib/readme.txt (props changed)
- copied unchanged from r209310, forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.internal.view/lib/readme.txt
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/lib/repository-block.jar (props changed)
- copied unchanged from r209310, forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.internal.view/lib/repository-block.jar
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/includes-viewLocationmap.xsl (props changed)
- copied unchanged from r209310, forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/includes-viewLocationmap.xsl
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/viewLocationmap.xsl (props changed)
- copied unchanged from r209310, forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/viewLocationmap.xsl
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/viewLocationmap2path.xsl (props changed)
- copied unchanged from r209310, forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/viewLocationmap2path.xsl
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-main-lenya.ft (props changed)
- copied unchanged from r209309, forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-main-lenya.ft
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/default.css
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-feeder.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-main-sub.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-last-published-net.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-last-published.ft
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap?rev=209312&r1=209311&r2=209312&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap Tue Jul 5 13:17:18 2005
@@ -22,6 +22,13 @@
<map:selector logger="sitemap.selector.exists" name="exists" src="org.apache.forrest.sourceexists.SourceExistsSelector" />
</map:selectors>
<map:generators default="file">
+ <map:generator
+ name="traverse"
+ src="org.apache.cocoon.generation.TraversableGenerator"
+ logger="sitemap.generator.traverse"
+ label="content"
+ pool-max="16"
+ />
<map:generator name="directory" src="org.apache.cocoon.generation.DirectoryGenerator" />
<map:generator label="content" logger="sitemap.generator.jx" name="jx" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.generation.JXTemplateGenerator"/>
</map:generators>
@@ -76,35 +83,33 @@
prepares and transforms the requested contracts (viewHelper) and populate them with the content (businessHelper).
-->
<map:pipeline>
+ <!--Refactor for dir-->
+ <map:match pattern="viewLocationmap.xml">
+ <map:generate type="traverse" src="{project:content.xdocs}">
+ <map:parameter name="depth" value="100"/>
+ <map:parameter name="exclude" value="[\w]*.svn"/>
+ <!--<map:parameter name="include" value="[\w]*.fv"/>-->
+ </map:generate>
+ <map:transform src="resources/stylesheets/viewLocationmap.xsl"/>
+ <map:serialize type="xml"/>
+ </map:match>
+
+
<!--
View config resolver
File specific views have priority before default ones.
If no views can be found in the project we use the default one of the view plugin.
-->
<map:match pattern="prepare.view.**">
- <map:select type="exists">
- <!--
- Here we will have to test, whether the requested page needs a specific view.
- This will be assumed as soon there is a .fv
- e.g. index.xml + index.fv
- -->
- <map:when test="{project:content.xdocs}{1}.fv">
- <map:generate src="{project:content.xdocs}{1}.fv"/>
- </map:when>
- <!--
- If there is no file specific view then use the default.fv of the project stored in "project.conf-dir".
- -->
- <map:when test="{project:conf}/default.fv">
- <map:generate src="{project:conf}/default.fv"/>
- </map:when>
- <!--
- If the above not matches then get the default view of this plugin.
- -->
- <map:otherwise>
- <map:generate src="resources/views/default.fv"/>
- </map:otherwise>
- </map:select>
- <map:serialize type="xml"/>
+ <map:generate src="cocoon:/viewLocationmap.xml"/>
+ <map:transform src="resources/stylesheets/viewLocationmap2path.xsl"/>
+ <map:transform src="resources/stylesheets/includes-viewLocationmap.xsl">
+ <map:parameter value="{1}" name="path"/>
+ <map:parameter value="{project:content.xdocs}" name="root"/>
+ <map:parameter value="resources/views/default.fv" name="viewFallback"/>
+ </map:transform>
+ <map:transform type="xinclude"/>
+ <map:serialize type="xml"/>
</map:match>
<!--Add businessHelper to the presentation model that the content can be used later on.-->
@@ -207,7 +212,7 @@
<map:part src="cocoon://{1}/tab-{2}.html"/>
<map:part src="cocoon://{1}/menu-{2}.html"/>
<map:part src="cocoon://{1}/body-{2}.html"/>
- <map:part src="cocoon:/prepare.view-nugget.{2}"/>
+ <map:part src="cocoon:/prepare.view-nugget.{1}/{2}"/>
</map:aggregate>
<map:serialize type="xml"/>
</map:match>
Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/lib/databases-block.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/lib/eventcache-block.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/lib/jms-block.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/lib/readme.txt
------------------------------------------------------------------------------
svn:keywords = Id svn:eol-style=native
Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/lib/repository-block.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/includes-viewLocationmap.xsl
------------------------------------------------------------------------------
svn:keywords = Id svn:eol-style=native
Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/viewLocationmap.xsl
------------------------------------------------------------------------------
svn:keywords = Id svn:eol-style=native
Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/viewLocationmap2path.xsl
------------------------------------------------------------------------------
svn:keywords = Id svn:eol-style=native
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv?rev=209312&r1=209311&r2=209312&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv Tue Jul 5 13:17:18 2005
@@ -28,7 +28,10 @@
<forrest:property name="branding-tagline-tagline">powered by forrest:views</forrest:property>
</forrest:properties>
</forrest:contract>
- <forrest:contract name="nav-main"/>
+ <forrest:hook name="nav-main-hook">
+ <forrest:contract name="nav-main"/>
+ <forrest:contract name="nav-main-sub"/>
+ </forrest:hook>
</forrest:hook>
<forrest:hook name="page">
<forrest:hook name="leftbar">
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/default.css
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/default.css?rev=209312&r1=209311&r2=209312&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/default.css (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/default.css Tue Jul 5 13:17:18 2005
@@ -34,7 +34,7 @@
}
/* tabs */
-#nav-main {
+#nav-main-hook {
background: #ffffff;
text-align: center;
text-decoration: none;
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-feeder.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-feeder.ft?rev=209312&r1=209311&r2=209312&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-feeder.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-feeder.ft Tue Jul 5 13:17:18 2005
@@ -21,9 +21,9 @@
<description>
content-feeder will output the html information retrieved by the feeder plugin (needs to be installed!).
</description>
- <usage><![CDATA[<forrest:contract name="feeder">
- <forrest:properties contract="feeder">
- <forrest:property name="feeder" nugget="get.nugget.feeder">
+ <usage><![CDATA[<forrest:contract name="content-feeder">
+ <forrest:properties contract="content-feeder">
+ <forrest:property name="content-feeder" nugget="get.nugget.feeder">
<url>/feeds/somefeed.xml</url>
</forrest:property>
</forrest:properties>
Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-main-lenya.ft
------------------------------------------------------------------------------
svn:eol-style = native
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-main-sub.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-main-sub.ft?rev=209312&r1=209311&r2=209312&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-main-sub.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/nav-main-sub.ft Tue Jul 5 13:17:18 2005
@@ -27,7 +27,7 @@
<xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:template name="nav-main-sub-body">
- <xsl:apply-templates select="div[@id='nav-main-sub']"/>
+ <xsl:apply-templates select="div[@id='nav-main-sub']/*"/>
</xsl:template>
</xsl:stylesheet>
</forrest:template>
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-last-published-net.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-last-published-net.ft?rev=209312&r1=209311&r2=209312&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-last-published-net.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-last-published-net.ft Tue Jul 5 13:17:18 2005
@@ -18,7 +18,9 @@
<forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0"
name="siteinfo-last-published-net" type="nugget">
<description>
- Last published contract. This functions will output the last published date of the site.
+ siteinfo-last-published-net will output the last published date of the
+ site with the help of a timeserver. Note: You need to be able to reach
+ http://xobjex.com/service/date.xsl!!! If you are not, it will crash views.
</description>
<usage><![CDATA[<forrest:contract name="siteinfo-last-published-net"/>]]></usage>
<forrest:template
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-last-published.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-last-published.ft?rev=209312&r1=209311&r2=209312&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-last-published.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-last-published.ft Tue Jul 5 13:17:18 2005
@@ -18,7 +18,7 @@
<forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0"
name="siteinfo-last-published" type="nugget">
<description>
- Last published contract. This functions will output the last published date of the site.
+ siteinfo-last-published will output the last published date of the site with the help of jscript.
</description>
<usage><![CDATA[<forrest:contract name="siteinfo-last-published"/>]]></usage>
<forrest:template
Re: SVN comments for merges (Was: svn commit: r209312 - in /forrest/trunk/whiteboard/plugins)
Posted by David Crossley <cr...@apache.org>.
Thorsten Scherler wrote:
> David Crossley wrote:
> > In future please use a better commit messages for merges.
>
> please give an example for a better one.
See svnbook. I meant the revision number ...
> > I made the same mistake when i did a merge recently.
> > The svnbook.red-bean.com recommends to use exact numbers
> > rather than the symbol "head".
>
> you mean I should predict the revision number > New Revision: 209312?
Good point. Cannot be predicted. Forget that, the revision
number can be found inside the commit message.
Sorry for the noise.
-David
> salu2
>
> > -David
> >
> > > Author: thorsten
> > > Date: Tue Jul 5 13:17:18 2005
> > > New Revision: 209312
> > >
> > > URL: http://svn.apache.org/viewcvs?rev=209312&view=rev
> > > Log:
> > > Merged views from locationmap_branch back to trunk -r190293:head
> > >
> > [ snip ]
> --
> thorsten
>
> "Together we stand, divided we fall!"
> Hey you (Pink Floyd)
Re: SVN comments for merges (Was: svn commit: r209312 - in
/forrest/trunk/whiteboard/plugins)
Posted by Thorsten Scherler <th...@apache.org>.
On Wed, 2005-07-06 at 14:55 +1000, David Crossley wrote:
> In future please use a better commit messages for merges.
please give an example for a better one.
> I made the same mistake when i did a merge recently.
> The svnbook.red-bean.com recommends to use exact numbers
> rather than the symbol "head".
>
you mean I should predict the revision number > New Revision: 209312?
salu2
> -David
>
> > Author: thorsten
> > Date: Tue Jul 5 13:17:18 2005
> > New Revision: 209312
> >
> > URL: http://svn.apache.org/viewcvs?rev=209312&view=rev
> > Log:
> > Merged views from locationmap_branch back to trunk -r190293:head
> >
> [ snip ]
--
thorsten
"Together we stand, divided we fall!"
Hey you (Pink Floyd)
SVN comments for merges (Was: svn commit: r209312 - in /forrest/trunk/whiteboard/plugins)
Posted by David Crossley <cr...@apache.org>.
In future please use a better commit messages for merges.
I made the same mistake when i did a merge recently.
The svnbook.red-bean.com recommends to use exact numbers
rather than the symbol "head".
-David
> Author: thorsten
> Date: Tue Jul 5 13:17:18 2005
> New Revision: 209312
>
> URL: http://svn.apache.org/viewcvs?rev=209312&view=rev
> Log:
> Merged views from locationmap_branch back to trunk -r190293:head
>
[ snip ]