jakarta-site-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r159862 - in jakarta/site: build.xml xdocs/downloads/downloads-cgi.xsl
Date Sun, 03 Apr 2005 01:57:54 GMT
Author: sebb
Date: Sat Apr  2 17:57:53 2005
New Revision: 159862

URL: http://svn.apache.org/viewcvs?view=rev&rev=159862
Log:
Create cgi files as text
So no need to strip out the xml headers

Modified:
    jakarta/site/build.xml
    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=159861&r2=159862
==============================================================================
--- jakarta/site/build.xml (original)
+++ jakarta/site/build.xml Sat Apr  2 17:57:53 2005
@@ -132,22 +132,6 @@
     <!-- JDK 1.4 hack -->
     <antcall target="jdk14-hack-cgi"/>
   
-    <!-- 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>
-
     <echo>*** Copying static resource files</echo>
     <copy    todir="${docs.dest}/images" filtering="no">
       <fileset dir="${docs.src}/images">

Modified: jakarta/site/xdocs/downloads/downloads-cgi.xsl
URL: http://svn.apache.org/viewcvs/jakarta/site/xdocs/downloads/downloads-cgi.xsl?view=diff&r1=159861&r2=159862
==============================================================================
--- jakarta/site/xdocs/downloads/downloads-cgi.xsl (original)
+++ jakarta/site/xdocs/downloads/downloads-cgi.xsl Sat Apr  2 17:57:53 2005
@@ -4,14 +4,19 @@
     xmlns:redirect="http://xml.apache.org/xalan/redirect"
         extension-element-prefixes="redirect">
 
+  <xsl:output method="text"/>
+
   <xsl:template match="project" name="project">
     <xsl:variable name="id"><xsl:value-of select="@id"/></xsl:variable>
 
     <xsl:if test="downloads">
       <xsl:if test="downloads/@mirrored != 'false'">
 	<!-- NOTE: This is a nasty hardcoded path -->
-        <redirect:write file="docs/site/downloads/downloads_{$id}.cgi">
-#!/bin/sh
+	<!--
+        N.B. the first line of the script must immediately follow the tag
+             or there will be a blank line at the start of the script.
+    -->
+        <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
 #  python includes correctly)



---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: site-cvs-help@jakarta.apache.org


Mime
View raw message