vmassol 2003/10/20 14:14:31
Modified: framework build.xml
integration/ant 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.75 +14 -6 jakarta-cactus/framework/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/build.xml,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- build.xml 20 Oct 2003 20:55:40 -0000 1.74
+++ build.xml 20 Oct 2003 21:14:31 -0000 1.75
@@ -103,6 +103,7 @@
<echo/>
<echo>Options:</echo>
<echo> clover.enable = ${clover.enable}</echo>
+ <echo> clover.jar = [${clover.jar}]</echo>
<path id="project.classpath">
<pathelement location="${aspectjrt.jar}"/>
@@ -128,10 +129,21 @@
xmlapis.jar property -->
<available classname="javax.xml.transform.Transformer"
classpathref="project.classpath"/>
+ <!-- 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>
@@ -384,10 +396,6 @@
<pathelement location="${clover.jar}"/>
<pathelement location="${log4j.jar}"/>
<path refid="project.classpath"/>
- <!-- Also add the Ant classpath so that if some jars (such as clover)
- are located in Ant's lib/ directory, it will still work. Note that
- this is because the clover.jar property is optional -->
- <pathelement path="${java.class.path}"/>
</path>
</target>
1.46 +14 -6 jakarta-cactus/integration/ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/build.xml,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- build.xml 20 Oct 2003 20:55:40 -0000 1.45
+++ build.xml 20 Oct 2003 21:14:31 -0000 1.46
@@ -82,6 +82,7 @@
<echo/>
<echo>Options:</echo>
<echo> clover.enable = ${clover.enable}</echo>
+ <echo> clover.jar = [${clover.jar}]</echo>
<path id="project.classpath">
<pathelement location="${commons.logging.jar}"/>
@@ -103,10 +104,21 @@
needing to define the xerces.jar property -->
<available classname="org.apache.xml.serialize.XMLSerializer"
classpathref="project.classpath"/>
+ <!-- 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>
@@ -265,10 +277,6 @@
<pathelement location="${junit.jar}"/>
<pathelement path="${target.classes.clover.dir}"/>
<pathelement path="${target.classes.test.dir}"/>
- <!-- Also add the Ant classpath so that if some jars (such as clover)
- are located in Ant's lib/ directory, it will still work. Note that
- this is because the clover.jar property is optional -->
- <pathelement path="${java.class.path}"/>
</path>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
