forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cdupoiri...@apache.org
Subject svn commit: r430032 - in /forrest/trunk: plugins/org.apache.forrest.plugin.input.projectInfo/ plugins/org.apache.forrest.plugin.input.projectInfo/resources/stylesheets/ site-author/
Date Wed, 09 Aug 2006 10:52:50 GMT
Author: cdupoirieux
Date: Wed Aug  9 03:52:50 2006
New Revision: 430032

URL: http://svn.apache.org/viewvc?rev=430032&view=rev
Log:
FOR-812 - Remove skniconf dependency
Add new properties to manage the project name, Url and the rss language.
Add a forrest.properties.xml to site-author to set the project name and URL...

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

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/default.plugin.properties.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/default.plugin.properties.xml?rev=430032&r1=430031&r2=430032&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/default.plugin.properties.xml
(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.projectInfo/default.plugin.properties.xml
Wed Aug  9 03:52:50 2006
@@ -16,6 +16,10 @@
   limitations under the License.
 -->
 <properties>
+  <!-- Project identity -->
+  <property name="projectInfo.project.fullname" value="MyProject"/>
+  <property name="projectInfo.project.url" value="http://myproj.mygroup.org/"/>
+
   <!-- A comma separated list defining the way actions are sorted in the changes file.
        none = no sorting, will be listed in chronological order
        type = group by the type attribute -->
@@ -30,4 +34,7 @@
   <property name="projectInfo.changes.includeContributorList" value="true"/>
   <property name="projectInfo.svn.ext" value=".svn.xml"/>
   <property name="projectInfo.svn.path-prefix" value="src/documentation/content/svn-log/myProject-"/>
+
+  <!-- Indicate the rss flow language. Values are locale like : en-us, fr-fr, ... -->
+  <property name="projectInfo.rss.language" value="en-us"/>
 </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=430032&r1=430031&r2=430032&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 Wed Aug
 9 03:52:50 2006
@@ -30,20 +30,21 @@
     <map:pipeline>
 
       <map:match pattern="**changes.rss">
-        <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: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:serialize type="rss091" />
       </map:match>
     
       <map:match type="regexp" pattern="^(.*?)([^/]*)changes_(.*).rss$">
-        <map:aggregate element="agg">
-          <map:part src="cocoon://skinconf.xml"/>
-          <map:part src="{lm:project.status}"/>
-        </map:aggregate>
+        <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: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=430032&r1=430031&r2=430032&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
Wed Aug  9 03:52:50 2006
@@ -18,9 +18,12 @@
 <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(../skinconfig/project-url, 'changes.html')"/>
+    select="concat($projectUrl, 'changes.html')"/>
 
   <xsl:template match="status">
       
@@ -28,13 +31,13 @@
       <channel>
         <xsl:choose>
           <xsl:when test="$versionNumber = 'current'">
-            <title><xsl:value-of select="../skinconfig/project-name"/> (<xsl:value-of
select="//release[1]/@version"/>) Changes</title>
+            <title><xsl:value-of select="$projectName"/> (<xsl:value-of select="//release[1]/@version"/>)
Changes</title>
           </xsl:when>
           <xsl:when test="$versionNumber">
-            <title><xsl:value-of select="../skinconfig/project-name"/> (<xsl:value-of
select="$versionNumber"/>) Changes</title>
+            <title><xsl:value-of select="$projectName"/> (<xsl:value-of select="$versionNumber"/>)
Changes</title>
           </xsl:when>
           <xsl:otherwise>
-            <title><xsl:value-of select="../skinconfig/project-name"/> (<xsl:value-of
select="//release[1]/@version"/>) Changes</title>
+            <title><xsl:value-of select="$projectName"/> (<xsl:value-of select="//release[1]/@version"/>)
Changes</title>
           </xsl:otherwise>
         </xsl:choose>
 
@@ -43,17 +46,17 @@
         
         <xsl:choose>
           <xsl:when test="$versionNumber = 'current'">
-            <description><xsl:value-of select="../skinconfig/project-name"/>
(<xsl:value-of select="//release[1]/@version"/>) Changes</description>
+            <description><xsl:value-of select="$projectName"/> (<xsl:value-of
select="//release[1]/@version"/>) Changes</description>
           </xsl:when>
           <xsl:when test="$versionNumber">
-            <description><xsl:value-of select="../skinconfig/project-name"/>
(<xsl:value-of select="$versionNumber"/>) Changes</description>
+            <description><xsl:value-of select="$projectName"/> (<xsl:value-of
select="$versionNumber"/>) Changes</description>
           </xsl:when>
           <xsl:otherwise>
-            <description><xsl:value-of select="../skinconfig/project-name"/>
(<xsl:value-of select="//release[1]/@version"/>) Changes</description>
+            <description><xsl:value-of select="$projectName"/> (<xsl:value-of
select="//release[1]/@version"/>) Changes</description>
           </xsl:otherwise>
         </xsl:choose>
 
-        <language>en-us</language>
+        <language><xsl:value-of select="$rssLanguage"/></language>
 
         <xsl:choose>
           <xsl:when test="$versionNumber">
@@ -110,6 +113,7 @@
     </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=430032&r1=430031&r2=430032&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 Wed Aug 
9 03:52:50 2006
@@ -52,6 +52,9 @@
         <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 

Added: forrest/trunk/site-author/forrest.properties.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/forrest.properties.xml?rev=430032&view=auto
==============================================================================
--- forrest/trunk/site-author/forrest.properties.xml (added)
+++ forrest/trunk/site-author/forrest.properties.xml Wed Aug  9 03:52:50 2006
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<properties>
+  <!-- Project identity -->
+  <property name="projectInfo.project.fullname" value="Forrest"/>
+  <property name="projectInfo.project.url" value="http://forrest.apache.org/"/>
+</properties>



Mime
View raw message