Return-Path: Delivered-To: apmail-forrest-svn-archive@www.apache.org Received: (qmail 75956 invoked from network); 13 Aug 2006 21:42:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 13 Aug 2006 21:42:24 -0000 Received: (qmail 17694 invoked by uid 500); 13 Aug 2006 21:42:21 -0000 Delivered-To: apmail-forrest-svn-archive@forrest.apache.org Received: (qmail 17658 invoked by uid 500); 13 Aug 2006 21:42:20 -0000 Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Forrest Developers List" List-Id: Delivered-To: mailing list svn@forrest.apache.org Received: (qmail 17571 invoked by uid 99); 13 Aug 2006 21:42:20 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 Aug 2006 14:42:20 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 Aug 2006 14:42:16 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 0C8A81A981A; Sun, 13 Aug 2006 14:41:56 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r431247 [1/3] - in /forrest/trunk: main/fresh-site/src/documentation/ main/fresh-site/src/documentation/content/xdocs/samples/ main/fresh-site/src/documentation/content/xdocs/samples/locationmap/ main/targets/ main/template-sites/basic/src/... Date: Sun, 13 Aug 2006 21:41:41 -0000 To: svn@forrest.apache.org From: thorsten@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060813214156.0C8A81A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: thorsten Date: Sun Aug 13 14:41:37 2006 New Revision: 431247 URL: http://svn.apache.org/viewvc?rev=431247&view=rev Log: FOR-920 Merging the defaults and project modules to the new properties module. You can use it like {properties:forrest.home}, please refer to the update documentation how to change your {defaults:*} {project:*} and {forrest:*}. Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/linking.xml forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml forrest/trunk/main/fresh-site/src/documentation/sitemap.xmap forrest/trunk/main/targets/webapp.xml forrest/trunk/main/template-sites/basic/src/documentation/sitemap.xmap forrest/trunk/main/template-sites/benchmark/src/documentation/sitemap.xmap forrest/trunk/main/var/pluginLmMountSnippet.xsl forrest/trunk/main/var/pluginMountSnippet.xsl forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf forrest/trunk/main/webapp/faq.xmap forrest/trunk/main/webapp/forrest.xmap forrest/trunk/main/webapp/i18n.xmap forrest/trunk/main/webapp/locationmap-chaperon.xml forrest/trunk/main/webapp/locationmap-i18n.xml forrest/trunk/main/webapp/locationmap-plugin.xml forrest/trunk/main/webapp/locationmap-skinconf.xml forrest/trunk/main/webapp/locationmap-skins.xml forrest/trunk/main/webapp/locationmap-transforms.xml forrest/trunk/main/webapp/locationmap.xml forrest/trunk/main/webapp/menu.xmap forrest/trunk/main/webapp/raw.xmap forrest/trunk/main/webapp/revisions.xmap forrest/trunk/main/webapp/search.xmap forrest/trunk/main/webapp/sitemap.xmap forrest/trunk/main/webapp/tabs.xmap forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources.xmap forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/src/documentation/content/xdocs/index.xml forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/input.xmap forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/locationmap.xml forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/src/documentation/content/xdocs/index.xml forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/svnHelper.xmap forrest/trunk/plugins/org.apache.forrest.plugin.output.inputModule/src/documentation/content/xdocs/index.xml forrest/trunk/site-author/content/locationmap.xml forrest/trunk/site-author/content/xdocs/docs_0_60/faq.xml forrest/trunk/site-author/content/xdocs/docs_0_60/howto/howto-pdf-tab.xml forrest/trunk/site-author/content/xdocs/docs_0_60/sitemap-ref.xml forrest/trunk/site-author/content/xdocs/docs_0_60/your-project.xml forrest/trunk/site-author/content/xdocs/docs_0_70/faq.xml forrest/trunk/site-author/content/xdocs/docs_0_70/howto/howto-buildPlugin.xml forrest/trunk/site-author/content/xdocs/docs_0_70/howto/howto-custom-html-source.xml forrest/trunk/site-author/content/xdocs/docs_0_70/howto/howto-view-dsl.xml forrest/trunk/site-author/content/xdocs/docs_0_70/sitemap-ref.xml forrest/trunk/site-author/content/xdocs/docs_0_70/upgrading_07.xml forrest/trunk/site-author/content/xdocs/docs_0_70/your-project.xml forrest/trunk/site-author/content/xdocs/docs_0_80/faq.xml forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-buildPlugin.xml forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-custom-html-source.xml forrest/trunk/site-author/content/xdocs/docs_0_80/locationmap.xml forrest/trunk/site-author/content/xdocs/docs_0_80/sitemap-ref.xml forrest/trunk/site-author/content/xdocs/docs_0_80/upgrading_08.xml forrest/trunk/site-author/content/xdocs/docs_0_80/your-project.xml forrest/trunk/site-author/content/xdocs/howto-dev.xml forrest/trunk/site-author/content/xdocs/pluginDocs/plugins_0_70/pluginInfrastructure.xml forrest/trunk/site-author/content/xdocs/pluginDocs/plugins_0_80/pluginInfrastructure.xml forrest/trunk/site-author/content/xdocs/trash/docs_0_50/upgrading_05.xml forrest/trunk/site-author/sitemap.xmap forrest/trunk/site-author/status.xml forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.Database/input.xmap forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Blog/input.xmap forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/locationmap.xml forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources.xmap forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Lenya/input.xmap forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Resume/input.xmap forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.XDoc/input.xmap forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.citations/locationmap.xml forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.ecs/input.xmap forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.logs/input.xmap forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/locationmap.xml forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.DevTools/internal.xmap forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.GoogleSitemap/internal.xmap forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.IMSManifest/internal.xmap forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/internal.xmap forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.NoteTaking/locationmap.xml forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources.xmap forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-structurer.xml forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/int/index.xml forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/internal.xmap forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/src/documentation/content/locationmap.xml forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/structurer.xmap forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.htmlArea/output.xmap forrest/trunk/whiteboard/tests/xsltunit/sitemap.xmap Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/linking.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/linking.xml?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/linking.xml (original) +++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/linking.xml Sun Aug 13 14:41:37 2006 @@ -166,19 +166,19 @@ <map:match pattern="**.html"> <map:select type="exists"> - <map:when test="{project:content}{0}"> - <map:read src="{project:content}/{0}" mime-type="text/html"/> + <map:when test="{properties:content}{0}"> + <map:read src="{properties:content}/{0}" mime-type="text/html"/> <!-- Use this instead if you want JTidy to clean up your HTML - <map:generate type="html" src="{project:content}/{0}" /> + <map:generate type="html" src="{properties:content}/{0}" /> <map:serialize type="html"/> --> </map:when> - <map:when test="{project:content.xdocs}{0}"> - <map:read src="{project:content.xdocs}/{0}" mime-type="text/html"/> + <map:when test="{properties:content.xdocs}{0}"> + <map:read src="{properties:content.xdocs}/{0}" mime-type="text/html"/> <!-- Use this instead if you want JTidy to clean up your HTML - <map:generate type="html" src="{project:content.xdocs}/{0}" /> + <map:generate type="html" src="{properties:content.xdocs}/{0}" /> <map:serialize type="html"/> --> </map:when> @@ -187,7 +187,7 @@

The above allows us to create links to un-processed skinned files stored - in the {project:content} or {project:content.xdocs} + in the {properties:content} or {properties:content.xdocs} directory. For example: <a href="/test1.html">HTML content</a>. However, it will break the 0.7 behaviour of skinning HTML content. For this reason the old @@ -204,11 +204,11 @@ <map:match pattern="old_site/**.html"> <map:select type="exists"> - <map:when test="{project:content}{1}.html"> - <map:read src="{project:content}/{1}.html" mime-type="text/html"/> + <map:when test="{properties:content}{1}.html"> + <map:read src="{properties:content}/{1}.html" mime-type="text/html"/> <!-- Use this instead if you want JTidy to clean up your HTML - <map:generate type="html" src="{project:content}/{0}" /> + <map:generate type="html" src="{properties:content}/{0}" /> <map:serialize type="html"/> --> </map:when> @@ -361,10 +361,10 @@ ]]> Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml (original) +++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml Sun Aug 13 14:41:37 2006 @@ -47,7 +47,7 @@ Retrieving an XDoc via HTTP -

Normally files are generated from {project:content.xdocs}. +

Normally files are generated from {properties:content.xdocs}. Using the Locationmap it is possible to make these files come from elsewhere. This is useful if you want to pull files from different directory structures, oe even remote repositories.

Modified: forrest/trunk/main/fresh-site/src/documentation/sitemap.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/sitemap.xmap?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/main/fresh-site/src/documentation/sitemap.xmap (original) +++ forrest/trunk/main/fresh-site/src/documentation/sitemap.xmap Sun Aug 13 14:41:37 2006 @@ -38,8 +38,8 @@ - - + + @@ -58,11 +58,11 @@ - - + + @@ -71,7 +71,7 @@ - + Modified: forrest/trunk/main/targets/webapp.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/targets/webapp.xml?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/main/targets/webapp.xml (original) +++ forrest/trunk/main/targets/webapp.xml Sun Aug 13 14:41:37 2006 @@ -155,7 +155,7 @@ a war file. The value of "todir" below corresponds to - {project:temp-dir} when running as a web application. --> + {properties:temp-dir} when running as a web application. --> Modified: forrest/trunk/main/template-sites/basic/src/documentation/sitemap.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/main/template-sites/basic/src/documentation/sitemap.xmap?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/main/template-sites/basic/src/documentation/sitemap.xmap (original) +++ forrest/trunk/main/template-sites/basic/src/documentation/sitemap.xmap Sun Aug 13 14:41:37 2006 @@ -38,8 +38,8 @@ - - + + @@ -51,11 +51,11 @@ - - + + @@ -64,7 +64,7 @@ - + Modified: forrest/trunk/main/template-sites/benchmark/src/documentation/sitemap.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/main/template-sites/benchmark/src/documentation/sitemap.xmap?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/main/template-sites/benchmark/src/documentation/sitemap.xmap (original) +++ forrest/trunk/main/template-sites/benchmark/src/documentation/sitemap.xmap Sun Aug 13 14:41:37 2006 @@ -38,8 +38,8 @@ - - + + @@ -51,11 +51,11 @@ - - + + @@ -64,7 +64,7 @@ - + Modified: forrest/trunk/main/var/pluginLmMountSnippet.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/var/pluginLmMountSnippet.xsl?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/main/var/pluginLmMountSnippet.xsl (original) +++ forrest/trunk/main/var/pluginLmMountSnippet.xsl Sun Aug 13 14:41:37 2006 @@ -39,7 +39,7 @@ - {forrest:plugins}//locationmap.xml + {forrest:forrest.plugins}//locationmap.xml Modified: forrest/trunk/main/var/pluginMountSnippet.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/var/pluginMountSnippet.xsl?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/main/var/pluginMountSnippet.xsl (original) +++ forrest/trunk/main/var/pluginMountSnippet.xsl Sun Aug 13 14:41:37 2006 @@ -40,10 +40,10 @@ exists - {forrest:plugins}//.xmap + {forrest:forrest.plugins}//.xmap - {forrest:plugins}//.xmap + {forrest:forrest.plugins}//.xmap yes true Modified: forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf (original) +++ forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf Sun Aug 13 14:41:37 2006 @@ -219,30 +219,25 @@ - + - - - @project.skin@ - @project.menu-scheme@ - @project.bugtracking-url@ - @project.issues-rss-url@ - @project.i18n@ - @forrest.home@/ - @context.home@ - @context.home@/skins/ - @context.home@/resources/stylesheets - @forrest.home@/plugins - @forrest.home@/whiteboard/plugins - @forrest.home@/build/plugins - @context.home@/locationmap.xml - - - - + + @project.skin@ + @project.menu-scheme@ + @project.bugtracking-url@ + @project.issues-rss-url@ + @project.i18n@ + @forrest.home@/ + @context.home@ + @context.home@/skins/ + @context.home@/resources/stylesheets + @forrest.home@/plugins + @forrest.home@/whiteboard/plugins + @forrest.home@/build/plugins + @context.home@/locationmap.xml @project.home@ @project.build-dir@/@project.site@ @project.skin@ Modified: forrest/trunk/main/webapp/faq.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/faq.xmap?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/main/webapp/faq.xmap (original) +++ forrest/trunk/main/webapp/faq.xmap Sun Aug 13 14:41:37 2006 @@ -150,8 +150,8 @@ - - + + Modified: forrest/trunk/main/webapp/forrest.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/forrest.xmap?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/main/webapp/forrest.xmap (original) +++ forrest/trunk/main/webapp/forrest.xmap Sun Aug 13 14:41:37 2006 @@ -222,32 +222,32 @@ pass-through="true"/> - + - + - + - + - + Modified: forrest/trunk/main/webapp/i18n.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/i18n.xmap?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/main/webapp/i18n.xmap (original) +++ forrest/trunk/main/webapp/i18n.xmap Sun Aug 13 14:41:37 2006 @@ -40,7 +40,7 @@ - + Modified: forrest/trunk/main/webapp/locationmap-chaperon.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap-chaperon.xml?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/main/webapp/locationmap-chaperon.xml (original) +++ forrest/trunk/main/webapp/locationmap-chaperon.xml Sun Aug 13 14:41:37 2006 @@ -35,24 +35,24 @@ - + - + - + - + - + Modified: forrest/trunk/main/webapp/locationmap-i18n.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap-i18n.xml?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/main/webapp/locationmap-i18n.xml (original) +++ forrest/trunk/main/webapp/locationmap-i18n.xml Sun Aug 13 14:41:37 2006 @@ -35,7 +35,7 @@ - + Modified: forrest/trunk/main/webapp/locationmap-plugin.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap-plugin.xml?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/main/webapp/locationmap-plugin.xml (original) +++ forrest/trunk/main/webapp/locationmap-plugin.xml Sun Aug 13 14:41:37 2006 @@ -35,15 +35,15 @@ - + - + - + Modified: forrest/trunk/main/webapp/locationmap-skinconf.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap-skinconf.xml?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/main/webapp/locationmap-skinconf.xml (original) +++ forrest/trunk/main/webapp/locationmap-skinconf.xml Sun Aug 13 14:41:37 2006 @@ -35,19 +35,19 @@ - + - + - + - + Modified: forrest/trunk/main/webapp/locationmap-skins.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap-skins.xml?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/main/webapp/locationmap-skins.xml (original) +++ forrest/trunk/main/webapp/locationmap-skins.xml Sun Aug 13 14:41:37 2006 @@ -36,41 +36,41 @@ Modified: forrest/trunk/main/webapp/locationmap-transforms.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap-transforms.xml?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/main/webapp/locationmap-transforms.xml (original) +++ forrest/trunk/main/webapp/locationmap-transforms.xml Sun Aug 13 14:41:37 2006 @@ -40,17 +40,17 @@ @@ -58,51 +58,51 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + Modified: forrest/trunk/main/webapp/locationmap.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap.xml?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/main/webapp/locationmap.xml (original) +++ forrest/trunk/main/webapp/locationmap.xml Sun Aug 13 14:41:37 2006 @@ -53,61 +53,61 @@ - + - + - + @@ -116,11 +116,11 @@ - + - + Modified: forrest/trunk/main/webapp/menu.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/menu.xmap?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/main/webapp/menu.xmap (original) +++ forrest/trunk/main/webapp/menu.xmap Sun Aug 13 14:41:37 2006 @@ -69,7 +69,7 @@ - + @@ -118,7 +118,7 @@ - + Modified: forrest/trunk/main/webapp/raw.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/raw.xmap?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/main/webapp/raw.xmap (original) +++ forrest/trunk/main/webapp/raw.xmap Sun Aug 13 14:41:37 2006 @@ -19,13 +19,13 @@ Serves 'raw' content from files in src/documentation/content/xdocs This allows the inclusion of binary content (*.doc, *.pdf etc) in Forrest sites. -This pipeline *relies* on the caller checking if the {project:content.xdocs}/ actually exists! +This pipeline *relies* on the caller checking if the {properties:content.xdocs}/ actually exists! If the caller doesn't do this, this sitemap's '**' pipeline will match everything. -Generates : Exact bytes read from {project:content.xdocs}/** +Generates : Exact bytes read from {properties:content.xdocs}/** Example URL: http://localhost:8888/blah.doc Used by : sitemap.xmap -Uses : {project:content.xdocs}/** +Uses : {properties:content.xdocs}/** $Revision: 1.2 $ ==================================================== --> Modified: forrest/trunk/main/webapp/revisions.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/revisions.xmap?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/main/webapp/revisions.xmap (original) +++ forrest/trunk/main/webapp/revisions.xmap Sun Aug 13 14:41:37 2006 @@ -51,19 +51,19 @@ - + - + - + @@ -75,7 +75,7 @@ - + Modified: forrest/trunk/main/webapp/search.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/search.xmap?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/main/webapp/search.xmap (original) +++ forrest/trunk/main/webapp/search.xmap Sun Aug 13 14:41:37 2006 @@ -120,8 +120,8 @@ - - + + Modified: forrest/trunk/main/webapp/sitemap.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/sitemap.xmap?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/main/webapp/sitemap.xmap (original) +++ forrest/trunk/main/webapp/sitemap.xmap Sun Aug 13 14:41:37 2006 @@ -138,7 +138,7 @@ - + true @@ -283,7 +283,7 @@ Instead of filterlinks.xsl, use cli.xconf include/exclude nodes to define which pages to render. - + @@ -299,10 +299,10 @@ - + - + @@ -389,9 +389,9 @@ --> - + @@ -404,8 +404,8 @@ --> - - + + @@ -414,7 +414,7 @@ matcher if they want to generate the locationmap dynamically --> - + @@ -468,7 +468,7 @@ - + @@ -667,8 +667,8 @@ - - + + Modified: forrest/trunk/main/webapp/tabs.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/tabs.xmap?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/main/webapp/tabs.xmap (original) +++ forrest/trunk/main/webapp/tabs.xmap Sun Aug 13 14:41:37 2006 @@ -55,7 +55,7 @@ - + Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources.xmap?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources.xmap (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources.xmap Sun Aug 13 14:41:37 2006 @@ -49,7 +49,7 @@ - + @@ -57,7 +57,7 @@ - + Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/src/documentation/content/xdocs/index.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/src/documentation/content/xdocs/index.xml?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/src/documentation/content/xdocs/index.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/src/documentation/content/xdocs/index.xml Sun Aug 13 14:41:37 2006 @@ -26,7 +26,7 @@

This plugin creates photo albums from sets of photographs.

The pictures are expected under - {project:content.xdocs}/images/gallery/**. To create your photo + {properties:content.xdocs}/images/gallery/**. To create your photo albums simply create a new directory for each photo album under the gallery directory. Place your original sized pictures into each gallery sub-directory. The thumbnail and small sized images will be automatically generated from these.

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/input.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/input.xmap?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/input.xmap (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/input.xmap Sun Aug 13 14:41:37 2006 @@ -63,11 +63,11 @@ - + - - - + + + @@ -78,11 +78,11 @@ - + - - + + @@ -232,7 +232,7 @@ locationmap.xml file. --> - + Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/locationmap.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/locationmap.xml?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/locationmap.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/locationmap.xml Sun Aug 13 14:41:37 2006 @@ -34,15 +34,15 @@ - + - + - + @@ -54,11 +54,11 @@ - + - + Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/src/documentation/content/xdocs/index.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/src/documentation/content/xdocs/index.xml?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/src/documentation/content/xdocs/index.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/src/documentation/content/xdocs/index.xml Sun Aug 13 14:41:37 2006 @@ -50,7 +50,7 @@ SVN Changes

You can generate as well the changes with svn. For this you need to point forrest to the directory where the svn logs are. The defaut is - set to {project:content}svn-log/ and you can change it by + set to {properties:content}svn-log/ and you can change it by setting projectInfo.svn.log.dir in your project locationmap.

We created a log file for demonstration with the following command:

@@ -61,7 +61,7 @@ can see the result log.svn.html.

You see the only context we have definied is "code". This is controlled by a mapper file. The defaut is set to - {project:content}path-to-context.xml and you can change it + {properties:content}path-to-context.xml and you can change it by setting projectInfo.svn.mapper in your project locationmap.

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/svnHelper.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/svnHelper.xmap?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/svnHelper.xmap (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/svnHelper.xmap Sun Aug 13 14:41:37 2006 @@ -34,11 +34,11 @@ - + - - - + + + @@ -52,8 +52,8 @@ - - + + Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.inputModule/src/documentation/content/xdocs/index.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.inputModule/src/documentation/content/xdocs/index.xml?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.output.inputModule/src/documentation/content/xdocs/index.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.output.inputModule/src/documentation/content/xdocs/index.xml Sun Aug 13 14:41:37 2006 @@ -39,11 +39,9 @@ require further help please ask on the user mailing list.

    -
  • Properties of the project input +
  • Properties of the project input module - used in the sitemap like - {project:content.xdocs}
    • -
  • Properties of the defaults input - module - used in the sitemap like {defaults:home}
    • + {properties:content.xdocs}
  • Properties of the date input module - we cast an object to a string, but the module returns java.util.Date. This causes a ClassCastException.
    • Modified: forrest/trunk/site-author/content/locationmap.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/locationmap.xml?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/site-author/content/locationmap.xml (original) +++ forrest/trunk/site-author/content/locationmap.xml Sun Aug 13 14:41:37 2006 @@ -35,7 +35,7 @@ - + Modified: forrest/trunk/site-author/content/xdocs/docs_0_60/faq.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_60/faq.xml?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/docs_0_60/faq.xml (original) +++ forrest/trunk/site-author/content/xdocs/docs_0_60/faq.xml Sun Aug 13 14:41:37 2006 @@ -605,7 +605,7 @@ - + Modified: forrest/trunk/site-author/content/xdocs/docs_0_60/howto/howto-pdf-tab.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_60/howto/howto-pdf-tab.xml?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/docs_0_60/howto/howto-pdf-tab.xml (original) +++ forrest/trunk/site-author/content/xdocs/docs_0_60/howto/howto-pdf-tab.xml Sun Aug 13 14:41:37 2006 @@ -86,8 +86,8 @@ - - + + @@ -694,9 +694,9 @@ - - - + + + Modified: forrest/trunk/site-author/content/xdocs/docs_0_70/howto/howto-view-dsl.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_70/howto/howto-view-dsl.xml?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/docs_0_70/howto/howto-view-dsl.xml (original) +++ forrest/trunk/site-author/content/xdocs/docs_0_70/howto/howto-view-dsl.xml Sun Aug 13 14:41:37 2006 @@ -205,7 +205,7 @@ stylesheet we use another tag within our view ]]>.

    - Now we will create a new file as . In our case + Now we will create a new file as . In our case we will save a file called howTo.css in newSeed/src/documentation/skins/css/howTo.css containing only the following css:

    Modified: forrest/trunk/site-author/content/xdocs/docs_0_70/sitemap-ref.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_70/sitemap-ref.xml?rev=431247&r1=431246&r2=431247&view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/docs_0_70/sitemap-ref.xml (original) +++ forrest/trunk/site-author/content/xdocs/docs_0_70/sitemap-ref.xml Sun Aug 13 14:41:37 2006 @@ -231,7 +231,7 @@ to document-v13:

    - + ]]>