[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/struts/devel struts-1.2.4.bz163689.patch,1.4,1.5



Author: gbenson

Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19725

Modified Files:
	struts-1.2.4.bz163689.patch 
Log Message:
Hmmm, the xmlvalidate task is broken too, in what looks to be the same way

struts-1.2.4.bz163689.patch:
 build-webapps.xml |   20 ++++++++++++++++++--
 build.xml         |    2 ++
 2 files changed, 20 insertions(+), 2 deletions(-)

Index: struts-1.2.4.bz163689.patch
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts-1.2.4.bz163689.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- struts-1.2.4.bz163689.patch	20 Jul 2005 12:50:41 -0000	1.4
+++ struts-1.2.4.bz163689.patch	20 Jul 2005 13:12:55 -0000	1.5
@@ -32,7 +32,28 @@
  
      <!-- Copy the tiles documentation files -->
      <copy      todir="${build.home}/tiles-documentation">
-@@ -207,6 +209,7 @@
+@@ -187,16 +189,19 @@
+     </copy>
+ 
+     <!-- Validate tiles docs -->
++<!--
+     <xmlvalidate warn="yes" failonerror="yes" lenient="no">
+        <fileset dir="${build.home}/tiles-documentation" includes="**/*.html"/>
+-
++-->
+       <!-- Reference local DTDS to avoid network lookup -->
++<!--
+       <dtd publicId="-//W3C//DTD XHTML 1.0 Strict//EN"
+        location="${doc.dir}/dtds/xhtml1-strict.dtd"/>
+       <dtd publicId="-//W3C//DTD XHTML 1.0 Transitional//EN"
+        location="${doc.dir}/dtds/xhtml1-transitional.dtd"/>
+ 
+    </xmlvalidate>
++-->
+     
+ </target>
+ 
+@@ -207,6 +212,7 @@
  <target name="compile.docs" 
          description="Perform XSLT transformations">
      <!-- Create the taglib documentation -->
@@ -40,7 +61,7 @@
      <style   basedir="${doc.dir}" destdir="${build.home}/documentation"
             extension=".html" style="${doc.dir}/stylesheets/struts.xsl"
              includes="*.xml"
-@@ -214,7 +217,9 @@
+@@ -214,7 +220,9 @@
              reloadstylesheet="true">
        <param name="relative-path" expression="."/>
      </style>            
@@ -50,7 +71,7 @@
      <style   basedir="${doc.dir}/faqs"
               destdir="${build.home}/documentation/faqs"
             extension=".html" style="${doc.dir}/stylesheets/struts.xsl"
-@@ -223,7 +228,9 @@
+@@ -223,7 +231,9 @@
              reloadstylesheet="true">
        <param name="project-path" expression="../faqs/project.xml"/>
      </style>            
@@ -60,7 +81,7 @@
      <style   basedir="${doc.dir}/proposals"
               destdir="${build.home}/documentation/proposals"
             extension=".html" style="${doc.dir}/stylesheets/struts.xsl"
-@@ -232,7 +239,9 @@
+@@ -232,7 +242,9 @@
              reloadstylesheet="true">
        <param name="project-path" expression="../proposals/project.xml"/>
      </style>            
@@ -70,7 +91,7 @@
      <style   basedir="${doc.dir}/userGuide"
               destdir="${build.home}/documentation/userGuide"
             extension=".html" style="${doc.dir}/stylesheets/struts.xsl"
-@@ -241,6 +250,7 @@
+@@ -241,6 +253,7 @@
              reloadstylesheet="true">
        <param name="project-path" expression="../userGuide/project.xml"/>
      </style>  
@@ -78,3 +99,28 @@
  
      <!-- Copy the basic documentation files -->
      <copy      todir="${build.home}/documentation">
+@@ -287,20 +300,23 @@
+         documentation against the DTDs
+ -->
+ <target name="validate.docs" description="Validate generated XHTML documents">
++<!--
+     <xmlvalidate warn="yes" failonerror="yes" lenient="no">
+        <fileset dir="${build.home}/documentation">
+         <include name="**/*.html"/>
+         <exclude name="download.html"/>
+         <exclude name="api/**"/>
+       </fileset>
+-       
++-->       
+       <!-- Reference local DTDS to avoid network lookup -->
++<!--
+       <dtd publicId="-//W3C//DTD XHTML 1.0 Strict//EN"
+        location="${doc.dir}/dtds/xhtml1-strict.dtd"/>
+       <dtd publicId="-//W3C//DTD XHTML 1.0 Transitional//EN"
+        location="${doc.dir}/dtds/xhtml1-transitional.dtd"/>
+ 
+    </xmlvalidate>
++-->
+ </target>
+ 
+ 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]