Author: rgardler
Date: Thu Oct 4 04:21:47 2007
New Revision: 581853
URL: http://svn.apache.org/viewvc?rev=581853&view=rev
Log:
correct rendering of changes RSS when using the dispatcher
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/forrest.properties.xml
forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/resources.xmap
forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/resources/stylesheets/changes-to-rss.xsl
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/forrest.properties.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/forrest.properties.xml?rev=581853&r1=581852&r2=581853&view=diff
==============================================================================
---
forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/forrest.properties.xml
(original)
+++
forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/forrest.properties.xml
Thu Oct 4 04:21:47 2007
@@ -29,4 +29,6 @@
or false. -->
<property name="projectInfo.changes.includeCommitterList" value="false"/>
<property name="projectInfo.svn.ext" value=".svn.xml"/>
+ <property name="projectInfo.project.fullname" value="Apache Forrest
ProjectInfo"/>
+ <property name="projectInfo.url"
value="http://forrest.apache.org/pluginDocs/plugins_0_90/index.html"/>
</properties>
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/resources.xmap
URL:
http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/resources.xmap?rev=581853&r1=581852&r2=581853&view=diff
==============================================================================
---
forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/resources.xmap
(original)
+++
forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/resources.xmap
Thu Oct 4 04:21:47 2007
@@ -32,7 +32,10 @@
<map:part src="cocoon://skinconf.xml"/>
<map:part src="{lm:project.status}"/>
</map:aggregate>
- <map:transform src="{lm:projectInfo.transform.changes.rss}"/>
+ <map:transform src="{lm:projectInfo.transform.changes.rss}">
+ <map:parameter name="changes-url"
value="{properties:projectInfo.url}/changes.html"/>
+ <map:parameter name="project-name"
value="{properties:projectInfo.project.fullname}"/>
+ </map:transform>
<map:serialize type="rss091" />
</map:match>
<map:match type="regexp" pattern="^(.*?)([^/]*)changes_(.*).rss$">
@@ -42,6 +45,8 @@
</map:aggregate>
<map:transform src="{lm:projectInfo.transform.changes.rss}">
<map:parameter name="versionNumber" value="{3}"/>
+ <map:parameter name="changes-url"
value="{properties:projectInfo.url}"/>
+ <map:parameter name="project-name"
value="{properties:project.name}"/>
</map:transform>
<map:serialize type="rss091" />
</map:match>
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/resources/stylesheets/changes-to-rss.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/resources/stylesheets/changes-to-rss.xsl?rev=581853&r1=581852&r2=581853&view=diff
==============================================================================
---
forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/resources/stylesheets/changes-to-rss.xsl
(original)
+++
forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/resources/stylesheets/changes-to-rss.xsl
Thu Oct 4 04:21:47 2007
@@ -15,32 +15,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
- xmlns:forrest="http://apache.org/forrest/properties/1.0";>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:param name="versionNumber"/>
- <xsl:variable name="changes-url">
- <xsl:choose>
- <xsl:when test="/*/skinconfig">
- <xsl:value-of select="concat(/*/skinconfig/project-url,
'changes.html')"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="concat(/*/forrest:properties/forrest:[EMAIL
PROTECTED]'project.url']/@value, 'changes.html')"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
+ <xsl:param name="changes-url"
+ select="concat(//skinconfig/project-url, 'changes.html')"/>
+ <xsl:param name="project-name" select="//skinconfig/project-name"/>
<xsl:template match="status">
- <xsl:variable name="project-name">
- <xsl:choose>
- <xsl:when test="../skinconfig">
- <xsl:value-of select="../skinconfig/project-name"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="../forrest:properties/forrest:[EMAIL
PROTECTED]'project.name']/@value"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
<rss version="0.91">
<channel>
<xsl:choose>
@@ -100,12 +80,13 @@
<xsl:apply-templates/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:apply-templates select="changes/release[1]/action"/>
</channel>
</rss>
</xsl:template>
<xsl:template match="action">
<item>
- <title><xsl:value-of select="@context" />
+ <title><xsl:value-of select="$project-name"/><xsl:text>
</xsl:text><xsl:value-of select="@context" />
<xsl:text> </xsl:text>
<xsl:value-of select="@type" />
<xsl:if test="@fixes-bug">
