carnold 2005/02/26 12:51:49
Modified: . build.xml ugli.xml
Log:
Parameterized names of optional jars, fixed jar metadata
Revision Changes Path
1.151 +15 -8 logging-log4j/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4j/build.xml,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- build.xml 25 Feb 2005 03:11:30 -0000 1.150
+++ build.xml 26 Feb 2005 20:51:49 -0000 1.151
@@ -33,6 +33,13 @@
<!-- The jar file that the jar task will generate -->
<property name="log4j.jar" value="log4j-${version}.jar"/>
+ <property name="log4j-optional.jar" value="log4j-optional.jar"/>
+ <property name="log4j-oro.jar" value="log4j-oro.jar"/>
+ <property name="log4j-xml.jar" value="log4j-xml.jar"/>
+ <property name="log4j-jms.jar" value="log4j-jms.jar"/>
+ <property name="log4j-smtp.jar" value="log4j-smtp.jar"/>
+ <property name="log4j-db.jar" value="log4j-db.jar"/>
+
<!-- Destination for documentation files -->
<property name="docs.dest" value="./docs"/>
@@ -319,7 +326,7 @@
</target>
<target name="log4j-xml.jar" depends="init, jaxpCheck, build.xml">
- <jar jarfile="log4j-xml.jar" basedir="${javac.dest}"
+ <jar jarfile="${log4j-xml.jar}" basedir="${javac.dest}"
includes="${stem}/xml/*.class,
${stem}/xml/*.dtd"
excludes="${stem}/xml/DOMConfigurator.class,
@@ -349,14 +356,14 @@
<target name="log4j-smtp.jar" depends="init, build.smtp"
if="javamail-present">
- <jar jarfile="log4j-smtp.jar" basedir="${javac.dest}"
+ <jar jarfile="${log4j-smtp.jar}" basedir="${javac.dest}"
includes="${stem}/spi/TriggeringEventEvaluator.class,
${stem}/net/SMTPAppender.class,
${stem}/net/DefaultEvaluator.class"
>
<manifest>
<section name="org/apache/log4j/">
- <attribute name="Implementation-Title" value="log4j-jms"/>
+ <attribute name="Implementation-Title" value="log4j-smtp"/>
<attribute name="Implementation-Version" value="${version}"/>
<attribute name="Implementation-Vendor" value="Apache Software
Foundation"/>
</section>
@@ -379,7 +386,7 @@
</target>
<target name="log4j-oro.jar" depends="init, oroCheck, build.oro">
- <jar jarfile="log4j-oro.jar" basedir="${javac.dest}"
+ <jar jarfile="${log4j-oro.jar}" basedir="${javac.dest}"
includes="${stem}/varia/LogFilePatternReceiver*.class,
${stem}/rule/LikeRule.class"
>
@@ -409,7 +416,7 @@
<target name="log4j-jms.jar" depends="init, build.jms"
if="jms-present">
- <jar jarfile="log4j-jms.jar" basedir="${javac.dest}"
+ <jar jarfile="${log4j-jms.jar}" basedir="${javac.dest}"
includes="${stem}/net/JMSAppender.class,
${stem}/net/JMSSink.class,
${stem}/net/JMSReceiver.class,
@@ -446,7 +453,7 @@
</target>
<target name="log4j-db.jar" depends="init, jdbcExtensionCheck">
- <jar jarfile="log4j-db.jar" basedir="${javac.dest}"
+ <jar jarfile="${log4j-db.jar}" basedir="${javac.dest}"
includes="${stem}/db/**.class"
>
<manifest>
@@ -460,7 +467,7 @@
</target>
<target name="log4j-optional.jar" depends="init, build.core">
- <jar jarfile="log4j-optional.jar" basedir="${javac.dest}"
+ <jar jarfile="${log4j-optional.jar}" basedir="${javac.dest}"
includes="${stem}/net/Multicast*.class,
${stem}/net/UDP*.class,
${stem}/net/SocketHub*.class,
@@ -468,7 +475,7 @@
>
<manifest>
<section name="org/apache/log4j/">
- <attribute name="Implementation-Title" value="log4j-db"/>
+ <attribute name="Implementation-Title" value="log4j-optional"/>
<attribute name="Implementation-Version" value="${version}"/>
<attribute name="Implementation-Vendor" value="Apache Software
Foundation"/>
</section>
1.8 +10 -7 logging-log4j/ugli.xml
Index: ugli.xml
===================================================================
RCS file: /home/cvs/logging-log4j/ugli.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ugli.xml 10 Feb 2005 12:23:39 -0000 1.7
+++ ugli.xml 26 Feb 2005 20:51:49 -0000 1.8
@@ -12,6 +12,9 @@
<!-- The directory where source files are stored. -->
<property name="version" value="1.0alpha"/>
+ <property name="ugli-simple.jar" value="ugli-simple.jar"/>
+ <property name="ugli-nop.jar" value="ugli-nop.jar"/>
+ <property name="ugli-jdk14.jar" value="ugli-jdk14.jar"/>
<!-- Deprecation warning? -->
<property name="deprecation" value="on"/>
@@ -83,7 +86,7 @@
<!-- Generic target that can build NOP, Simple and JDK14 implementations
-->
<!-- as specified by the "jar-name" and "impl" parameters.
-->
<!-- ===================================================================
-->
- <target name="ugli-IMPL.jar" depends="init">
+ <target name="ugli-IMPL.jar">
<!-- delete all previously existing files in tmp -->
<delete><fileset dir="tmp/" includes="**/*"/></delete>
@@ -122,24 +125,24 @@
</target>
- <target name="ugli-nop.jar">
+ <target name="ugli-nop.jar" depends="init">
<antcall target="ugli-IMPL.jar">
<param name="IMPL" value="NOP"/>
- <param name="jar-name" value="ugli-nop.jar"/>
+ <param name="jar-name" value="${ugli-nop.jar}"/>
</antcall>
</target>
- <target name="ugli-simple.jar">
+ <target name="ugli-simple.jar" depends="init">
<antcall target="ugli-IMPL.jar">
<param name="IMPL" value="Simple"/>
- <param name="jar-name" value="ugli-simple.jar"/>
+ <param name="jar-name" value="${ugli-simple.jar}"/>
</antcall>
</target>
- <target name="ugli-jdk14.jar" depends="julCheck">
+ <target name="ugli-jdk14.jar" depends="init, julCheck">
<antcall target="ugli-IMPL.jar">
<param name="IMPL" value="JDK14"/>
- <param name="jar-name" value="ugli-jdk14.jar"/>
+ <param name="jar-name" value="${ugli-jdk14.jar}"/>
</antcall>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
