You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by ch...@apache.org on 2003/09/10 11:37:10 UTC
cvs commit: xml-forrest/src/resources/stylesheets changes2document.xsl
cheche 2003/09/10 02:37:10
Modified: . forrest.properties status.xml
src/resources/conf cocoon.xconf
src/resources/forrest-shbat forrest.build.xml
src/resources/fresh-site forrest.properties
src/resources/stylesheets changes2document.xsl
Log:
New attribute to allow a bug tracking system other than bugzilla.
Revision Changes Path
1.6 +1 -0 xml-forrest/forrest.properties
Index: forrest.properties
===================================================================
RCS file: /home/cvs/xml-forrest/forrest.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- forrest.properties 1 Sep 2003 06:13:05 -0000 1.5
+++ forrest.properties 10 Sep 2003 09:37:09 -0000 1.6
@@ -9,3 +9,4 @@
#project.skin=avalon-tigris
forrest.validate.xdocs.excludes=site.xml,*.dtdx.xml
+project.bugtracking-url=http://issues.cocoondev.org/jira/secure/ViewIssue.jspa?key=
1.207 +5 -2 xml-forrest/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/xml-forrest/status.xml,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- status.xml 9 Sep 2003 20:45:52 -0000 1.206
+++ status.xml 10 Sep 2003 09:37:09 -0000 1.207
@@ -25,9 +25,12 @@
<changes>
<release version="0.5-dev" date="unreleased">
+ <action dev="JJP" type="fix" context="skins">
+ New attribute to allow a bug tracking system other than bugzilla.
+ </action>
<action dev="JJP" type="fix" context="shbat"
due-to="Eirik Bjørsnøs" due-to-email="bjorsnos@stud.ntnu.no" >
- Added a "clean" itask that removes the build directory.
+ Added a "clean" task that removes the build directory.
</action>
<action dev="JT" type="update" context="skins">
In the forrest-site skin and derivatives, display the author and version at the
1.22 +1 -0 xml-forrest/src/resources/conf/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/conf/cocoon.xconf,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- cocoon.xconf 5 Jul 2003 06:49:11 -0000 1.21
+++ cocoon.xconf 10 Sep 2003 09:37:09 -0000 1.22
@@ -162,6 +162,7 @@
<values>
<skin>@skin@</skin>
<menu-scheme>@menu-scheme@</menu-scheme>
+ <bugtracking-url>@bugtracking-url@</bugtracking-url>
</values>
</component-instance>
1.95 +3 -1 xml-forrest/src/resources/forrest-shbat/forrest.build.xml
Index: forrest.build.xml
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/forrest-shbat/forrest.build.xml,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- forrest.build.xml 8 Sep 2003 22:21:07 -0000 1.94
+++ forrest.build.xml 10 Sep 2003 09:37:10 -0000 1.95
@@ -78,6 +78,7 @@
<property name="project.skin" value="forrest-site" />
<property name="project.menu-scheme" value="tab_attributes" />
<property name="project.status" location="${project.home}/status.xml" />
+ <property name="project.bugtracking-url" value="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=" />
<!-- Files we don't want copied from build/* to src/* by the backcopy
command. Relative to build/webapp -->
@@ -324,6 +325,7 @@
<echo>____________________________________</echo>
<filter token="skin" value="${project.skin}" />
<filter token="menu-scheme" value="${project.menu-scheme}" />
+ <filter token="bugtracking-url" value="${project.bugtracking-url}" />
<filter token="local-catalog" value="${project.catalog}" />
<filter token="catalog-verbosity" value="${forrest.catalog.verbosity}" />
1.32 +1 -0 xml-forrest/src/resources/fresh-site/forrest.properties
Index: forrest.properties
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/fresh-site/forrest.properties,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- forrest.properties 9 Sep 2003 20:41:40 -0000 1.31
+++ forrest.properties 10 Sep 2003 09:37:10 -0000 1.32
@@ -115,3 +115,4 @@
# Any other arguments to pass to the JVM. For example, to run on an X-less
# server, set to -Djava.awt.headless=true
#forrest.jvmargs=
+#project.bugtracking-url=http://nagoya.apache.org/bugzilla/show_bug.cgi?id=
1.17 +2 -2 xml-forrest/src/resources/stylesheets/changes2document.xsl
Index: changes2document.xsl
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/stylesheets/changes2document.xsl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- changes2document.xsl 7 Aug 2003 16:23:19 -0000 1.16
+++ changes2document.xsl 10 Sep 2003 09:37:10 -0000 1.17
@@ -6,8 +6,8 @@
<xsl:import href="copyover.xsl"/>
+ <xsl:variable name="bugtracking-url" select="document('../../WEB-INF/cocoon.xconf')/cocoon/input-modules/component-instance/values/bugtracking-url"/>
<xsl:variable name="bugzilla" select="'http://nagoya.apache.org/bugzilla/'"/>
- <xsl:variable name="singleBug" select="concat($bugzilla, 'show_bug.cgi?id=')"/>
<xsl:variable name="buglist" select="concat($bugzilla, 'buglist.cgi?bug_id=')"/>
<xsl:template match="/">
@@ -65,7 +65,7 @@
</link>
</xsl:when>
<xsl:otherwise>
- <link href="{$singleBug}{@fixes-bug}">
+ <link href="{$bugtracking-url}{@fixes-bug}">
<xsl:text>bug </xsl:text><xsl:value-of select="@fixes-bug"/>
</link>
</xsl:otherwise>
Re: cvs commit: xml-forrest/src/resources/stylesheets changes2document.xsl
Posted by Juan Jose Pablos <ch...@che-che.com>.
Jeff,
Dammit!!!!
It was too late last night, and I forgot to get that tydier this morning!
>
> How about instead, passing the bugtracking-url into the XSLT as a
> parameter, and accessing the cocoon.xconf value through the predefined
> 'defaults' input module:
>
> <map:transform ...>
> <map:parameter name="bugtracking-url" value="{defaults:bugtracking-url}"/>
>
That was my initial plan, but I could not get it working. I will have a
look today.
> In truth, this business of replacing @tokens@ in cocoon.xconf is just a
> hack, and forrest.properties needs replacing with something more
> permanent and accessible. There's some RTs in the archives about this,
> which we should dust off in 0.6.
That was the reason I sent an e-mail about this. I did not like it
either, but I was no a rust because you were planing to release today.
Cheers,
Cheche
Re: cvs commit: xml-forrest/src/resources/stylesheets changes2document.xsl
Posted by Jeff Turner <je...@apache.org>.
On Wed, Sep 10, 2003 at 09:37:10AM -0000, cheche@apache.org wrote:
> cheche 2003/09/10 02:37:10
>
> Modified: . forrest.properties status.xml
> src/resources/conf cocoon.xconf
> src/resources/forrest-shbat forrest.build.xml
> src/resources/fresh-site forrest.properties
> src/resources/stylesheets changes2document.xsl
> Log:
> New attribute to allow a bug tracking system other than bugzilla.
...
...
> Index: changes2document.xsl
> ===================================================================
> RCS file: /home/cvs/xml-forrest/src/resources/stylesheets/changes2document.xsl,v
> retrieving revision 1.16
> retrieving revision 1.17
> diff -u -r1.16 -r1.17
> --- changes2document.xsl 7 Aug 2003 16:23:19 -0000 1.16
> +++ changes2document.xsl 10 Sep 2003 09:37:10 -0000 1.17
> @@ -6,8 +6,8 @@
>
> <xsl:import href="copyover.xsl"/>
>
> + <xsl:variable name="bugtracking-url" select="document('../../WEB-INF/cocoon.xconf')/cocoon/input-modules/component-instance/values/bugtracking-url"/>
!?
Full marks for innovation :) And apologies for not replying to your
earlier mail.
How about instead, passing the bugtracking-url into the XSLT as a
parameter, and accessing the cocoon.xconf value through the predefined
'defaults' input module:
<map:transform ...>
<map:parameter name="bugtracking-url" value="{defaults:bugtracking-url}"/>
In truth, this business of replacing @tokens@ in cocoon.xconf is just a
hack, and forrest.properties needs replacing with something more
permanent and accessible. There's some RTs in the archives about this,
which we should dust off in 0.6.
Thanks for tackling this bug though.
--Jeff