Permalink
Browse files

Bug 42102: Harmonization of companions

  • Loading branch information...
1 parent e58166e commit dff335c07209cff6d5c8ff9bfa639113bdb9f155 Curtis William Arnold committed Jun 27, 2007
Showing with 27 additions and 33 deletions.
  1. +1 −1 NOTICE
  2. +16 −23 build.xml
  3. +5 −4 pom.xml
  4. +2 −2 src/changes/changes.xml
  5. +1 −1 src/main/resources/META-INF/NOTICE
  6. +2 −2 src/site/apt/download.apt
View
2 NOTICE
@@ -1,4 +1,4 @@
-Apache log4j 1.3 receivers for log4j 1.2
+Apache Receivers Companion for log4j 1.2.
Copyright 2007 The Apache Software Foundation
This product includes software developed at
View
@@ -21,6 +21,8 @@
This is a minimal build file to support Gump.
Use of Maven to build this component is recommended.
+Specify -Dcompanion.jar=foo.jar to test a previously prepared jar.
+
-->
<project default="test">
<!-- use build.properties file or command line to override these properties -->
@@ -36,12 +38,12 @@ Use of Maven to build this component is recommended.
<property name="m2_repo" location="${user.home}/.m2/repository"/>
<!-- Versions for dependencies -->
- <property name="log4j.version" value="1.2.15-SNAPSHOT"/>
- <property name="junit.version" value="4.3.1"/>
+ <property name="log4j.version" value="1.2.15"/>
+ <property name="junit.version" value="3.8.1"/>
<property name="oro.version" value="2.0.8"/>
<property name="hsqldb.version" value="1.8.0.7"/>
- <property name="component.version" value="1.0-SNAPSHOT"/>
- <property name="filters.version" value="1.0-SNAPSHOT"/>
+ <property name="component.version" value="1.0"/>
+ <property name="filters.version" value="1.0"/>
<property name="jms.version" value="1.1"/>
<!-- Dependency locations - assumed to be in Maven 2 repository -->
@@ -72,29 +74,21 @@ Use of Maven to build this component is recommended.
<delete dir="target"/>
</target>
- <path id="compile-classpath" path="${log4j.jar}:${oro.jar}:${component.jar}:${filters.jar}:${jms.jar}"/>
- <path id="test-classpath">
- <path refid="compile-classpath"/>
- <pathelement location="target/classes"/>
- <pathelement location="${junit.jar}"/>
- <pathelement location="${hsqldb.jar}"/>
- </path>
-
- <target name="compile" depends="init" description="Compile implementation files">
+ <target name="compile" depends="init" unless="companion.jar" description="Compile implementation files">
<mkdir dir="target/classes"/>
<javac destdir="target/classes"
srcdir="src/main/java"
deprecation="${javac.deprecation}"
debug="${javac.debug}"
target="${javac.target}"
source="${javac.source}"
- classpathref="compile-classpath"/>
- <copy todir="target/classes">
+ classpath="${log4j.jar}:${oro.jar}:${component.jar}:${filters.jar}:${jms.jar}"/>
+ <copy todir="target/classes" overwrite="true">
<fileset dir="src/main/resources"/>
</copy>
</target>
- <target name="jar" depends="compile" description="Create jar">
+ <target name="jar" depends="compile" unless="companion.jar" description="Create jar">
<jar destfile="target/${project.jar}"
basedir="target/classes">
<manifest>
@@ -108,29 +102,28 @@ Use of Maven to build this component is recommended.
</jar>
</target>
- <target name="test-compile" depends="compile" description="Compile test files">
+ <target name="test-compile" depends="jar" description="Compile test files">
+ <property name="companion.jar" value="target/${project.jar}"/>
<mkdir dir="target/test-classes"/>
<javac destdir="target/test-classes"
srcdir="src/test/java"
deprecation="${javac.deprecation}"
debug="${javac.debug}"
target="${javac.target}"
source="${javac.source}"
- classpathref="test-classpath"/>
- <copy todir="target/test-classes">
+ classpath="${companion.jar}:${hsqldb.jar}:${junit.jar}:${log4j.jar}:${oro.jar}:${component.jar}:${filters.jar}:${jms.jar}"/>
+ <copy todir="target/test-classes" overwrite="true">
<fileset dir="src/test/resources"/>
</copy>
</target>
<target name="test" depends="test-compile" description="Run unit tests">
<junit printsummary="yes" fork="yes" dir="target">
- <classpath>
- <path refid="test-classpath"/>
- <pathelement path="target/test-classes"/>
- </classpath>
+ <classpath path="target/test-classes:${companion.jar}:${hsqldb.jar}:${junit.jar}:${log4j.jar}:${oro.jar}:${component.jar}:${filters.jar}:${jms.jar}"/>
<batchtest>
<fileset dir="src/test/java/">
+ <include name="**/Test*.java"/>
<include name="**/*TestCase.java"/>
<include name="**/*Test.java"/>
</fileset>
View
@@ -136,6 +136,7 @@
<descriptors>
<descriptor>src/assembly/bin.xml</descriptor>
</descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
</configuration>
<executions>
<execution>
@@ -172,7 +173,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.3.1</version>
+ <version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -184,17 +185,17 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.15-SNAPSHOT</version>
+ <version>1.2.15</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>apache-log4j-component</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>apache-log4j-filters</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>oro</groupId>
View
@@ -17,10 +17,10 @@
-->
<document>
<properties>
- <title>Receivers</title>
+ <title>Apache Receivers Companion for log4j 1.2.</title>
</properties>
<body>
- <release version="1.0" date="2007-06-05" description="First release">
+ <release version="1.0" date="2007-06-27" description="First release">
<action issue="42102" type="add">
Initial release of receivers companion backported from log4j 1.3.
</action>
@@ -1,4 +1,4 @@
-Apache log4j 1.3 receivers for log4j 1.2
+Apache Receivers Companion for log4j 1.2.
Copyright 2007 The Apache Software Foundation
This product includes software developed at
@@ -30,9 +30,9 @@ Download apache-log4j-receivers
*-------------------------+---------+----------+-----------+
| | Mirrors | Checksum | Signature |
*-------------------------+---------+----------+-----------+
-| apache-log4j-receivers-1.0-bin (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/receivers/1.0/apache-log4j-receivers-1.0-bin.tar.gz} apache-log4j-receivers-1.0-bin.tar.gz}} | {{{http://www.apache.org/dist/logging/log4j/companions/receivers/1.0/apache-log4j-receivers-1.0-bin.tar.gz.md5} apache-log4j-receivers-1.0-bin.tar.gz.md5}} | {{{http://www.apache.org/dist/logging/log4j/companions/receivers/1.0/apache-log4j-receivers-1.0-bin.tar.gz.asc} apache-log4j-receivers-1.0-bin.tar.gz.asc}} |
+| apache-log4j-receivers-1.0 (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/receivers/1.0/apache-log4j-receivers-1.0.tar.gz} apache-log4j-receivers-1.0.tar.gz}} | {{{http://www.apache.org/dist/logging/log4j/companions/receivers/1.0/apache-log4j-receivers-1.0.tar.gz.md5} apache-log4j-receivers-1.0.tar.gz.md5}} | {{{http://www.apache.org/dist/logging/log4j/companions/receivers/1.0/apache-log4j-receivers-1.0.tar.gz.asc} apache-log4j-receivers-1.0.tar.gz.asc}} |
*-------------------------+---------+----------+-----------+
-| apache-log4j-receivers-1.0-bin (zip) | {{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/receivers/1.0/apache-log4j-receivers-1.0-bin.zip} apache-log4j-receivers-1.0-bin.zip}} | {{{http://www.apache.org/dist/logging/log4j/companions/receivers/1.0/apache-log4j-receivers-1.0-bin.zip.md5} apache-log4j-receivers-1.0-bin.zip.md5}} | {{{http://www.apache.org/dist/logging/log4j/companions/receivers/1.0/apache-log4j-receivers-1.0-bin.zip.asc} apache-log4j-receivers-1.0-bin.zip.asc}} |
+| apache-log4j-receivers-1.0 (zip) | {{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/receivers/1.0/apache-log4j-receivers-1.0.zip} apache-log4j-receivers-1.0.zip}} | {{{http://www.apache.org/dist/logging/log4j/companions/receivers/1.0/apache-log4j-receivers-1.0.zip.md5} apache-log4j-receivers-1.0.zip.md5}} | {{{http://www.apache.org/dist/logging/log4j/companions/receivers/1.0/apache-log4j-receivers-1.0.zip.asc} apache-log4j-receivers-1.0.zip.asc}} |
*-------------------------+---------+----------+-----------+
Please read {{{http://httpd.apache.org/dev/verification.html}Verifying Apache HTTP Server Releases}}

0 comments on commit dff335c

Please sign in to comment.