Return-Path: 
 <svn-return-1854-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 49803 invoked from network); 10 Apr 2005 14:06:33 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 10 Apr 2005 14:06:33 -0000
Received: (qmail 66406 invoked by uid 500); 10 Apr 2005 14:06:32 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 66339 invoked by uid 500); 10 Apr 2005 14:06:32 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
List-Post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 66324 invoked by uid 99); 10 Apr 2005 14:06:31 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Sun, 10 Apr 2005 07:06:31 -0700
Received: (qmail 49740 invoked by uid 65534); 10 Apr 2005 14:06:30 -0000
Message-ID: <20050410140630.49738.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Sun, 10 Apr 2005 14:06:30 -0000
Subject: svn commit: r160775 - in
 forrest/trunk/plugins/org.apache.forrest.plugin.projectInfo: input.xmap
 resources/stylesheets/changes2document.xsl
 resources/stylesheets/dotdots.xsl status.xml
To: svn@forrest.apache.org
From: crossley@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: crossley
Date: Sun Apr 10 07:06:29 2005
New Revision: 160775

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D160775
Log:
Enable changes.html and todo.html to also be in subdirectories.
Use relative location of images directory obtained via dotdots template.

Added:
    forrest/trunk/plugins/org.apache.forrest.plugin.projectInfo/resources/s=
tylesheets/dotdots.xsl
      - copied unchanged from r160752, forrest/trunk/main/webapp/skins/comm=
on/xslt/html/dotdots.xsl
Modified:
    forrest/trunk/plugins/org.apache.forrest.plugin.projectInfo/input.xmap
    forrest/trunk/plugins/org.apache.forrest.plugin.projectInfo/resources/s=
tylesheets/changes2document.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.projectInfo/status.xml

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.projectInfo/input=
.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest=
.plugin.projectInfo/input.xmap?view=3Ddiff&r1=3D160774&r2=3D160775
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- forrest/trunk/plugins/org.apache.forrest.plugin.projectInfo/input.xmap =
(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.projectInfo/input.xmap =
Sun Apr 10 07:06:29 2005
@@ -33,7 +33,8 @@
         <map:generate type=3D"file" src=3D"{project:status}" />
         <map:transform src=3D"resources/stylesheets/changes2document.xsl" >
           <map:parameter name=3D"bugtracking-url" value=3D"{defaults:bugtr=
acking-url}"/>
-        </map:transform >
+          <map:parameter name=3D"path" value=3D"{1}{2}"/>
+        </map:transform>
         <map:serialize type=3D"xml-document"/>
       </map:match>
=20

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.projectInfo/resou=
rces/stylesheets/changes2document.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest=
.plugin.projectInfo/resources/stylesheets/changes2document.xsl?view=3Ddiff&=
r1=3D160774&r2=3D160775
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- forrest/trunk/plugins/org.apache.forrest.plugin.projectInfo/resources/s=
tylesheets/changes2document.xsl (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.projectInfo/resources/s=
tylesheets/changes2document.xsl Sun Apr 10 07:06:29 2005
@@ -20,6 +20,16 @@
     xmlns:xsl=3D"http://www.w3.org/1999/XSL/Transform"
     version=3D"1.0">=20
=20
+  <xsl:param name=3D"path"/>
+  <xsl:include href=3D"dotdots.xsl"/> <!-- FIXME: howto include from forre=
st core -->
+
+  <!-- Calculate path to site root, eg '../../' -->
+  <xsl:variable name=3D"root">
+    <xsl:call-template name=3D"dotdots">
+      <xsl:with-param name=3D"path" select=3D"$path"/>
+    </xsl:call-template>
+  </xsl:variable>
+
  <!-- FIXME (JJP):  bugzilla is hardwired -->
  <xsl:variable name=3D"bugzilla" select=3D"'http://issues.apache.org/bugzi=
lla/buglist.cgi?bug_id=3D'"/>
=20
@@ -44,7 +54,7 @@
    </title>
    </header>
    <body>
-    <p><link href=3D"changes.rss"><img src=3D"images/rss.png" alt=3D"RSS"/=
></link></p>   =20
+    <p><link href=3D"changes.rss"><img src=3D"{$root}images/rss.png" alt=
=3D"RSS"/></link></p>   =20
     <xsl:apply-templates/>
    </body>
   </document>
@@ -67,7 +77,7 @@
=20
  <xsl:template match=3D"action">
   <li>
-   <icon src=3D"images/{@type}.jpg" alt=3D"{@type}"/>
+   <icon src=3D"{$root}images/{@type}.jpg" alt=3D"{@type}"/>
    <xsl:apply-templates/>
    <xsl:text>(</xsl:text><xsl:value-of select=3D"@dev"/><xsl:text>)</xsl:t=
ext>
=20

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.projectInfo/statu=
s=2Exml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest=
.plugin.projectInfo/status.xml?view=3Ddiff&r1=3D160774&r2=3D160775
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- forrest/trunk/plugins/org.apache.forrest.plugin.projectInfo/status.xml =
(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.projectInfo/status.xml =
Sun Apr 10 07:06:29 2005
@@ -25,6 +25,13 @@
   <changes>
     <!-- Add new releases here -->
     <release version=3D"0.1" date=3D"unreleased">
+      <action context=3D"xsl" type=3D"fix" dev=3D"DC">
+        Use relative location of images directory.
+      </action>
+      <action dev=3D"DC" type=3D"add" context=3D"xmap">
+       Added better sitemap match using regexp to deal
+       with sub-directories too.
+      </action>
       <action context=3D"code" type=3D"fix" dev=3D"DC">
         Replace use of document() function in changes2rss.xml with
         sitemap aggregation.