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/03/02 05:48:25 UTC
svn commit: r155873 - in jakarta/site: build.xml
xdocs/downloads/download-pages.xsl xdocs/downloads/downloads-cgi.xsl
Author: bayard
Date: Tue Mar 1 20:48:23 2005
New Revision: 155873
URL: http://svn.apache.org/viewcvs?view=rev&rev=155873
Log:
fixed bug in cgi location output, added comments noting where hardcoding is happening and added jdk 1.5 version of the xml version hack for cgi files (same as 1.4, but no extra newline)
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=155872&r2=155873
==============================================================================
--- jakarta/site/build.xml (original)
+++ jakarta/site/build.xml Tue Mar 1 20:48:23 2005
@@ -6,10 +6,11 @@
<property name="docs.dest" location="docs"/>
<property name="target.dir" location="target"/>
<property name="docs.downloads.src" location="${docs.src}/downloads"/>
+
+ <!-- This docs.downloads.dest value is hard-coded into xdocs/downloads/downloads-cgi.xsl -->
<property name="docs.downloads.dest" location="${docs.dest}/site/downloads"/>
- <!-- This docs.downloads.tmp value is hard-coded into xdocs/downloads/download-pages.xsl
- and xdocs/downloads/downloads-cgi.xsl -->
+ <!-- This docs.downloads.tmp value is hard-coded twice into xdocs/downloads/download-pages.xsl -->
<property name="docs.downloads.tmp" location="${target.dir}/download-xdocs"/>
<condition property="jdk14" value="1.4">
@@ -133,10 +134,17 @@
<!-- remove xml header from .cgi files -->
<!-- Couldn't we change the XSL to output text instead? -->
+ <!-- JDK 1.4 replace -->
<replace dir="${docs.downloads.dest}/" value="">
<include name="*.cgi"/>
<replaceToken><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+]]></replaceToken>
+ </replace>
+ <!-- JDK 1.5 replace -->
+ <replace dir="${docs.downloads.dest}/" value="">
+ <include name="*.cgi"/>
+ <replaceToken><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
]]></replaceToken>
</replace>
Modified: jakarta/site/xdocs/downloads/download-pages.xsl
URL: http://svn.apache.org/viewcvs/jakarta/site/xdocs/downloads/download-pages.xsl?view=diff&r1=155872&r2=155873
==============================================================================
--- jakarta/site/xdocs/downloads/download-pages.xsl (original)
+++ jakarta/site/xdocs/downloads/download-pages.xsl Tue Mar 1 20:48:23 2005
@@ -6,6 +6,7 @@
<xsl:template match="project">
<xsl:variable name="id"><xsl:value-of select="@id"/></xsl:variable>
+ <!-- NOTE: This is a nasty hardcoded path -->
<redirect:write file="target/download-xdocs/downloads_{$id}.xml">
<document>
<properties>
@@ -101,6 +102,7 @@
</li>
</xsl:if>
+ <!-- NOTE: This is a nasty hardcoded path -->
<redirect:write file="target/download-xdocs/downloads_{$id}.xml">
<xsl:apply-templates select="."/>
</redirect:write>
Modified: jakarta/site/xdocs/downloads/downloads-cgi.xsl
URL: http://svn.apache.org/viewcvs/jakarta/site/xdocs/downloads/downloads-cgi.xsl?view=diff&r1=155872&r2=155873
==============================================================================
--- jakarta/site/xdocs/downloads/downloads-cgi.xsl (original)
+++ jakarta/site/xdocs/downloads/downloads-cgi.xsl Tue Mar 1 20:48:23 2005
@@ -9,7 +9,8 @@
<xsl:if test="downloads">
<xsl:if test="downloads/@mirrored != 'false'">
- <redirect:write file="target/download-xdocs/downloads_{$id}.cgi">
+ <!-- NOTE: This is a nasty hardcoded path -->
+ <redirect:write file="docs/site/downloads/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