huw 2003/02/20 21:52:02
Modified: . build.xml check-targets.properties
check-targets.ent ant.properties.sample
Log:
put the check-dependencies and import-dependencies targets back in,
they should not have been taken out yesterday. reverted the check-targets files
to include a full list of dependencies instead of just those required for this
project - this is so all the projects can use the same files.
Revision Changes Path
1.96 +8 -2 avalon-logkit/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-logkit/build.xml,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- build.xml 19 Feb 2003 06:46:13 -0000 1.95
+++ build.xml 21 Feb 2003 05:52:02 -0000 1.96
@@ -118,6 +118,12 @@
</path>
&check-targets;
+
+ <!-- defer to check-targets.ent for figuring out dependencies -->
+ <target name="check-dependencies"
depends="junit-check,log4j-check,logkit-check,jdk14-check"/>
+
+ <!-- defer to check-targets.ent for downloading dependencies -->
+ <target name="import-dependencies"
depends="import-junit,import-log4j,import-logkit"/>
<!-- Main target -->
<target name="main" depends="jar" description="Build complete"/>
@@ -137,8 +143,8 @@
<echo message=" jar -> generates the ${Name} jar file"/>
<echo message=" javadocs -> generates the API documentation (java 1.2+
only)"/>
<echo message=" real-clean -> cleans up all genereated files and
directories"/>
- <echo message=" import-all-auto-dependencies -> "/>
- <echo message=" downloads all automatically downloadable jars"/>
+ <echo message=" import-dependencies -> "/>
+ <echo message=" downloads required automatically downloadable
jars"/>
<echo message=""/>
<echo message="-------------------------------------------------------------"/>
<echo message=""/>
1.2 +47 -6 avalon-logkit/check-targets.properties
Index: check-targets.properties
===================================================================
RCS file: /home/cvs/avalon-logkit/check-targets.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- check-targets.properties 19 Feb 2003 06:46:13 -0000 1.1
+++ check-targets.properties 21 Feb 2003 05:52:02 -0000 1.2
@@ -2,11 +2,38 @@
jar.repository=http://www.ibiblio.org/maven
-asl.license=Apache Software License
-asl.license.url=http://www.opensource.org/licenses/apachepl.php
+ibm.license=IBM Public License
+ibm.license.url=http://www.opensource.org/licenses/ibmpl.php
cpl.license=Common Public License
cpl.license.url=http://www.opensource.org/licenses/cpl.php
+asl.license=Apache Software License
+asl.license.url=http://www.opensource.org/licenses/apachepl.php
+lgpl.license=GNU Lesser General Public License
+lgpl.license.url=http://www.opensource.org/licenses/lgpl-license.php
sbcl.license=Sun Binary Code License
+npl.license=Netscape Public License
+npl.license.url=http://www.mozilla.org/MPL/NPL-1.1.html
+
+# BSF
+bsf.version=2.2
+bsf.id=bsf
+bsf.license=${ibm.license}
+bsf.license.url=${ibm.license.url}
+bsf.dist.url=http://www-124.ibm.com/developerworks/projects/bsf
+
+# Checkstyle
+checkstyle.version=2.4
+checkstyle.id=checkstyle
+checkstyle.license=${lgpl.license}
+checkstyle.license.url=${lgpl.license.url}
+checkstyle.dist.url=http://checkstyle.sf.net/
+
+# Commons-Logging
+commons-logging.version=1.0.2
+commons-logging.id=commons-logging
+commons-logging.license=${asl.license}
+commons-logging.license.url=${asl.license.url}
+commons-logging.dist.url=http://jakarta.apache.org/commons/logging/
# JavaMail
javamail.version=1.2
@@ -43,10 +70,24 @@
log4j.license.url=${asl.license.url}
log4j.dist.url=http://jakarta.apache.org/log4j/
+# Logkit
+logkit.version=1.0.1
+logkit.id=logkit
+logkit.license=${asl.license}
+logkit.license.url=${asl.license.url}
+logkit.dist.url=http://avalon.apache.org/logkit/
+
+# Rhino
+rhino.version=1.5R4-RC3
+rhino.id=rhino
+rhino.jar.id=js
+rhino.license=${npl.license}
+rhino.license.url=${npl.license.url}
+rhino.dist.url=ftp://ftp.mozilla.org/pub/js/
+
# Servlet API
-servletapi.version=2.3
+servletapi.version=2.2
servletapi.id=servletapi
servletapi.license=${sbcl.license}
-servletapi.license.url=http://java.sun.com/products/servlet/download.html
-servletapi.dist.url=http://java.sun.com/products/servlet/download.html
-
+servletapi.license.url=http://java.sun.com/products/servlet/
+servletapi.dist.url=http://java.sun.com/products/servlet/
1.2 +141 -10 avalon-logkit/check-targets.ent
Index: check-targets.ent
===================================================================
RCS file: /home/cvs/avalon-logkit/check-targets.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- check-targets.ent 19 Feb 2003 06:46:13 -0000 1.1
+++ check-targets.ent 21 Feb 2003 05:52:02 -0000 1.2
@@ -48,24 +48,42 @@
<!-- Set up properties -->
<property file="check-targets.properties"/>
<target name="setup-dependencies">
+ <available property="bsf.present"
+ classname="com.ibm.bsf.BSFEngine"
+ classpathref="project.class.path" />
+ <available property="checkstyle.present"
+ classname="com.puppycrawl.tools.checkstyle.Checker"
+ classpathref="project.class.path" />
+ <available property="commons-logging.present"
+ classname="org.apache.comons.logging.Log"
+ classpathref="project.class.path" />
<available property="javax.jms.present"
classname="javax.jms.TopicConnection"
classpathref="project.class.path" />
<available property="javax.mail.present"
classname="javax.mail.Message"
classpathref="project.class.path" />
+ <available property="javax.servlet.present"
+ classname="javax.servlet.ServletContext"
+ classpathref="project.class.path" />
<available property="javax.sql.present"
classname="javax.sql.DataSource"
classpathref="project.class.path" />
+ <available property="jdk14.present"
+ classname="java.util.logging.Logger"
+ classpathref="project.class.path" />
<available property="junit.present"
classname="junit.framework.Test"
classpathref="project.class.path" />
<available property="log4j.present"
classname="org.apache.log4j.Level"
classpathref="project.class.path" />
- <available property="javax.servlet.present"
- classname="javax.servlet.ServletContext"
- classpathref="project.class.path" />
+ <available property="logkit.present"
+ classname="org.apache.log.Hierarchy"
+ classpathref="project.class.path" />
+ <available property="rhino.present"
+ classname="org.mozilla.javascript.Parser"
+ classpathref="project.class.path"/>
</target>
<!-- called if a dependency is missing which has a BSD or ASL or
@@ -150,13 +168,74 @@
</target>
<target name="check-all-dependencies"
- depends="javamail-check,jdbc-check,jms-check,junit-check,log4j-check"
- description="checks for all dependencies we know about. This is usually
more than the minimum needed to build this project; actual use is not recommended."
- />
+
depends="bsf-check,checkstyle-check,javamail-check,jdbc-check,jms-check,junit-check,log4j-check,logkit-check,servletapi-check,commons-logging-check"
+ description="checks for all dependencies we know about. This is usually more
than the minimum needed to build this project; actual use is not recommended."/>
<target name="import-all-auto-dependencies"
- depends="import-junit,import-log4j"
- description="checks for all dependencies we know about. This is usually
more than the minimum needed to build this project; actual use is not recommended."
- />
+
depends="import-bsf,import-checkstyle,import-junit,import-log4j,import-logkit,import-commons-logging"
+ description="checks for all dependencies we know about. This is usually more
than the minimum needed to build this project; actual use is not recommended."/>
+
+ <!-- BSF -->
+ <target name="bsf-check" unless="bsf.present" depends="setup-dependencies">
+ <antcall target="missing-dependency">
+ <param name="id" value="${bsf.id}"/>
+ <param name="jar.id" value="${bsf.id}"/>
+ <param name="version" value="${bsf.version}"/>
+ <param name="license" value="${bsf.license}"/>
+ <param name="license.url" value="${bsf.license.url}"/>
+ </antcall>
+ </target>
+
+ <target name="import-bsf" depends="setup-dependencies">
+ <antcall target="import-dependency">
+ <param name="id" value="${bsf.id}"/>
+ <param name="jar.id" value="${bsf.id}"/>
+ <param name="version" value="${bsf.version}"/>
+ <param name="license" value="${bsf.license}"/>
+ <param name="license.url" value="${bsf.license.url}"/>
+ </antcall>
+ </target>
+
+ <!-- Checkstyle -->
+ <target name="checkstyle-check" unless="checkstyle.present"
depends="setup-dependencies">
+ <antcall target="missing-dependency">
+ <param name="id" value="${checkstyle.id}"/>
+ <param name="jar.id" value="${checkstyle.id}"/>
+ <param name="version" value="${checkstyle.version}"/>
+ <param name="license" value="${checkstyle.license}"/>
+ <param name="license.url" value="${checkstyle.license.url}"/>
+ </antcall>
+ </target>
+
+ <target name="import-checkstyle" depends="setup-dependencies">
+ <antcall target="import-dependency">
+ <param name="id" value="${checkstyle.id}"/>
+ <param name="jar.id" value="${checkstyle.id}"/>
+ <param name="version" value="${checkstyle.version}"/>
+ <param name="license" value="${checkstyle.license}"/>
+ <param name="license.url" value="${checkstyle.license.url}"/>
+ </antcall>
+ </target>
+
+ <!-- Commons-Logging -->
+ <target name="commons-logging-check" unless="commons-logging.present"
depends="setup-dependencies">
+ <antcall target="missing-dependency">
+ <param name="id" value="${commons-logging.id}"/>
+ <param name="jar.id" value="${commons-logging.id}"/>
+ <param name="version" value="${commons-logging.version}"/>
+ <param name="license" value="${commons-logging.license}"/>
+ <param name="license.url" value="${commons-logging.license.url}"/>
+ </antcall>
+ </target>
+
+ <target name="import-commons-logging" depends="setup-dependencies">
+ <antcall target="import-dependency">
+ <param name="id" value="${commons-logging.id}"/>
+ <param name="jar.id" value="${commons-logging.id}"/>
+ <param name="version" value="${commons-logging.version}"/>
+ <param name="license" value="${commons-logging.license}"/>
+ <param name="license.url" value="${commons-logging.license.url}"/>
+ </antcall>
+ </target>
<!-- JavaMail -->
<target name="javamail-check" unless="javax.mail.present"
depends="setup-dependencies">
@@ -182,6 +261,16 @@
</antcall>
</target>
+ <!-- JDK 1.4 -->
+ <target name="jdk14-check" unless="jdk14.present" depends="setup-dependencies">
+
<echo>*************************************************************************</echo>
+ <echo>*</echo>
+ <echo>* You are compiling with a pre-1.4 jdk. Some functionality may not
be</echo>
+ <echo>* available.</echo>
+
<echo>*************************************************************************</echo>
+ <echo/>
+ </target>
+
<!-- JMS -->
<target name="jms-check" unless="javax.jms.present" depends="setup-dependencies">
<antcall target="missing-dependency-noauto">
@@ -193,7 +282,7 @@
<param name="dist.url" value="${jms.dist.url}"/>
</antcall>
</target>
-
+
<!-- JUnit -->
<target name="junit-check" unless="junit.present" depends="setup-dependencies">
<antcall target="missing-dependency">
@@ -233,6 +322,48 @@
<param name="version" value="${log4j.version}"/>
<param name="license" value="${log4j.license}"/>
<param name="license.url" value="${log4j.license.url}"/>
+ </antcall>
+ </target>
+
+ <!-- Logkit -->
+ <target name="logkit-check" unless="logkit.present" depends="setup-dependencies">
+ <antcall target="missing-dependency">
+ <param name="id" value="${logkit.id}"/>
+ <param name="jar.id" value="${logit.id}"/>
+ <param name="version" value="${logkit.version}"/>
+ <param name="license" value="${logkit.license}"/>
+ <param name="license.url" value="${logkit.license.url}"/>
+ </antcall>
+ </target>
+
+ <target name="import-logkit" depends="setup-dependencies">
+ <antcall target="import-dependency">
+ <param name="id" value="${logkit.id}"/>
+ <param name="jar.id" value="${logkit.id}"/>
+ <param name="version" value="${logkit.version}"/>
+ <param name="license" value="${logkit.license}"/>
+ <param name="license.url" value="${logkit.license.url}"/>
+ </antcall>
+ </target>
+
+ <!-- Rhino -->
+ <target name="rhino-check" unless="rhino.present" depends="setup-dependencies">
+ <antcall target="missing-dependency">
+ <param name="id" value="${rhino.id}"/>
+ <param name="jar.id" value="${rhino.jar.id}"/>
+ <param name="version" value="${rhino.version}"/>
+ <param name="license" value="${rhino.license}"/>
+ <param name="license.url" value="${rhino.license.url}"/>
+ </antcall>
+ </target>
+
+ <target name="import-rhino" depends="setup-dependencies">
+ <antcall target="import-dependency">
+ <param name="id" value="${rhino.id}"/>
+ <param name="jar.id" value="${rhino.jar.id}"/>
+ <param name="version" value="${rhino.version}"/>
+ <param name="license" value="${rhino.license}"/>
+ <param name="license.url" value="${rhino.license.url}"/>
</antcall>
</target>
1.2 +6 -6 avalon-logkit/ant.properties.sample
Index: ant.properties.sample
===================================================================
RCS file: /home/cvs/avalon-logkit/ant.properties.sample,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ant.properties.sample 19 Feb 2003 06:46:13 -0000 1.1
+++ ant.properties.sample 21 Feb 2003 05:52:02 -0000 1.2
@@ -10,9 +10,9 @@
#
# <-- starts a comment
-# servletapi.jar=
-# mail.jar=
-# jms.jar=
-# junit.jar=
-# jdbc.jar=
-# log4j.jar=
+#servletapi.jar=
+#mail.jar=
+#jms.jar=
+#junit.jar=
+#jdbc.jar=
+#log4j.jar=
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
