vmassol 2002/12/15 10:26:34
Modified: documentation/docs/xdocs book.xml changes.xml
documentation build.xml
documentation/docs/skins/jakarta.apache.org/stylesheets
book2project.xsl document2html.xsl
. build-admin.xml
Log:
The Cactus web site now displays documentation for 2 versions: the CVS head one and
the last released one.
Note: CVS HEAD version must be named with the "dev" suffix for the scripts to work.
Revision Changes Path
1.21 +2 -1 jakarta-cactus/documentation/docs/xdocs/book.xml
Index: book.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/book.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- book.xml 15 Dec 2002 11:53:36 -0000 1.20
+++ book.xml 15 Dec 2002 18:26:34 -0000 1.21
@@ -4,7 +4,8 @@
title="Cactus Documentation"
copyright="@year@ The Apache Software Foundation"
updated="@today@"
- docfor="@version@">
+ currentversion="@version@"
+ otherversion="@otherversion@">
<menu label="About">
<menu-item label="What is Cactus ?" source="index.xml"/>
1.63 +4 -0 jakarta-cactus/documentation/docs/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/changes.xml,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- changes.xml 15 Dec 2002 13:50:09 -0000 1.62
+++ changes.xml 15 Dec 2002 18:26:34 -0000 1.63
@@ -49,6 +49,10 @@
</devs>
<release version="1.5" date="- in CVS">
+ <action dev="VMA" type="add">
+ The Cactus web site now provides online documentation for both the
+ CVS HEAD version and the last released version.
+ </action>
<action dev="CML" type="fix">
Enable the <code>ServletTestRunner</code> to run in an environment where
it is not allowed to set system properties. In such cases, the
1.17 +5 -0 jakarta-cactus/documentation/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/documentation/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 15 Dec 2002 13:18:39 -0000 1.16
+++ build.xml 15 Dec 2002 18:26:34 -0000 1.17
@@ -37,6 +37,10 @@
<!-- Global project properties -->
<property name="project.name.text" value="Cactus Documentation"/>
<property name="project.version" value="1.5dev"/>
+
+ <!-- The Cactus web site keeps online the documentation for the previous
+ version. This property is the name of the other version kept -->
+ <property name="project.other.version" value="1.4.1"/>
<!-- Prefix to add to all distributable files -->
<property name="project.prefix" value="jakarta-"/>
@@ -140,6 +144,7 @@
<!-- Filters -->
<filter token="version" value="${project.version}"/>
+ <filter token="otherversion" value="${project.other.version}"/>
<filter token="year" value="${year}"/>
<filter token="today" value="${TODAY}"/>
1.3 +2 -1
jakarta-cactus/documentation/docs/skins/jakarta.apache.org/stylesheets/book2project.xsl
Index: book2project.xsl
===================================================================
RCS file:
/home/cvs/jakarta-cactus/documentation/docs/skins/jakarta.apache.org/stylesheets/book2project.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- book2project.xsl 14 Apr 2002 07:50:46 -0000 1.2
+++ book2project.xsl 15 Dec 2002 18:26:34 -0000 1.3
@@ -9,7 +9,8 @@
<parameter name="copyright" value="{@copyright}"/>
<parameter name="updated" value="{@updated}"/>
- <parameter name="docfor" value="{@docfor}"/>
+ <parameter name="currentversion" value="{@currentversion}"/>
+ <parameter name="otherversion" value="{@otherversion}"/>
<parameter name="software" value="{@software}"/>
<resource source="sbk:/style/resources/logocactus.gif"
target="images/logocactus.gif"/>
1.4 +17 -2
jakarta-cactus/documentation/docs/skins/jakarta.apache.org/stylesheets/document2html.xsl
Index: document2html.xsl
===================================================================
RCS file:
/home/cvs/jakarta-cactus/documentation/docs/skins/jakarta.apache.org/stylesheets/document2html.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- document2html.xsl 14 Oct 2002 10:06:58 -0000 1.3
+++ document2html.xsl 15 Dec 2002 18:26:34 -0000 1.4
@@ -5,7 +5,8 @@
<xsl:param name="stylebook.project"/>
<xsl:param name="copyright"/>
<xsl:param name="updated"/>
- <xsl:param name="docfor"/>
+ <xsl:param name="currentversion"/>
+ <xsl:param name="otherversion"/>
<xsl:param name="docid"/>
<xsl:param name="target"/>
@@ -89,7 +90,21 @@
</font>
<br/>
<font size="-2">
- Doc for : v<xsl:value-of select="$docfor"/>
+ Doc for : <b>v<xsl:value-of select="$currentversion"/></b>
+ |
+ <a>
+ <xsl:attribute name="href">
+ <xsl:choose>
+ <xsl:when test="contains($currentversion,'dev')">
+ ..
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$otherversion"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ v<xsl:value-of select="$otherversion"/>
+ </a>
</font>
<br/>
1.5 +33 -2 jakarta-cactus/build-admin.xml
Index: build-admin.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/build-admin.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-admin.xml 28 Jul 2002 23:09:33 -0000 1.4
+++ build-admin.xml 15 Dec 2002 18:26:34 -0000 1.5
@@ -26,6 +26,14 @@
<!-- Global project properties -->
<property name="project.name.text" value="Cactus Administration"/>
+ <!-- The version is used to know where to unpack the website. If the
+ version contains "dev" in its name, it will be unpacked in
+ "/www/jakarta.apache.org/cactus/<version name>". If it does not
+ contain "dev", it means we are deploying the documentation for
+ the latest stable release and it will be unpacked in
+ "/www/jakarta.apache.org/cactus". -->
+ <property name="project.version" value="1.5dev"/>
+
<!-- Prefix to add to all distributable files -->
<property name="project.prefix" value="jakarta-"/>
@@ -188,21 +196,44 @@
and 'ssh' commands.
========================================================================
-->
- <target name="deploy" depends="release"
- description="Deploy the Cactus web site">
+ <target name="deploy.init">
<property name="cactus.homepage"
value="/www/jakarta.apache.org/cactus"/>
+ <condition property="is.dev.version">
+ <contains string="${project.version}" substring="dev"/>
+ </condition>
+
<exec dir="." executable="${admin.scp}">
<arg value="${release.dir}/${cactus.website.name}.tar.gz"/>
<arg
value="${admin.jakarta.username}@jakarta.apache.org:${cactus.homepage}"/>
</exec>
+ </target>
+
+ <target name="deploy.release" unless="is.dev.version">
+
+ <echo>Deploying release version to ${cactus.homepage} ...</echo>
+
<exec dir="." executable="${admin.ssh}">
<arg line="-l ${admin.jakarta.username} jakarta.apache.org 'cd
${cactus.homepage};gunzip ${cactus.website.name}.tar.gz;tar xvf
${cactus.website.name}.tar;rm ${cactus.website.name}.tar'"/>
</exec>
+ </target>
+
+ <target name="deploy.dev" if="is.dev.version">
+
+ <echo>Deploying dev version to ${cactus.homepage}/${project.version}
...</echo>
+
+ <exec dir="." executable="${admin.ssh}">
+ <arg line="-l ${admin.jakarta.username} jakarta.apache.org 'cd
${cactus.homepage};mkdir ${project.version};gunzip ${cactus.website.name}.tar.gz;tar
xvf ${cactus.website.name}.tar -C${project.version};rm ${cactus.website.name}.tar'"/>
+ </exec>
+
+ </target>
+
+ <target name="deploy" depends="release,deploy.init,deploy.release,deploy.dev"
+ description="Deploy the Cactus web site">
</target>
<!--
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
