mcconnell 2003/10/19 21:06:11
Modified: . build.xml check-targets.ent
check-targets.properties include.properties
Log:
Fix jar checks.
Revision Changes Path
1.140 +3 -2 james-server/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/james-server/build.xml,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- build.xml 20 Oct 2003 02:58:09 -0000 1.139
+++ build.xml 20 Oct 2003 04:06:10 -0000 1.140
@@ -24,6 +24,7 @@
-->
<property file=".ant.properties"/>
<property file="${user.home}/.ant.properties"/>
+ <property file="check-targets.properties"/>
<property file="include.properties"/>
<property file="default.properties"/>
@@ -86,7 +87,7 @@
-->
&check-targets;
- <target name="check-dependencies"
depends="javamail-check,activation-check,junit-check"/>
+ <target name="check-dependencies" depends="javamail-check,activation-check"/>
<!--
===================================================================
1.2 +6 -1 james-server/check-targets.ent
Index: check-targets.ent
===================================================================
RCS file: /home/cvs/james-server/check-targets.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- check-targets.ent 9 Feb 2003 14:49:06 -0000 1.1
+++ check-targets.ent 20 Oct 2003 04:06:11 -0000 1.2
@@ -10,15 +10,19 @@
<!-- Set up properties -->
<property file="check-targets.properties"/>
<target name="setup-dependencies">
+
<available property="javax.activation.present"
classname="javax.activation.URLDataSource"
classpathref="project.class.path" />
<available property="javax.mail.present"
classname="javax.mail.Message"
classpathref="project.class.path" />
+ <!--
<available property="junit.present"
classname="junit.framework.Test"
classpathref="project.class.path" />
+ <echo message="JUNIT: ${junit.jar}"/>
+ -->
</target>
<!-- called if a dependency is missing which has a BSD or ASL or
@@ -124,6 +128,7 @@
</target>
<!-- JUnit -->
+ <!--
<target name="junit-check" unless="junit.present" depends="setup-dependencies">
<antcall target="missing-dependency">
<param name="id" value="${junit.id}"/>
@@ -141,4 +146,4 @@
<param name="license.url" value="${junit.license.url}"/>
</antcall>
</target>
-
+ -->
1.3 +7 -5 james-server/check-targets.properties
Index: check-targets.properties
===================================================================
RCS file: /home/cvs/james-server/check-targets.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- check-targets.properties 1 Oct 2003 22:57:45 -0000 1.2
+++ check-targets.properties 20 Oct 2003 04:06:11 -0000 1.3
@@ -29,10 +29,12 @@
activation.license.url=http://java.sun.com/products/javabeans/glasgow/jaf.html
# JUnit
-junit.version=3.7
-junit.id=junit-3.7
-junit.license=${cpl.license}
-junit.license.url=${cpl.license.url}
-junit.dist.url=http://www.junit.org/
+#junit.version=3.7
+#junit.name=junit
+#junit.id=${junit.name}-${junit.version}
+#junit.license=${cpl.license}
+#junit.license.url=${cpl.license.url}
+#junit.dist.url=http://www.junit.org/
+
1.10 +1 -0 james-server/include.properties
Index: include.properties
===================================================================
RCS file: /home/cvs/james-server/include.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- include.properties 20 Oct 2003 02:58:09 -0000 1.9
+++ include.properties 20 Oct 2003 04:06:11 -0000 1.10
@@ -94,3 +94,4 @@
# ----- Excalibur pool -----
excalibur-pool.jar=${candidates.dir}/excalibur-pool-1.2.jar
+
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
