You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by rg...@apache.org on 2006/01/13 16:31:39 UTC
svn commit: r368758 - in
/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki: build.xml
input.xmap locationmap.xml status.xml
Author: rgardler
Date: Fri Jan 13 07:31:29 2006
New Revision: 368758
URL: http://svn.apache.org/viewcvs?rev=368758&view=rev
Log:
use locationmap (for-726)
Added:
forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/locationmap.xml (with props)
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/build.xml
forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap
forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/build.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/build.xml?rev=368758&r1=368757&r2=368758&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/build.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/build.xml Fri Jan 13 07:31:29 2006
@@ -20,7 +20,7 @@
<property name="plugin-name" value="org.apache.forrest.plugin.input.wiki"/>
<property name="forrest.version" value="0.7"/>
<property name="type" value="input"/>
- <property name="plugin-version" value="0.1"/>
+ <property name="plugin-version" value="0.2"/>
<property name="description" value="Embed various wiki documents in a Forrest site. "/>
<property name="author" value="Apache Forrest Project"/>
<property name="websiteURL" value="http://forrest.apache.org/docs/plugins/org.apache.forrest.plugin.input.wiki/"/>
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap?rev=368758&r1=368757&r2=368758&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap Fri Jan 13 07:31:29 2006
@@ -36,9 +36,9 @@
<map:resources>
<map:resource name="file-resolver">
<map:select type="exists">
- <map:when test="{project:content.xdocs}{uri}.moinwiki">
+ <map:when test="{lm:project.{uri}.moinwiki}">
<map:match type="regexp" pattern="^(.*?)([^/]*).xml$">
- <map:generate type="text2xml" src="{lm:{1}{2}.moinwiki}" />
+ <map:generate type="text2xml" src="{lm:project.{1}{2}.moinwiki}" />
<map:transform type="lexer" src="cocoon:/moinwiki.xlex"/>
<map:transform type="parser" src="cocoon:/moinwiki.xgrm"/>
<map:transform type="xsltc"
@@ -49,7 +49,7 @@
<map:serialize type="xml-document"/>
</map:match>
</map:when>
- <map:when test="{project:content.xdocs}{uri}.jspwiki">
+ <map:when test="{lm:project.{uri}.jspwiki}">
<map:match type="regexp" pattern="^(.*?)([^/]*).xml$">
<map:generate type="text2xml" src="{lm:project.{1}{2}.jspwiki}" />
<map:transform type="lexer" src="cocoon:/wiki.xlex"/>
@@ -62,13 +62,13 @@
<map:serialize type="xml-document"/>
</map:match>
</map:when>
- <map:when test="{project:content.xdocs}{uri}.cwiki">
+ <map:when test="{lm:project.{uri}.cwiki}">
<map:match type="regexp" pattern="^(.*?)([^/]*).xml$">
<map:generate type="text2xml" src="{lm:project.{1}{2}.cwiki}" />
<map:transform type="lexer" src="cocoon:/wiki.xlex"/>
<map:transform type="parser" src="cocoon:/wiki.xgrm"/>
<map:transform type="xsltc"
- src="{lm:wiki.transform.wiki.xdoc}">
+ src="{lm:wiki.transform.wiki2xdoc}">
<map:parameter name="name" value="{2}" />
<map:parameter name="spaceless-filenames" value="true"/>
</map:transform>
@@ -120,7 +120,7 @@
<map:transform src="{lm:wiki.transform.text4regex}"/>
<map:transform type="lexer" src="{lm:wiki.grammar.regex.xlex}"/>
<map:transform type="parser" src="{lm:wiki.grammar.regex.xgrm}"/>
- <map:transform src="{lm:wiki.transform.grm.xlex}"/>
+ <map:transform src="{lm:wiki.transform.grm.xgrm}"/>
<map:serialize type="xml"/>
</map:otherwise>
</map:select>
Added: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/locationmap.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/locationmap.xml?rev=368758&view=auto
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/locationmap.xml (added)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/locationmap.xml Fri Jan 13 07:31:29 2006
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2002-2005 The Apache Software Foundation or its licensors,
+ as applicable.
+
+ Licensed 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.
+-->
+
+<!-- Default Forrest locationmap -->
+
+<locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
+
+ <components>
+ <matchers default="lm">
+ <matcher
+ name="lm"
+ src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
+ </matchers>
+ <selectors default="exists">
+ <selector name="exists" logger="sitemap.selector.exists"
+ src="org.apache.forrest.sourceexists.SourceExistsSelector" />
+ </selectors>
+ </components>
+
+ <locator>
+ <match pattern="wiki.grammar.*.*">
+ <select>
+ <location src="resources/chaperon/grammars/{1}.{2}"/>
+ </select>
+ </match>
+
+ <match pattern="wiki.transform.text4regex">
+ <location src="resources/chaperon/stylesheets/text4regex.xsl"/>
+ </match>
+
+ <match pattern="wiki.transform.*.*">
+ <location src="resources/chaperon/stylesheets/{1}2{2}.xsl"/>
+ </match>
+ </locator>
+</locationmap>
Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/locationmap.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml?rev=368758&r1=368757&r2=368758&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Fri Jan 13 07:31:29 2006
@@ -23,6 +23,14 @@
</developers>
<changes>
+ <release version="0.2-dev" date="unreleased">
+ <action type="add" context="code" dev="RDG">
+ Use locationmap for resolution of files.
+ </action>
+ </release>
+ </changes>
+
+ <changes>
<release version="0.1" date="unreleased">
<action type="fix" context="code" dev="DB" due-to="Evrim ULU" due-to-email="evrim@core.gen.tr">
Handle quoted links.