Author: rgardler
Date: Thu Sep 11 14:18:48 2008
New Revision: 694488
URL: http://svn.apache.org/viewvc?rev=694488&view=rev
Log:
reverting r691518 as it broke sites pulling wiki content from live servers
rather than using local files
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap
URL:
http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap?rev=694488&r1=694487&r2=694488&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 Thu
Sep 11 14:18:48 2008
@@ -35,68 +35,57 @@
<map:resources>
<map:resource name="file-resolver">
<map:select type="exists">
- <!-- Moinwiki Markup -->
<map:when test="{lm:project.{uri}.moinwiki}">
<map:match type="regexp" pattern="^(.*?)([^/]*).xml$">
- <map:match type="i18n" pattern="{lm:project.{1}{2}.*.moinwiki}">
- <map:generate type="text2xml" src="{source}" />
+ <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"
src="{lm:wiki.transform.moinwiki.xdoc}">
- <map:parameter name="name" value="{../2}" />
+ <map:parameter name="name" value="{2}" />
<map:parameter name="spaceless-filenames" value="true"/>
</map:transform>
<map:serialize type="xml-document"/>
- </map:match>
</map:match>
</map:when>
- <!-- JSPWiki Markup -->
<map:when test="{lm:project.{uri}.jspwiki}">
<map:match type="regexp" pattern="^(.*?)([^/]*).xml$">
- <map:match type="i18n" pattern="{lm:project.{1}{2}.*.jspwiki}">
- <map:generate type="text2xml" src="{source}" />
+ <map:generate type="text2xml" src="{lm:project.{1}{2}.jspwiki}" />
<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}">
- <map:parameter name="name" value="{../2}" />
+ <map:parameter name="name" value="{2}" />
<map:parameter name="spaceless-filenames" value="true"/>
</map:transform>
<map:serialize type="xml-document"/>
- </map:match>
</map:match>
</map:when>
- <!-- CWiki Markup -->
<map:when test="{lm:project.{uri}.cwiki}">
<map:match type="regexp" pattern="^(.*?)([^/]*).xml$">
- <map:match type="i18n" pattern="{lm:project.{1}{2}.*.cwiki}">
- <map:generate type="text2xml" src="{source}" />
+ <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}">
- <map:parameter name="name" value="{../2}" />
+ <map:parameter name="name" value="{2}" />
<map:parameter name="spaceless-filenames" value="true"/>
</map:transform>
<map:serialize type="xml-document"/>
- </map:match>
</map:match>
</map:when>
<!-- Google Code Wiki Markup -->
<map:when test="{lm:project.{uri}.wiki}">
<map:match type="regexp" pattern="^(.*?)([^/]*).xml$">
- <map:match type="i18n" pattern="{lm:project.{1}{2}.*.wiki}">
- <map:generate type="text2xml" src="{source}" />
+ <map:generate type="text2xml" src="{lm:project.{1}{2}.wiki}" />
<map:transform type="lexer" src="cocoon:/googlewiki.xlex"/>
<map:transform type="parser" src="cocoon:/googlewiki.xgrm"/>
<map:transform type="xsltc"
src="{lm:wiki.transform.googlewiki.xdoc}">
- <map:parameter name="name" value="{../2}" />
+ <map:parameter name="name" value="{2}" />
<map:parameter name="spaceless-filenames" value="true"/>
</map:transform>
<map:serialize type="xml-document"/>
- </map:match>
</map:match>
</map:when>
</map:select>
