vmassol     2003/10/20 14:16:13

  Modified:    samples/servlet build.xml
  Log:
  Changed strategy: made clover.jar mandatory if clover is enabled. It was too complex 
to support making it optional for the sample servlet build...
  
  Revision  Changes    Path
  1.38      +14 -2     jakarta-cactus/samples/servlet/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/samples/servlet/build.xml,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- build.xml 19 Oct 2003 18:15:31 -0000      1.37
  +++ build.xml 20 Oct 2003 21:16:13 -0000      1.38
  @@ -183,6 +183,7 @@
       <echo/>
       <echo>Options:</echo>
       <echo>  clover.enable = ${clover.enable}</echo>
  +    <echo>  clover.jar = [${clover.jar}]</echo>
       <echo>  cactus.port = ${cactus.port}</echo>
   
       <condition property="properties.ok">
  @@ -217,10 +218,21 @@
                needing to define the xerces.jar property -->
           <available classname="org.apache.xml.serialize.XMLSerializer"
               classpath="${xerces.jar}"/>
  +        <!-- Check that clover.jar points to a valid file if clover is 
  +             enabled -->
  +        <or>
  +          <and>        
  +            <isset property="clover.enable"/>
  +            <available file="${clover.jar}"/>
  +          </and>
  +          <not>
  +            <isset property="clover.enable"/>
  +          </not>
  +        </or>            
         </and>
       </condition>
   
  -    <fail unless="properties.ok">One or more required dependancies could not
  +    <fail unless="properties.ok">One or more required dependencies could not
   be resolved. Please check you build.properties file, and run Ant with the 
   -verbose option for more details</fail>
   
  
  
  

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

Reply via email to