Author: rgardler
Date: Fri Nov 11 13:16:36 2005
New Revision: 332649
URL: http://svn.apache.org/viewcvs?rev=332649&view=rev
Log:
use locationmap (FOR-726)
Added:
forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/locationmap.xml
(with props)
forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/resources/stylesheets/feedDesc-to-RSS20.xsl
- copied unchanged from r332593,
forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/resources/stylesheets/feedDesc2RSS20.xsl
forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/resources/stylesheets/rss-to-document.xsl
- copied unchanged from r332593,
forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/resources/stylesheets/rss2document.xsl
Removed:
forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/resources/stylesheets/feedDesc2RSS20.xsl
forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/resources/stylesheets/rss2document.xsl
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/build.xml
forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/input.xmap
forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/status.xml
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/build.xml
URL:
http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/build.xml?rev=332649&r1=332648&r2=332649&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/build.xml
(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/build.xml Fri
Nov 11 13:16:36 2005
@@ -18,9 +18,9 @@
<project default="docs" basedir="." name="Forrest plugin build file">
<property name="plugin-name" value="org.apache.forrest.plugin.input.feeder"/>
- <property name="forrest.version" value="0.7"/>
+ <property name="forrest.version" value="0.8"/>
<property name="type" value="input"/>
- <property name="plugin-version" value="0.1"/>
+ <property name="plugin-version" value="0.2"/>
<property name="description" value="Embed syndicated content 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.feeder/"/>
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/input.xmap
URL:
http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/input.xmap?rev=332649&r1=332648&r2=332649&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/input.xmap
(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/input.xmap Fri
Nov 11 13:16:36 2005
@@ -27,16 +27,16 @@
<map:pipeline>
<map:match pattern="*.rss.xml">
- <map:generate src="{project:content.xdocs}/{1}.xml"/>
- <map:transform src="resources/stylesheets/feedDesc2RSS20.xsl"/>
- <map:transform src="resources/stylesheets/rss2document.xsl"/>
+ <map:generate src="{lm:project.{1}.xml}"/>
+ <map:transform src="{lm:feeder.transform.feedDesc.RSS20}"/>
+ <map:transform src="{lm:feeder.transform.rss.document}"/>
<map:serialize type="xml"/>
</map:match>
<map:match pattern="**/*.rss.xml">
- <map:generate src="{project:content.xdocs}/{1}/{2}.xml"/>
- <map:transform src="resources/stylesheets/feedDesc2RSS20.xsl"/>
- <map:transform src="resources/stylesheets/rss2document.xsl"/>
+ <map:generate src="{lm:project.{1}/{2}.xml}"/>
+ <map:transform src="{lm:feeder.transform.feedDesc.RSS20}"/>
+ <map:transform src="{lm:feeder.transform.rss.document}"/>
<map:serialize type="xml"/>
</map:match>
</map:pipeline>
Added:
forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/locationmap.xml
URL:
http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/locationmap.xml?rev=332649&view=auto
==============================================================================
---
forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/locationmap.xml
(added)
+++
forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/locationmap.xml
Fri Nov 11 13:16:36 2005
@@ -0,0 +1,37 @@
+<?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.
+-->
+<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="feeder.transform.*.*">
+ <location src="resources/stylesheets/{1}-to-{2}.xsl" />
+ </match>
+ </locator>
+</locationmap>
Propchange:
forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/locationmap.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/status.xml
URL:
http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/status.xml?rev=332649&r1=332648&r2=332649&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/status.xml
(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.feeder/status.xml Fri
Nov 11 13:16:36 2005
@@ -32,6 +32,10 @@
<changes>
<release version="0.2" date="unreleased">
<action dev="RDG" type="update" context="code" importance="high">
+ Use locationmap for resource resolution. Internal stylesheets exposed
via
+ {lm:feeder.transform.*.*}
+ </action>
+ <action dev="RDG" type="update" context="code" importance="high">
Changed the request URI from **/feeder/*.xml to **.rss.xml. Please
update your source files accordingly.
</action>
