forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject cvs commit: xml-forrest/src/scratchpad/targets transform-v11.xml validate-v10.xml validate-v11.xml
Date Sat, 22 Jun 2002 02:34:48 GMT
crossley    2002/06/21 19:34:48

  Modified:    src/scratchpad/targets transform-v11.xml validate-v10.xml
                        validate-v11.xml
  Log:
  Added scratchpad target to generate a temporary Ant xmlcatalog by transforming
  the src/resources/schema/catalog.xcat and also appending entries for v10 DTDs.
  This is then used by the scratchpad transform-v11 and validate-v11 targets.
  Note that this is a workaround until Ant uses standard XML Catalogs.
  
  Revision  Changes    Path
  1.2       +3 -12     xml-forrest/src/scratchpad/targets/transform-v11.xml
  
  Index: transform-v11.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/scratchpad/targets/transform-v11.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- transform-v11.xml	20 Jun 2002 06:37:27 -0000	1.1
  +++ transform-v11.xml	22 Jun 2002 02:34:48 -0000	1.2
  @@ -1,26 +1,17 @@
   <!-- try.xml ... these are trial build targets which are currently
     undergoing testing. When ready they can be moved into the main build.xml -->
   
  -<!-- FIXME: See note below about Ant xmlcatalog -->
   <!DOCTYPE project [
  -<!ENTITY xmlcatalog-include SYSTEM "../../../src/resources/schema/catalog-ant.xcat">
  +<!ENTITY xmlcatalog-include SYSTEM "../../../build/xml-forrest/src/resources/schema/catalog-ant.xcat">
   ]>
   
   <project default="transform2v11" basedir="."
            name="Doc Transition Trial: transform from v1.0 to v1.1">
   
  -<!-- =================================================================== -->
  -<!-- Initialization target                                               -->
  -<!-- =================================================================== -->
   <target name="transform2v11">
   
  -<!-- FIXME: Not sure how to consistently include the Ant xmlcatalog yet.
  -  This method is working. However, we need to include it everywhere that
  -  we want to use it. There might be a way to include it in higher build.xml
  --->
  -<echo message="Including the xmlcatalog ..."/>
  -&xmlcatalog-include;
  -<echo message="... done."/>
  +  <echo message="Including the temporary Ant xmlcatalog."/>
  +  &xmlcatalog-include;
   
     <property name="v10.dir" value="src/testcases/c2/v10"/>
     <property name="v11.dir" value="src/testcases/c2/v11"/>
  
  
  
  1.2       +4 -13     xml-forrest/src/scratchpad/targets/validate-v10.xml
  
  Index: validate-v10.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/scratchpad/targets/validate-v10.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- validate-v10.xml	20 Jun 2002 06:37:27 -0000	1.1
  +++ validate-v10.xml	22 Jun 2002 02:34:48 -0000	1.2
  @@ -1,30 +1,21 @@
   <!-- try.xml ... these are trial build targets which are currently
     undergoing testing. When ready they can be moved into the main build.xml -->
   
  -<!-- FIXME: See note below about Ant xmlcatalog -->
   <!DOCTYPE project [
  -<!ENTITY xmlcatalog-include SYSTEM "../../../src/resources/schema/catalog-ant.xcat">
  +<!ENTITY xmlcatalog-include SYSTEM "../../../build/xml-forrest/src/resources/schema/catalog-ant.xcat">
   ]>
   
   <project default="validate-v10" basedir="."
            name="Doc Transition Trial: validate v1.0">
   
  -<!-- =================================================================== -->
  -<!-- Initialization target                                               -->
  -<!-- =================================================================== -->
   <target name="validate-v10">
   
  -<!-- FIXME: Not sure how to consistently include the Ant xmlcatalog yet.
  -  This method is working. However, we need to include it everywhere that
  -  we want to use it. There might be a way to include it in higher build.xml
  --->
  -<echo message="Including the xmlcatalog ..."/>
  -&xmlcatalog-include;
  -<echo message="... done."/>
  +  <echo message="Including the temporary Ant xmlcatalog."/>
  +  &xmlcatalog-include;
   
     <property name="v10.dir" value="src/testcases/c2/v10"/>
   
  -  <echo message="Validating v10 xdocs."/>
  +  <echo message="Validating v10 xdocs ..."/>
     <xmlvalidate failonerror="yes" 
       lenient="no" 
       warn="yes"
  
  
  
  1.2       +4 -13     xml-forrest/src/scratchpad/targets/validate-v11.xml
  
  Index: validate-v11.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/scratchpad/targets/validate-v11.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- validate-v11.xml	20 Jun 2002 06:37:27 -0000	1.1
  +++ validate-v11.xml	22 Jun 2002 02:34:48 -0000	1.2
  @@ -1,30 +1,21 @@
   <!-- try.xml ... these are trial build targets which are currently
     undergoing testing. When ready they can be moved into the main build.xml -->
   
  -<!-- FIXME: See note below about Ant xmlcatalog -->
   <!DOCTYPE project [
  -<!ENTITY xmlcatalog-include SYSTEM "../../../src/resources/schema/catalog-ant.xcat">
  +<!ENTITY xmlcatalog-include SYSTEM "../../../build/xml-forrest/src/resources/schema/catalog-ant.xcat">
   ]>
   
   <project default="validate-v11" basedir="."
            name="Doc Transition Trial: validate v1.1">
   
  -<!-- =================================================================== -->
  -<!-- Initialization target                                               -->
  -<!-- =================================================================== -->
   <target name="validate-v11">
   
  -<!-- FIXME: Not sure how to consistently include the Ant xmlcatalog yet.
  -  This method is working. However, we need to include it everywhere that
  -  we want to use it. There might be a way to include it in higher build.xml
  --->
  -<echo message="Including the xmlcatalog ..."/>
  -&xmlcatalog-include;
  -<echo message="... done."/>
  +  <echo message="Including the temporary Ant xmlcatalog."/>
  +  &xmlcatalog-include;
   
     <property name="v11.dir" value="src/testcases/c2/v11"/>
   
  -  <echo message="Validating v11 xdocs."/>
  +  <echo message="Validating v11 xdocs ..."/>
     <xmlvalidate failonerror="yes" 
       lenient="no" 
       warn="yes"
  
  
  

Mime
View raw message