Author: niallp
Date: Thu Jun 15 08:56:14 2006
New Revision: 414626

URL: http://svn.apache.org/viewvc?rev=414626&view=rev
Log:
Change the "whitespace removal" task to also run for Sun's JDK 1.5 - see thread 
http://tinyurl.com/pzlfz

Modified:
    jakarta/site/build.xml

Modified: jakarta/site/build.xml
URL: 
http://svn.apache.org/viewvc/jakarta/site/build.xml?rev=414626&r1=414625&r2=414626&view=diff
==============================================================================
--- jakarta/site/build.xml (original)
+++ jakarta/site/build.xml Thu Jun 15 08:56:14 2006
@@ -18,19 +18,6 @@
        <!-- Directory to which RSS file is generated. -->
     <property name="rss.output.dir" location="${docs.dest}/site"/>
 
-    <!-- 
-     The property jdk14 means that whitespace removal will be performed.
-     (perhaps ought to be renamed)
-     -->
-    <condition property="jdk14" value="1.4">
-       <not>
-           <and>
-                 <equals arg1="1.5" arg2="${java.specification.version}"/>
-                 <equals arg1="Sun Microsystems Inc." arg2="${java.vendor}"/>
-           </and>
-       </not>
-    </condition>
-
   <target name="clean" description="Delete intermediate files.">
     <delete dir="${target.dir}" quiet="yes"/>
   </target>       
@@ -173,12 +160,12 @@
     </copy>
 -->
        
-       <antcall target="jdk14-remove-ws"></antcall>
+       <antcall target="remove-ws"></antcall>
        
   </target>
 
-  <!-- Process JDK1.4 output to remove the trailing blank spaces -->
-  <target name="jdk14-remove-ws" if="jdk14">
+  <!-- Process output to remove the trailing blank spaces -->
+  <target name="remove-ws">
        <echo>*** Removing extra white-space</echo>
        <replace dir="${docs.dest}" token=" />" value="/>">
                <include name="**/*.html"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to