You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ce...@apache.org on 2005/01/14 20:04:23 UTC
cvs commit: logging-log4j build.properties.sample build.xml
ceki 2005/01/14 11:04:22
Modified: . build.properties.sample build.xml
Log:
Split db, smtp, and jms classes into their own jars. More will follow.
Revision Changes Path
1.22 +1 -5 logging-log4j/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/logging-log4j/build.properties.sample,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- build.properties.sample 2 Jan 2005 09:51:40 -0000 1.21
+++ build.properties.sample 14 Jan 2005 19:04:22 -0000 1.22
@@ -6,7 +6,7 @@
# or earlier.
# jaxp.home=/java/jaxp-1.1
-# jaxp.jaxp.jar=${jaxp.home}/jaxp.jar
+# jaxp-api.jar=${jaxp.home}/jaxp.jar
# jaxp.parser.jar=${jaxp.home}/crimson.jar
# JavaMail API OPTIONAL; required to build the SMTPAppender
@@ -16,10 +16,6 @@
# JMS OPTIONAL; required to build the JMSAppender.
# in order to build the JMSAppender.
jms.jar=/java/JMQ1.1/lib/jms.jar
-
-# JMX OPTIONAL; required to build the org.apace.log4j.jmx package.
-jmx.jar=/java/jmx/lib/jmxri.jar
-jmx-extra.jar=/java/jmx/lib/jmxtools.jar
# Servlet api
servlet-api.jar=/java/servlet-api.jar
1.139 +73 -26 logging-log4j/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4j/build.xml,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- build.xml 13 Jan 2005 13:33:25 -0000 1.138
+++ build.xml 14 Jan 2005 19:04:22 -0000 1.139
@@ -116,10 +116,13 @@
<target name="jaxpCheck">
<available classname="javax.xml.parsers.DocumentBuilderFactory"
property="jaxp-present"/>
- </target>
+ <fail unless="jaxp-present">
+
+ Could not find the JAXP API.
+
+ Please set the jaxp-api.jar property in the build.properties file.
+ </fail>
- <target name="jaxp" depends="jaxpCheck" if="jaxp-present">
- <echo message="JAXP present."/>
</target>
<target name="jndiCheck">
@@ -150,25 +153,36 @@
<echo message="ORO is present."/>
</target>
- <target name="jmsCheck" depends="jndiCheck" if="jndi-present">
+ <target name="jmsCheck" depends="jndiCheck">
<available classname="javax.jms.Message" property="jms-present">
<classpath refid="compile.classpath"/>
</available>
- </target>
-
- <target name="jms" depends="jmsCheck" if="jms-present">
- <echo message="JMS is present."/>
+ <fail unless="jms-present">
+
+ Missing java.jms.* classes.
+
+ Please make sure to that the "jms.jar" poperty in build.properties
+ file is set correctly.
+
+ </fail>
</target>
<target name="javamailCheck">
<available classname="javax.mail.Message" property="javamail-present">
<classpath refid="compile.classpath"/>
</available>
- </target>
- <target name="javamail" depends="javamailCheck" if="javamail-present">
- <echo message="JAVAMAIL is present."/>
+ <fail unless="javamail-present">
+
+ Missing java.mail.* classes.
+
+ Please make sure to that the "jms.jar" poperty in build.properties
+ file is set correctly.
+
+ </fail>
+
</target>
+
<target name="servletAPICheck">
<available classname="javax.servlet.ServletContext" property="servletAPI-present">
<classpath refid="compile.classpath"/>
@@ -189,12 +203,15 @@
<target name="init">
<tstamp />
+ <mkdir dir="${javac.dest}/"/>
+ <mkdir dir="${examples.javac.dest}/" />
</target>
<target name="build.log4j" description="Compile log4j, but not chainsaw or examples."
depends="init, build.core,
- build.xml, build.javamail, build.jms,
- build.servletAPI, build.db, build.oro"/>
+ build.xml,
+ build.servletAPI,
+ build.oro"/>
<target name="build" description="Compile all log4j components."
@@ -221,8 +238,7 @@
</fail>
</target>
- <target name="build.core" depends="init, jndiCheck" if="jndi-present" >
- <mkdir dir="${javac.dest}" />
+ <target name="build.core" depends="init, jndiCheck, jaxpCheck">
<javac srcdir="${java.source.dir}"
destdir="${javac.dest}"
includes="org/apache/ugli/**/*.java,
@@ -286,7 +302,7 @@
<rmic base="${examples.javac.dest}" classname="factor.NumberCruncherServer" />
</target>
- <target name="build.xml" depends="init, jaxp" if="jaxp-present">
+ <target name="build.xml" depends="init, jaxpCheck">
<javac srcdir="${java.source.dir}"
destdir="${javac.dest}"
includes="${stem}/xml/**/*.java"
@@ -303,8 +319,7 @@
tofile="${javac.dest}/${stem}/xml/logger.dtd" />
</target>
- <target name="build.javamail" depends="init, javamail"
- if="javamail-present">
+ <target name="build.smtp" depends="init, javamailCheck">
<javac srcdir="${java.source.dir}"
destdir="${javac.dest}"
debug="${debug}"
@@ -314,7 +329,18 @@
<classpath refid="compile.classpath"/>
</javac>
</target>
-
+
+ <target name="log4j-smtp.jar" depends="init, build.smtp"
+ if="javamail-present">
+ <jar jarfile="log4j-smtp-${version}.jar" basedir="${javac.dest}"
+ includes="${stem}/spi/TriggeringEventEvaluator.class,
+ ${stem}/net/SMTPAppender.class,
+ ${stem}/net/DefaultEvaluator.class"
+ >
+ </jar>
+ </target>
+
+
<target name="build.oro" depends="init, oro" if="oro-present">
<javac srcdir="${java.source.dir}"
destdir="${javac.dest}"
@@ -327,7 +353,7 @@
</javac>
</target>
- <target name="build.jms" depends="init, jms, jndi" if="jms-present">
+ <target name="build.jms" depends="init, jmsCheck, jndi">
<javac srcdir="${java.source.dir}"
debug="${debug}"
deprecation="${deprecation}"
@@ -337,6 +363,17 @@
<classpath refid="compile.classpath"/>
</javac>
</target>
+
+ <target name="log4j-jms.jar" depends="init, build.jms"
+ if="jms-present">
+ <jar jarfile="log4j-jms-${version}.jar" basedir="${javac.dest}"
+ includes="${stem}/net/JMSAppender.class,
+ ${stem}/net/JMSSink.class,
+ ${stem}/net/JMSReceiver.class,
+ ${stem}/or/jms/*.class"
+ >
+ </jar>
+ </target>
<target name="build.servletAPI" depends="init, servletAPI"
if="servletAPI-present">
@@ -359,13 +396,21 @@
<classpath refid="compile.classpath"/>
</javac>
</target>
+
+ <target name="log4j-db.jar" depends="init, jdbcExtension"
+ if="jdbcExtension-present">
+ <jar jarfile="log4j-db-${version}.jar" basedir="${javac.dest}"
+ includes="${stem}/db/**.class"/>
+ </target>
<!-- ================================================================= -->
<!-- Remove all generated (compiled) class files. -->
<!-- ================================================================= -->
<target name="clean" depends="init" description="Delete all compiled files.">
- <delete dir="${javac.dest}/" />
- <delete dir="${examples.javac.dest}/" />
+ <delete>
+ <fileset dir="${javac.dest}/" includes="**/*"/>
+ <fileset dir="${examples.javac.dest}/" includes="**/*"/>
+ </delete>
</target>
<!-- ================================================================= -->
@@ -393,18 +438,15 @@
${stem}/*.class,
${stem}/xml/log4j.dtd,
${stem}/xml/logger.dtd,
- org/apache/joran/**/*.class,
${stem}/joran/**/*.class,
${stem}/config/*.class,
${stem}/helpers/*.class,
${stem}/spi/**/*.class,
${stem}/net/*.class,
- ${stem}/db/**/*.class,
${stem}/html/**/*.class,
${stem}/varia/*.class,
${stem}/filter/*.class,
${stem}/rule/*.class,
- ${stem}/nt/*.class,
${stem}/rolling/**/*.class,
${stem}/xml/*.class,
${stem}/scheduler/*.class,
@@ -413,11 +455,16 @@
${stem}/pattern/*.class,
${stem}/or/*.class,
${stem}/or/sax/*.class,
- ${stem}/or/jms/*.class,
${stem}/plugins/*.class,
${stem}/config/*.class"
excludes="org/apache/ugli/**/JDK14*.class,
**/UnitTest**,
+ ${stem}/net/SMTPAppender.class,
+ ${stem}/net/DefaultEvaluator.class,
+ ${stem}/spi/TriggeringEventEvaluator.class,
+ ${stem}/net/JMSAppender.class,
+ ${stem}/net/JMSSink.class,
+ ${stem}/net/JMSReceiver.class,
${stem}/**/*BeanInfo.class,"
>
<manifest>
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org