jruaux      2003/04/03 01:15:10

  Modified:    .        build.properties.sample
               integration/ant build.properties.sample build.xml
               integration/ant/src/scripts/share build-share.xml
  Log:
  Added Jtidy jar to the Ant integration build
  
  Revision  Changes    Path
  1.53      +4 -1      jakarta-cactus/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/build.properties.sample,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- build.properties.sample   29 Mar 2003 12:11:21 -0000      1.52
  +++ build.properties.sample   3 Apr 2003 09:15:09 -0000       1.53
  @@ -67,6 +67,9 @@
   # XML Parsers API (required by HttpUnit)
   xmlapis.jar = ${lib.repo}/xerces/jars/xmlParserAPIs-2.2.1.jar
   
  +# JTidy (required by HttpUnit)
  +tidy.jar = ${lib.repo}/httpunit/jars/Tidy-04aug2000r7.jar
  +
   # -----------------------------------------------------------------------------
   # Mandatory properties for the Eclipse plugin only
   # -----------------------------------------------------------------------------
  
  
  
  1.5       +3 -0      jakarta-cactus/integration/ant/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/integration/ant/build.properties.sample,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.properties.sample   25 Mar 2003 19:31:57 -0000      1.4
  +++ build.properties.sample   3 Apr 2003 09:15:10 -0000       1.5
  @@ -59,6 +59,9 @@
   # XML Parsers API (required by HttpUnit)
   xmlapis.jar = ${lib.repo}/xerces/jars/xmlParserAPIs-2.2.1.jar
   
  +# JTidy (required by HttpUnit)
  +tidy.jar = ${lib.repo}/httpunit/jars/Tidy-04aug2000r7.jar
  +
   # -----------------------------------------------------------------------------
   # Optional properties
   # -----------------------------------------------------------------------------
  
  
  
  1.12      +4 -0      jakarta-cactus/integration/ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/integration/ant/build.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- build.xml 25 Mar 2003 19:31:57 -0000      1.11
  +++ build.xml 3 Apr 2003 09:15:10 -0000       1.12
  @@ -98,6 +98,7 @@
               <property name="nekohtml.jar" isfile="true"/>
               <property name="xerces.jar" isfile="true"/>
               <property name="xmlapis.jar" isfile="true"/>
  +            <property name="tidy.jar" isfile="true"/>
           </checkProperty>
   
       </target>
  @@ -280,6 +281,7 @@
           <copy todir="${target.integration.lib.client.dir}" file="${nekohtml.jar}"/>
           <copy todir="${target.integration.lib.client.dir}" file="${xerces.jar}"/>
           <copy todir="${target.integration.lib.client.dir}" file="${xmlapis.jar}"/>
  +        <copy todir="${target.integration.lib.client.dir}" file="${tidy.jar}"/>     
   
   
           <!-- Note: ATM we copy the servlet jar (and not the J2EE one). The 
                reasons are that ATM we only need the servlet API and that the
  @@ -322,6 +324,8 @@
           <filter token="xerces.jar.name" value="${xerces.jar.name}"/>
                <basename property="xmlapis.jar.name" file="${xmlapis.jar}"/>
           <filter token="xmlapis.jar.name" value="${xmlapis.jar.name}"/>
  +             <basename property="tidy.jar.name" file="${tidy.jar}"/>
  +        <filter token="tidy.jar.name" value="${tidy.jar.name}"/>
   
                <copy todir="${target.integration.script.dir}" filtering="on">
                        <fileset dir="${src.script.dir}/share"/>
  
  
  
  1.16      +4 -1      jakarta-cactus/integration/ant/src/scripts/share/build-share.xml
  
  Index: build-share.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/integration/ant/src/scripts/share/build-share.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- build-share.xml   1 Apr 2003 08:49:50 -0000       1.15
  +++ build-share.xml   3 Apr 2003 09:15:10 -0000       1.16
  @@ -76,7 +76,8 @@
           value="${cactus.lib.client.dir}[EMAIL PROTECTED]@"/>
       <property name="cactus.xmlapis.jar" 
           value="${cactus.lib.client.dir}[EMAIL PROTECTED]@"/>
  -
  +    <property name="cactus.tidy.jar" 
  +        value="${cactus.lib.client.dir}[EMAIL PROTECTED]@"/>
       <!--
          ========================================================================
            Initialize the build. Must be called by all targets
  @@ -275,6 +276,7 @@
                   <pathelement location="${cactus.nekohtml.jar}"/>
                   <pathelement location="${cactus.xerces.jar}"/>
                   <pathelement location="${cactus.xmlapis.jar}"/>
  +                <pathelement location="${cactus.tidy.jar}"/>                
                   <path refid="cactus.classpath"/>
               </classpath>
   
  @@ -327,6 +329,7 @@
                   <pathelement location="${cactus.nekohtml.jar}"/>
                   <pathelement location="${cactus.xerces.jar}"/>
                   <pathelement location="${cactus.xmlapis.jar}"/>
  +                <pathelement location="${cactus.tidy.jar}"/>                
                   <path refid="cactus.classpath"/>
               </classpath>
   
  
  
  

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

Reply via email to