Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/int/index.xml URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/int/index.xml?view=diff&rev=527037&r1=527036&r2=527037 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/int/index.xml (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/int/index.xml Mon Apr 9 22:33:31 2007 @@ -24,18 +24,23 @@ <body> <section id="introduction"> <title>Introduction</title> - <p> Since the dispatcher is in the whiteboard, we can afford to use the - latest features available in forrest. This helps to test these new - features and to be prepared for the future when this feature is - standard.</p> + <p> + Since the dispatcher is in the whiteboard, we can afford to use the + latest features available in forrest. This helps to test these new + features and to be prepared for the future when this feature is + standard. + </p> </section> <section id="fpx"> <title>forrest.properties.xml</title> - <p> We needed to prevent having references from the core to a plugin. - This can be done with the new properties system. You can override any - of the following values via a <code>forrest.properties.xml</code> in your - project.</p> - <source><![CDATA[ <property name="dispatcher.theme" value="pelt"/> + <p> + We needed to prevent having references from the core to a plugin. This + can be done with the new properties system. You can override any of the + following values via a <code>forrest.properties.xml</code> in your + project. + </p> + <source> +<![CDATA[ <property name="dispatcher.theme" value="pelt"/> <property name="dispatcher.fallback.theme" value="common"/> <property name="dispatcher.theme-ext" value=".fv"/> <property name="dispatcher.fallback.theme-ext" value=".fv"/> @@ -45,16 +50,21 @@ </section> <section id="lm"> <title>locationmap.xml</title> - <p> One of the main features of the dispatcher is its fallback mechanism. - We are not only looking into one or two places but a sophisticated list - of locations. These locations are defined in the locationmap.xml. Like - with the forrest.properties.xml you can override any match in there by - implementing it in your project locationmap.xml.</p> - <section id="handson"> - <title>Hands on the lm</title> - <p>The resolving process of the structurer responsible for the URL - has implemented a high amount of fallbacks. Let us have a look.</p> - <source><![CDATA[<match pattern="resolve.structurer.**"> + <p> + One of the main features of the dispatcher is its fallback mechanism. We + are not only looking into one or two places but a sophisticated list of + locations. These locations are defined in the locationmap.xml. Like with + the forrest.properties.xml you can override any match in there by + implementing it in your project locationmap.xml. + </p> + <section id="handson"> + <title>Hands on the lm</title> + <p> + The resolving process of the structurer responsible for the URL has + implemented a high amount of fallbacks. Let us have a look. + </p> + <source> +<![CDATA[<match pattern="resolve.structurer.**"> <!-- FIXME - Problem with the pattern ******************************** @@ -149,8 +159,9 @@ src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}{properties:dispatcher.fallback.theme-ext}" /> </select> -</match>]]> </source> - </section> +</match>]]> + </source> + </section> </section> </body> </document>
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/site.xml URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/site.xml?view=diff&rev=527037&r1=527036&r2=527037 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/site.xml (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/site.xml Mon Apr 9 22:33:31 2007 @@ -15,7 +15,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - <!-- Forrest site.xml @@ -29,9 +28,7 @@ See http://forrest.apache.org/docs/linking.html for more info --> - <site label="org.apache.forrest.plugin.internal.views" href="" xmlns="http://apache.org/forrest/linkmap/1.0"; tab=""> - <about label="About"> <dispatcher-concept label="Dispatcher development" href="index.html"/> <glossary label="Glossary" href="dispatcher-glossary.html" description="(FIXME: add content) Dispactcher related terms and meanings" /> @@ -46,15 +43,13 @@ <internals label="Internals" tab="int" href="int/"> <index label="Overview" href="index.html"/> </internals> - - <!-- +<!-- The href must be wholesite.html/pdf You can change the labels and node names <all label="All"> <whole_site_html label="Whole Site HTML" href="wholesite.html"/> <whole_site_pdf label="Whole Site PDF" href="wholesite.pdf"/> </all> --> - <external-refs> <forrest href="http://forrest.apache.org/";> <linking href="docs/linking.html"/> @@ -65,7 +60,7 @@ <status-themes href="docs_0_80/status-themes.html"/> <forrestbar href="tools/forrestbar.html"/> </forrest> - <sun href="http://java.sun.com/";> + <sun href="http://java.sun.com/";> <j2ee href="j2ee/"> <patterns href="patterns/"> <dispatcherView href="DispatcherView.html" /> @@ -79,12 +74,11 @@ </corej2eepatterns> <cocoon href="http://cocoon.apache.org/"/> <xml.apache.org href="http://xml.apache.org/"/> - <mailings href="http://marc.theaimsgroup.com/?";> - <dev href="l=forrest-dev&"> - <pInfra href="m=110019697426791&w=2"/> - <ftLeather href="m=109959086204887&w=2"/> - </dev> - </mailings> + <mailings href="http://marc.theaimsgroup.com/?";> + <dev href="l=forrest-dev&"> + <pInfra href="m=110019697426791&w=2"/> + <ftLeather href="m=109959086204887&w=2"/> + </dev> + </mailings> </external-refs> - </site> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/tabs.xml URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/tabs.xml?view=diff&rev=527037&r1=527036&r2=527037 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/tabs.xml (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/tabs.xml Mon Apr 9 22:33:31 2007 @@ -16,13 +16,11 @@ limitations under the License. --> <!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.1//EN" "http://forrest.apache.org/dtd/tab-cocoon-v11.dtd";> - <tabs software="MyProj" title="MyProj" copyright="Foo" xmlns:xlink="http://www.w3.org/1999/xlink";> - - <!-- The rules for tabs are: +<!-- The rules for tabs are: @dir will always have '/@indexfile' added. @indexfile gets appended to @dir if the tab is selected. Defaults to 'index.html' @href is not modified unless it is root-relative and obviously specifies a @@ -32,14 +30,12 @@ Tabs can be embedded to a depth of two. The second level of tabs will only be displayed when their parent tab is selected. --> - <tab id="plugins" label="Forrest Plugins" href="http://forrest.apache.org/pluginDocs"; indexfile="index.html"/> <tab id="" label="Home" dir="" indexfile="index.html"/> <tab id="how" label="HowTo" dir="how" indexfile="howto-dispatcher-quickstart.html"/> <tab id="int" label="Internals" dir="int" indexfile="index.html"/> - <!-- Add new tabs here, eg: +<!-- Add new tabs here, eg: <tab label="How-Tos" dir="community/howto/"/> <tab label="XML Site" dir="xml-site/"/> --> - </tabs> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt.fv URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt.fv?view=diff&rev=527037&r1=527036&r2=527037 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt.fv (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt.fv Mon Apr 9 22:33:31 2007 @@ -17,17 +17,17 @@ --> <forrest:views xmlns:forrest="http://apache.org/forrest/templates/1.0"; xmlns:jx="http://apache.org/cocoon/templates/jx/1.0";> - <!-- The following variables are used to contact data models and/or contracts. --> +<!-- The following variables are used to contact data models and/or contracts. --> <jx:set var="getRequest" value="#{$cocoon/parameters/getRequest}"/> <jx:set var="getRequestExtension" value="#{$cocoon/parameters/getRequestExtension}" /> - <!-- CSS View of the request e.g. index.dispatcher.css --> +<!-- CSS View of the request e.g. index.dispatcher.css --> <forrest:view type="css" hooksXpath="/"> <forrest:contract name="branding-theme-profiler"> <forrest:properties contract="branding-theme-profiler"> <forrest:property name="branding-theme-profiler-theme"> Pelt</forrest:property> <forrest:property name="branding-theme-profiler"> - <!-- These values are used for the generated CSS files. +<!-- These values are used for the generated CSS files. They essentially "override" the default colors defined in the chosen theme. There are four duplicate "groups" of colors below, denoted by comments: Color group: Forrest, Krysalis, Collabnet, and Lenya using Pelt. @@ -37,7 +37,7 @@ Note that by default, all color groups are commented-out which means that the default colors provided by the theme are being used. --> - <!-- Color group: Forrest: example colors similar to forrest.apache.org +<!-- Color group: Forrest: example colors similar to forrest.apache.org Some of the element names are obscure, so comments are added to show how the "pelt" theme uses them, other themes might use these elements in a different way. Tip: temporarily change the value of an element to red (#ff0000) and see the effect. @@ -53,9 +53,8 @@ pelt: footer: the second from bottom strip containing credit logos and published date pelt: feedback: the optional bottom strip containing feedback link --> - - <!-- Color group: pelt --> - <!-- +<!-- Color group: pelt --> +<!-- <color name="breadtrail" value="#CFDCED" font="#0F3660" link="#0F3660" vlink="#0F3660" hlink="#000066"/> <color name="header" value="#294563"/> <color name="tab-selected" value="#4A6D8C" link="#0F3660" vlink="#0F3660" hlink="#000066"/> @@ -82,8 +81,8 @@ <color name="code" value="#CFDCED"/> <color name="footer" value="#CEDFEF"/> --> - <!-- Color group: Krysalis --> - <!-- +<!-- Color group: Krysalis --> +<!-- <color name="header" value="#FFFFFF"/> <color name="tab-selected" value="#a5b6c6" link="#000000" vlink="#000000" hlink="#000000"/> @@ -113,8 +112,8 @@ <color name="footer" value="#a5b6c6"/> --> - <!-- Color group: Collabnet --> - <!-- +<!-- Color group: Collabnet --> +<!-- <color name="header" value="#003366"/> <color name="tab-selected" value="#dddddd" link="#555555" vlink="#555555" hlink="#555555"/> @@ -144,8 +143,8 @@ <color name="footer" value="#ffffff"/> --> - <!-- Color group: Lenya using pelt--> - <!--<color name="header" value="#ffffff"/> +<!-- Color group: Lenya using pelt--> +<!--<color name="header" value="#ffffff"/> <color name="tab-selected" value="#E5E4D9" link="#000000" vlink="#000000" hlink="#000000"/> <color name="tab-unselected" value="#F5F4E9" link="#000000" vlink="#000000" hlink="#000000"/> @@ -176,24 +175,24 @@ </forrest:properties> </forrest:contract> </forrest:view> - <!-- HTML View of the request (e.g. index.html)--> +<!-- HTML View of the request (e.g. index.html)--> <forrest:view type="html" hooksXpath="/html/body"> - <!-- +<!-- @type defines this structurer to html. @hooksXpath defines where all hooks will be injected (as prefix). --> <forrest:contract name="branding-css-links"> - <!-- More information around this contract +<!-- 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) --> +<!--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" media="screen" rel="alternate stylesheet" theme="common"/> <css url="leather-dev.css" media="screen" rel="alternate stylesheet" theme="common"/> <css url="pelt.screen.css" media="screen" theme="Pelt"/> - <!-- You can request url specific css as defined above, +<!-- You can request url specific css as defined above, but beware that you need to use the *.dispatcher.css extension!!!--> <css prefix="" url="#{$getRequest}.dispatcher.css" media="screen" theme="Pelt"/> <css url="pelt.print.css" media="print"/> @@ -208,7 +207,7 @@ </forrest:contract> <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"/> + <meta http-equiv="content-type" content="text/html; charset=UTF-8"/> </forrest:property> <forrest:property name="theme" value="pelt"/> </forrest:contract> @@ -255,7 +254,7 @@ images/project.png</forrest:property> </forrest:contract> </forrest:hook> - <!-- --> +<!-- --> <forrest:contract name="search-input"> <forrest:property name="input-size">25</forrest:property> <forrest:property name="search-input"> @@ -274,7 +273,7 @@ </forrest:hook> <forrest:hook name="page"> <forrest:hook class="breadtrail" nbsp="true" /> - <!--<forrest:contract name="branding-breadcrumbs"> +<!--<forrest:contract name="branding-breadcrumbs"> <forrest:property name="branding-breadcrumbs"> <trail> <link1 name="myGroup" href="http://www.apache.org/"/> @@ -291,14 +290,14 @@ uri="cocoon://#{$cocoon/parameters/getRequest}.toc.xml"/> </forrest:property> <forrest:property name="expanding">true</forrest:property> - <!--<forrest:property name="toc" max-depth="2"/>--> +<!--<forrest:property name="toc" max-depth="2"/>--> </forrest:contract> - <!-- <forrest:contract name="genericMarkup"> +<!-- <forrest:contract name="genericMarkup"> <forrest:property name="genericMarkup"> <hr/> </forrest:property> </forrest:contract>--> - <!-- <forrest:contract name="search-input"> +<!-- <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"/> @@ -307,7 +306,7 @@ <forrest:contract name="siteinfo-credits"> <forrest:property name="box-location">credit</forrest:property> <forrest:property name="top-separator">true</forrest:property> - <!--<forrest:property name="siteinfo-credits"> +<!--<forrest:property name="siteinfo-credits"> <credits> <credit> <name>Built with Apache Forrest</name> @@ -319,7 +318,7 @@ </credits> </forrest:property>--> </forrest:contract> - <!-- <forrest:contract name="genericMarkup"> +<!-- <forrest:contract name="genericMarkup"> <forrest:property name="genericMarkup"> <hr/> </forrest:property> @@ -327,10 +326,10 @@ <forrest:contract name="content-motd-page"> <forrest:property name="content-motd-page"> <motd> - <!--FIXME: motd-page location needs removing +<!--FIXME: motd-page location needs removing These options are not effective anymore in dispatcher Need to be removed in Structurer and contracts usage/decription--> - <!--<motd-option pattern="index.html"> +<!--<motd-option pattern="index.html"> <motd-title>sample</motd-title> <motd-page location="page"> This is an example of a Message of the day (MOTD). @@ -354,8 +353,8 @@ </forrest:hook> --> <forrest:hook name="content"> - <!-- FIXME - Problem with ndeSetTextSize() script from fontsize.js not compliant between Pelt and Leather-dev... --> - <!-- <forrest:hook class="trail"> +<!-- 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" @@ -373,7 +372,7 @@ <headings type="underlined"/> </forrest:property> </forrest:contract> - <!-- +<!-- <forrest:contract name="content-authors"> <forrest:property name="content-authors" nugget="get.authors"> <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.authors.xml"/> @@ -419,7 +418,7 @@ </credits> </forrest:property> </forrest:contract> - <!-- <forrest:contract name="siteinfo-feedback"> +<!-- <forrest:contract name="siteinfo-feedback"> <forrest:properties contract="siteinfo-feedback"> <forrest:property name="siteinfo-feedback"> <feedback to="the Webmaster" Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/skinconf.xml URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/skinconf.xml?view=diff&rev=527037&r1=527036&r2=527037 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/skinconf.xml (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/skinconf.xml Mon Apr 9 22:33:31 2007 @@ -15,16 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - <!DOCTYPE skinconfig PUBLIC "-//APACHE//DTD Skin Configuration V0.7-1//EN" "http://forrest.apache.org/dtd/skinconfig-v07-1.dtd"; [ <!ENTITY skinconf-common PUBLIC "-//Apache Forrest//ENTITIES Skin Configuration common plugins V0.7-1//EN" ""> ]> - <skinconfig> &skinconf-common; <project-name>Plugin: dispatcher internal</project-name> <project-description>org.apache.forrest.plugin.internal.dispatcher plugin for Apache Forrest</project-description> - </skinconfig> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/status.xml?view=diff&rev=527037&r1=527036&r2=527037 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/status.xml (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/status.xml Mon Apr 9 22:33:31 2007 @@ -16,7 +16,6 @@ limitations under the License. --> <status> - <developers> <person name="David Crossley" email="[EMAIL PROTECTED]" id="DC" /> <person name="Ross Gardler" email="[EMAIL PROTECTED]" id="RDG" /> @@ -24,21 +23,19 @@ <person name="Gavin McDonald" email="[EMAIL PROTECTED]" id="GM" /> <person name="Volunteer needed" email="[email protected]" id="open"/> </developers> - - <!-- Define here the Title of the Context you want to display in the Changes pages. +<!-- Define here the Title of the Context you want to display in the Changes pages. id = the context value of actions title = Title of the Context - --> + --> <contexts> - <context id="code" title="Changes to the Code Base"/> - <context id="docs" title="Changes to Documentation"/> - <context id="admin" title="Changes to Project Administration"/> - <context id="design" title="Changes to Design"/> - <context id="build" title="Changes to Build"/> - </contexts> - + <context id="code" title="Changes to the Code Base"/> + <context id="docs" title="Changes to Documentation"/> + <context id="admin" title="Changes to Project Administration"/> + <context id="design" title="Changes to Design"/> + <context id="build" title="Changes to Build"/> + </contexts> <changes> - <!-- Add new releases here --> +<!-- Add new releases here --> <release version="0.1" date="unreleased"> <action context="code" dev="TS" fixes-bug="FOR-975" importance="high"> FOR-975 Renaming tiles to panel. @@ -67,12 +64,12 @@ <action dev="TS" type="add" context="docs"> Adding the "how tos" from the site-author to this plugin. </action> - <!-- 07/2006 --> +<!-- 07/2006 --> <action dev="TS" type="add" context="code"> Extending the dispatcher with an internal format. This internal format is our xdoc or xhtml2. The internal format will then be contacted by e.g. html contracts. </action> - <!-- < 07/2006 --> +<!-- < 07/2006 --> <action dev="TS" type="add" context="admin"> Initial plugin code extracted from the old views plugin. </action> @@ -82,7 +79,6 @@ <action dev="GM" type="add" context="docs"> Added a dispatcher glossary. Thanks to Thorsten for moving to the plugin. </action> - <action dev="TS" type="add" context="docs"> Added infos of the pattern the plugin is using. </action> @@ -102,10 +98,8 @@ <action dev="TS" type="add" context="code"> Added contracts and nuggets to the "view" plugins. </action> - </release> </changes> - <todo> <actions priority="high"> <action context="docs" dev="open"> @@ -117,8 +111,6 @@ <action context="core" dev="open"> Extract businessHelper to their on implementation plugin. </action> - </actions> </todo> - </status> Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap?view=diff&rev=527037&r1=527036&r2=527037 ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap Mon Apr 9 22:33:31 2007 @@ -25,8 +25,8 @@ mime-type="text/plain" logger="sitemap.serializer.text" /> <map:serializer mime-type="image/png" name="svg2png" src="org.apache.cocoon.serialization.SVGSerializer"> - <!--<parameter name="background_color" type="color" value="#ff00ff"/>--> - <!-- <parameter name="gamma" type="float" value="0.48"/> --> +<!--<parameter name="background_color" type="color" value="#ff00ff"/>--> +<!-- <parameter name="gamma" type="float" value="0.48"/> --> <parameter name="gamma" type="float" value="0" /> </map:serializer> </map:serializers> @@ -54,7 +54,7 @@ </map:match> </map:pipeline> <map:pipeline> - <!-- +<!-- Last processing step. Here we are overriding the default skin generation. --> @@ -62,7 +62,7 @@ <map:call resource="read-linked-text"> <map:parameter name="path" value="{lm:themes/{1}.css}" /> </map:call> - <!-- <map:read mime-type="text/css" src="{lm:themes/{1}.css}" /> --> +<!-- <map:read mime-type="text/css" src="{lm:themes/{1}.css}" /> --> </map:match> <map:match pattern="themes/**.js"> <map:read mime-type="application/x-javascript" src="{lm:themes/{1}.js}"
