forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cdupoiri...@apache.org
Subject svn commit: r430296 - in /forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo: resources.xmap resources/stylesheets/changes-to-rss.xsl status.xml
Date Thu, 10 Aug 2006 07:42:51 GMT
Author: cdupoirieux
Date: Thu Aug 10 00:42:46 2006
New Revision: 430296

URL: http://svn.apache.org/viewvc?rev=430296&view=rev
Log:
Revert of my commit (FOR-812)
Just the time to make an official release of the plugin fully compliant with forrest 0.8.
(Cf. http://marc.theaimsgroup.com/?l=forrest-dev&w=2&r=1&q=b&s=430032)
I let the default.plugin.properties.xml I had created...

Modified:
    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
    forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/status.xml

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=430296&r1=430295&r2=430296&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 Aug
10 00:42:46 2006
@@ -30,21 +30,20 @@
     <map:pipeline>
 
       <map:match pattern="**changes.rss">
-        <map:generate src="{lm:project.status}"/>
-        <map:transform src="{lm:projectInfo.transform.changes.rss}">
-          <map:parameter name="projectName" value="{project:projectInfo.project.fullname}"/>
-          <map:parameter name="projectUrl" value="{project:projectInfo.project.url}"/>
-          <map:parameter name="rssLanguage" value="{project:projectInfo.rss.language}"/>
-        </map:transform>
+        <map:aggregate element="agg">
+          <map:part src="cocoon://skinconf.xml"/>
+          <map:part src="{lm:project.status}"/>
+        </map:aggregate>
+        <map:transform src="{lm:projectInfo.transform.changes.rss}"/>
         <map:serialize type="rss091" />
       </map:match>
     
       <map:match type="regexp" pattern="^(.*?)([^/]*)changes_(.*).rss$">
-        <map:generate src="{lm:project.status}"/>
+        <map:aggregate element="agg">
+          <map:part src="cocoon://skinconf.xml"/>
+          <map:part src="{lm:project.status}"/>
+        </map:aggregate>
         <map:transform src="{lm:projectInfo.transform.changes.rss}">
-          <map:parameter name="projectName" value="{project:projectInfo.project.fullname}"/>
-          <map:parameter name="projectUrl" value="{project:projectInfo.project.url}"/>
-          <map:parameter name="rssLanguage" value="{project:projectInfo.rss.language}"/>
           <map:parameter name="versionNumber" value="{3}"/>
         </map:transform>
         <map:serialize type="rss091" />

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=430296&r1=430295&r2=430296&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 Aug 10 00:42:46 2006
@@ -18,12 +18,9 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <xsl:param name="versionNumber"/>
-  <xsl:param name="projectName"/>
-  <xsl:param name="projectUrl"/>
-  <xsl:param name="rssLanguage"/>
 
   <xsl:variable name="changes-url"
-    select="concat($projectUrl, 'changes.html')"/>
+    select="concat(../skinconfig/project-url, 'changes.html')"/>
 
   <xsl:template match="status">
       
@@ -31,13 +28,13 @@
       <channel>
         <xsl:choose>
           <xsl:when test="$versionNumber = 'current'">
-            <title><xsl:value-of select="$projectName"/> (<xsl:value-of select="//release[1]/@version"/>)
Changes</title>
+            <title><xsl:value-of select="../skinconfig/project-name"/> (<xsl:value-of
select="//release[1]/@version"/>) Changes</title>
           </xsl:when>
           <xsl:when test="$versionNumber">
-            <title><xsl:value-of select="$projectName"/> (<xsl:value-of select="$versionNumber"/>)
Changes</title>
+            <title><xsl:value-of select="../skinconfig/project-name"/> (<xsl:value-of
select="$versionNumber"/>) Changes</title>
           </xsl:when>
           <xsl:otherwise>
-            <title><xsl:value-of select="$projectName"/> (<xsl:value-of select="//release[1]/@version"/>)
Changes</title>
+            <title><xsl:value-of select="../skinconfig/project-name"/> (<xsl:value-of
select="//release[1]/@version"/>) Changes</title>
           </xsl:otherwise>
         </xsl:choose>
 
@@ -46,17 +43,17 @@
         
         <xsl:choose>
           <xsl:when test="$versionNumber = 'current'">
-            <description><xsl:value-of select="$projectName"/> (<xsl:value-of
select="//release[1]/@version"/>) Changes</description>
+            <description><xsl:value-of select="../skinconfig/project-name"/>
(<xsl:value-of select="//release[1]/@version"/>) Changes</description>
           </xsl:when>
           <xsl:when test="$versionNumber">
-            <description><xsl:value-of select="$projectName"/> (<xsl:value-of
select="$versionNumber"/>) Changes</description>
+            <description><xsl:value-of select="../skinconfig/project-name"/>
(<xsl:value-of select="$versionNumber"/>) Changes</description>
           </xsl:when>
           <xsl:otherwise>
-            <description><xsl:value-of select="$projectName"/> (<xsl:value-of
select="//release[1]/@version"/>) Changes</description>
+            <description><xsl:value-of select="../skinconfig/project-name"/>
(<xsl:value-of select="//release[1]/@version"/>) Changes</description>
           </xsl:otherwise>
         </xsl:choose>
 
-        <language><xsl:value-of select="$rssLanguage"/></language>
+        <language>en-us</language>
 
         <xsl:choose>
           <xsl:when test="$versionNumber">
@@ -113,7 +110,6 @@
     </item>
   </xsl:template>
 
-  <!-- FIXME - not sure it is still needed since we do not use the skinconf.xml aggregation...
-->
   <xsl:template match="skinconfig"/>
   <xsl:template match="notes"/>
   <xsl:template match="todo"/>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/status.xml?rev=430296&r1=430295&r2=430296&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/status.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/status.xml Thu Aug 10
00:42:46 2006
@@ -52,9 +52,6 @@
         <p>This plugin provides various mechanisms for extracting and
         displaying information about one or more projects.</p>
       </notes>
-      <action type="fix" context="code" dev="CD" fixes-bug="FOR-812" importance="high">
-        Remove dependency of projectInfo on skinconf.xml.
-      </action>
       <action type="update" context="code" dev="TS"> Adding svn support 
         specific properties to the default.plugin.properties.xml. Further 
         activated this new properties (projectInfo.svn.ext and 



Mime
View raw message