carnold 2005/08/22 13:51:34
Modified: . Tag: v1_2-branch build.properties.sample build.xml
Log:
Bug 36268: Add post-build check for optional parts in release, fix jmx
location.
Revision Changes Path
No revision
No revision
1.2.2.6 +1 -1 logging-log4j/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/logging-log4j/build.properties.sample,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -r1.2.2.5 -r1.2.2.6
--- build.properties.sample 19 Aug 2005 03:23:17 -0000 1.2.2.5
+++ build.properties.sample 22 Aug 2005 20:51:34 -0000 1.2.2.6
@@ -26,7 +26,7 @@
# Required to build the org.apache.log4j.jmx package.
jmx.home.dir=${lib.home.dir}/jmx-1_2_1-bin
jmx.jar=${jmx.home.dir}/lib/jmxri.jar
-jmx-extra.jar=${jmx.home.dir}/jmx/lib/jmxtools.jar
+jmx-extra.jar=${jmx.home.dir}/lib/jmxtools.jar
jndi.jar=${lib.home.dir}/jndi-1_2_1/lib/jndi.jar
# Required to run Checkstyle. Available from http://checkstyle.sf.net
1.34.2.34 +24 -6 logging-log4j/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4j/build.xml,v
retrieving revision 1.34.2.33
retrieving revision 1.34.2.34
diff -u -r1.34.2.33 -r1.34.2.34
--- build.xml 20 Aug 2005 00:58:48 -0000 1.34.2.33
+++ build.xml 22 Aug 2005 20:51:34 -0000 1.34.2.34
@@ -132,14 +132,12 @@
<target name="jmxCheck">
<condition property="jmx-present" value="true">
<and>
- <available classname="javax.management.MBeanInfo">
- <classpath>
- <pathelement location="${jmx.jar}"/>
- </classpath>
- </available>
+ <available classname="javax.management.MBeanInfo"
+ classpath="${jmx.jar}"/>
<available classname="com.sun.jdmk.comm.HtmlAdaptorServer">
<classpath>
- <pathelement location="${jmx.jar}"/>
+ <pathelement location="${jmx.jar}"/>
+ <pathelement location="${jmx-extra.jar}"/>
</classpath>
</available>
</and>
@@ -624,6 +622,26 @@
<property name="build.compiler" value="classic"/>
<antcall target="clean-site"/>
<antcall target="dist"/>
+
+ <!-- check that jar file is not missing
+ classes due to missing dependencies -->
+ <available property="jaxp-found"
+ classname="org.apache.log4j.xml.DOMConfigurator"
+ classpath="${jar.dest}/${jar.filename}"/>
+ <fail unless="jaxp-found" message="JAXP was not found."/>
+ <available property="jmx-found"
+ classname="org.apache.log4j.jmx.Agent"
+ classpath="${jar.dest}/${jar.filename}"/>
+ <fail unless="jmx-found" message="JMX was not found."/>
+ <available property="jms-found"
+ classname="org.apache.log4j.net.JMSAppender"
+ classpath="${jar.dest}/${jar.filename}"/>
+ <fail unless="jms-found" message="JMS or JNDI was not found."/>
+ <available property="javamail-found"
+ classname="org.apache.log4j.net.SMTPAppender"
+ classpath="${jar.dest}/${jar.filename}"/>
+ <fail unless="javamail-found" message="JAVAMAIL was not found."/>
+
</target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
