You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-cvs@jakarta.apache.org by ba...@apache.org on 2005/02/24 02:44:25 UTC
svn commit: r155121 - in jakarta/site: build.xml
xdocs/downloads/download-pages.xsl xdocs/downloads/downloads-cgi.xsl
Author: bayard
Date: Wed Feb 23 17:44:24 2005
New Revision: 155121
URL: http://svn.apache.org/viewcvs?view=rev&rev=155121
Log:
switching to a jdk 1.5 dependent system. if we are going to depend on one, might as well depend on the 10 second one and not on the 2 minute one. This involves hard-coding the location of the output of the redirect:write tag in the cgi and pages xsl files. Also updating the build.xml to mention this and to enforce 1.5 usage.
Modified:
jakarta/site/build.xml
jakarta/site/xdocs/downloads/download-pages.xsl
jakarta/site/xdocs/downloads/downloads-cgi.xsl
Modified: jakarta/site/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/site/build.xml?view=diff&r1=155120&r2=155121
==============================================================================
--- jakarta/site/build.xml (original)
+++ jakarta/site/build.xml Wed Feb 23 17:44:24 2005
@@ -6,12 +6,15 @@
<property name="docs.dest" location="docs"/>
<property name="target.dir" location="target"/>
<property name="docs.downloads.src" location="${docs.src}/downloads"/>
- <property name="docs.downloads.tmp" location="${target.dir}/download-xdocs"/>
<property name="docs.downloads.dest" location="${docs.dest}/site/downloads"/>
- <!-- Requires JDK 1.4 -->
+ <!-- This docs.downloads.tmp value is hard-coded into xdocs/downloads/download-pages.xsl
+ and xdocs/downloads/downloads-cgi.xsl -->
+ <property name="docs.downloads.tmp" location="${target.dir}/download-xdocs"/>
+
+ <!-- Requires JDK 1.5 -->
- <!-- Note: still working on JDK 1.5 compatibility ... differences in Xalan beteween 1.4 and 1.5
+ <!-- Note: still working on JDK 1.4 compatibility ... differences in Xalan beteween 1.4 and 1.5
are getting in the way! -->
<target name="clean" description="Delete intermediate files.">
@@ -21,11 +24,11 @@
<target name="docs"
description="Render HTML Pages via XSLT">
- <!-- quit out if not in 1.4 -->
- <condition property="target.vm" value="1.4">
- <equals arg1="1.4" arg2="${java.specification.version}"/>
+ <!-- quit out if not in 1.5 -->
+ <condition property="target.vm" value="1.5">
+ <equals arg1="1.5" arg2="${java.specification.version}"/>
</condition>
- <fail unless="target.vm" message="Must build with Java 1.4"/>
+ <fail unless="target.vm" message="Must build with Java 1.5"/>
<!-- Create destination directory if necessary -->
<mkdir dir="${docs.dest}"/>
Modified: jakarta/site/xdocs/downloads/download-pages.xsl
URL: http://svn.apache.org/viewcvs/jakarta/site/xdocs/downloads/download-pages.xsl?view=diff&r1=155120&r2=155121
==============================================================================
--- jakarta/site/xdocs/downloads/download-pages.xsl (original)
+++ jakarta/site/xdocs/downloads/download-pages.xsl Wed Feb 23 17:44:24 2005
@@ -6,7 +6,7 @@
<xsl:template match="project">
<xsl:variable name="id"><xsl:value-of select="@id"/></xsl:variable>
- <redirect:write file="downloads_{$id}.xml">
+ <redirect:write file="target/download-xdocs/downloads_{$id}.xml">
<document>
<properties>
<title><xsl:value-of select="@name"/> Downloads</title>
@@ -101,7 +101,7 @@
</li>
</xsl:if>
- <redirect:write file="downloads_{$id}.xml">
+ <redirect:write file="target/download-xdocs/downloads_{$id}.xml">
<xsl:apply-templates select="."/>
</redirect:write>
</xsl:template>
Modified: jakarta/site/xdocs/downloads/downloads-cgi.xsl
URL: http://svn.apache.org/viewcvs/jakarta/site/xdocs/downloads/downloads-cgi.xsl?view=diff&r1=155120&r2=155121
==============================================================================
--- jakarta/site/xdocs/downloads/downloads-cgi.xsl (original)
+++ jakarta/site/xdocs/downloads/downloads-cgi.xsl Wed Feb 23 17:44:24 2005
@@ -9,7 +9,7 @@
<xsl:if test="downloads">
<xsl:if test="downloads/@mirrored != 'false'">
- <redirect:write file="downloads_{$id}.cgi">
+ <redirect:write file="target/download-xdocs/downloads_{$id}.cgi">
#!/bin/sh
# Wrapper script around mirrors.cgi script
# (we must change to that directory in order for python to pick up the
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: site-cvs-help@jakarta.apache.org