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 2007/06/15 01:38:42 UTC
svn commit: r547449 - in
/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher:
locationmap.xml src/documentation/content/xdocs/news.xml
src/documentation/content/xdocs/site.xml status.xml
Author: thorsten
Date: Thu Jun 14 16:38:41 2007
New Revision: 547449
URL: http://svn.apache.org/viewvc?view=rev&rev=547449
Log:
Cleaning up the locationmap from the xdocs location. Structurer needs to be placed in ${project.resources-dir}/structurer/url instead of the xdocs directory
Added:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/news.xml (with props)
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/site.xml
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/status.xml
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml?view=diff&rev=547449&r1=547448&r2=547449
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml Thu Jun 14 16:38:41 2007
@@ -184,10 +184,6 @@
<location
src="{properties:resources}/structurer/url/{1}{properties:dispatcher.theme-ext}"
/>
-<!-- project-based
- url-based (xdocs location) [depreciated]-->
- <location
- src="{properties:content.xdocs}{1}{properties:dispatcher.theme-ext}" />
<act type="sourcetype"
src="{properties:content.xdocs}{1}.xml">
<!-- Sourcetype based
@@ -218,17 +214,6 @@
<parameter value="{properties:resources}structurer/url/"
name="projectDir"/>
<!-- url
- project-based theme-based = directory-based / parent-directory based (recursively) -->
- <location src="{uri}" />
- </act>
- <act type="RecursiveDirectoryTraversalAction">
- <parameter value="{../1}{1}" name="request"/>
- <parameter value="{properties:dispatcher.theme}" name="projectFallback"/>
- <parameter value="{properties:dispatcher.theme-ext}"
- name="projectExtension"/>
- <parameter value="{properties:content.xdocs}"
- name="projectDir"/>
-<!-- xdocs [depreciated]
project-based theme-based = directory-based / parent-directory based (recursively) -->
<location src="{uri}" />
</act>
Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/news.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/news.xml?view=auto&rev=547449
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/news.xml (added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/news.xml Thu Jun 14 16:38:41 2007
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN"
+ "http://forrest.apache.org/dtd/document-v20.dtd">
+<document>
+ <header>
+ <title>News about recent changes</title>
+ </header>
+ <body>
+ <warning>
+ The "dispatcher" is new functionality which is still in development phase.
+ That is why it is in the "whiteboard" section of the Forrest distribution.
+ We are working at the moment on moving this plugin from the whiteboard
+ into the core plugins. Further all dispatcher related documents will be
+ moved into the plugin as well. See
+ <a
+ href="http://forrest.apache.org/docs_0_80/status-themes.html">Status
+ of Themes: Skins and Dispatcher</a>.
+ </warning>
+ <!-- FIFO order: first in first out
+ Add new events to the top. -->
+ <section id="cleanup.15.06.07">
+ <title>Cleanup of the locationmap - 15.06.07</title>
+ <p> The locationmap matching for the structurer needed a cleanup. Structurer needs to
+ be placed now in
+ <code>${project.resources-dir}/structurer/url</code> instead of the xdocs
+ directory. </p>
+ <p>The following matches have been removed during this cleanup (you need to implement
+ them in your project locationmap if you still want their behavior.</p>
+ <source><![CDATA[<match pattern="resolve.structurer.**">
+ <select type="exists">
+<!-- ... -->
+ <!-- project-based url-based (xdocs location) -->
+ <location src="{properties:content.xdocs}{1}{properties:dispatcher.theme-ext}" />
+<!-- ... -->
+ <act type="RecursiveDirectoryTraversalAction">
+ <parameter value="{../1}{1}" name="request"/>
+ <parameter value="{properties:dispatcher.theme}" name="projectFallback"/>
+ <parameter value="{properties:dispatcher.theme-ext}"
+ name="projectExtension"/>
+ <parameter value="{properties:content.xdocs}"
+ name="projectDir"/>
+<!-- xdocs [depreciated]
+ project-based theme-based = directory-based / parent-directory based (recursively) -->
+ <location src="{uri}" />
+ </act>
+<!-- ... -->
+ </select>
+</match> ]]>
+ </source>
+ </section>
+ </body>
+</document>
Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/news.xml
------------------------------------------------------------------------------
svn:eol-style = native
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=547449&r1=547448&r2=547449
==============================================================================
--- 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 Thu Jun 14 16:38:41 2007
@@ -31,7 +31,8 @@
<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" />
+ <news label="News" href="news.html" description="News about changes"/>
+ <glossary label="Glossary" href="dispatcher-glossary.html" description="Dispactcher related terms and meanings" />
<changes label="Changes" href="changes.html" description="History of Changes" />
<todo label="Todo" href="todo.html" description="Todo List" />
</about>
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=547449&r1=547448&r2=547449
==============================================================================
--- 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 Thu Jun 14 16:38:41 2007
@@ -37,6 +37,9 @@
<changes>
<!-- Add new releases here -->
<release version="0.1" date="unreleased">
+ <action context="code" dev="TS" importance="high" type="update"> Cleaning up
+ locationmap from the former xdocs location. See
+ <link href="site:news">news #cleanup.15.06.07</link> how to update. </action>
<action context="code" type="fix" dev="TS" fixes-bug="FOR-975" importance="high">
FOR-975 Renaming tiles to panel.
</action>