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 ca...@apache.org on 2007/06/28 00:45:24 UTC
svn commit: r551369 - in /logging/log4j/companions/receivers/trunk: NOTICE
build.xml pom.xml src/changes/changes.xml
src/main/resources/META-INF/NOTICE src/site/apt/download.apt
Author: carnold
Date: Wed Jun 27 15:45:23 2007
New Revision: 551369
URL: http://svn.apache.org/viewvc?view=rev&rev=551369
Log:
Bug 42102: Harmonization of companions
Modified:
logging/log4j/companions/receivers/trunk/NOTICE
logging/log4j/companions/receivers/trunk/build.xml
logging/log4j/companions/receivers/trunk/pom.xml
logging/log4j/companions/receivers/trunk/src/changes/changes.xml
logging/log4j/companions/receivers/trunk/src/main/resources/META-INF/NOTICE
logging/log4j/companions/receivers/trunk/src/site/apt/download.apt
Modified: logging/log4j/companions/receivers/trunk/NOTICE
URL: http://svn.apache.org/viewvc/logging/log4j/companions/receivers/trunk/NOTICE?view=diff&rev=551369&r1=551368&r2=551369
==============================================================================
--- logging/log4j/companions/receivers/trunk/NOTICE (original)
+++ logging/log4j/companions/receivers/trunk/NOTICE Wed Jun 27 15:45:23 2007
@@ -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
Modified: logging/log4j/companions/receivers/trunk/build.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/receivers/trunk/build.xml?view=diff&rev=551369&r1=551368&r2=551369
==============================================================================
--- logging/log4j/companions/receivers/trunk/build.xml (original)
+++ logging/log4j/companions/receivers/trunk/build.xml Wed Jun 27 15:45:23 2007
@@ -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 @@
<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,15 +74,7 @@
<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"
@@ -88,13 +82,13 @@
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,7 +102,8 @@
</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"
@@ -116,8 +111,8 @@
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>
@@ -125,12 +120,10 @@
<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>
Modified: logging/log4j/companions/receivers/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/receivers/trunk/pom.xml?view=diff&rev=551369&r1=551368&r2=551369
==============================================================================
--- logging/log4j/companions/receivers/trunk/pom.xml (original)
+++ logging/log4j/companions/receivers/trunk/pom.xml Wed Jun 27 15:45:23 2007
@@ -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>
Modified: logging/log4j/companions/receivers/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/receivers/trunk/src/changes/changes.xml?view=diff&rev=551369&r1=551368&r2=551369
==============================================================================
--- logging/log4j/companions/receivers/trunk/src/changes/changes.xml (original)
+++ logging/log4j/companions/receivers/trunk/src/changes/changes.xml Wed Jun 27 15:45:23 2007
@@ -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>
Modified: logging/log4j/companions/receivers/trunk/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/logging/log4j/companions/receivers/trunk/src/main/resources/META-INF/NOTICE?view=diff&rev=551369&r1=551368&r2=551369
==============================================================================
--- logging/log4j/companions/receivers/trunk/src/main/resources/META-INF/NOTICE (original)
+++ logging/log4j/companions/receivers/trunk/src/main/resources/META-INF/NOTICE Wed Jun 27 15:45:23 2007
@@ -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
Modified: logging/log4j/companions/receivers/trunk/src/site/apt/download.apt
URL: http://svn.apache.org/viewvc/logging/log4j/companions/receivers/trunk/src/site/apt/download.apt?view=diff&rev=551369&r1=551368&r2=551369
==============================================================================
--- logging/log4j/companions/receivers/trunk/src/site/apt/download.apt (original)
+++ logging/log4j/companions/receivers/trunk/src/site/apt/download.apt Wed Jun 27 15:45:23 2007
@@ -30,9 +30,9 @@
*-------------------------+---------+----------+-----------+
| | 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}}
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org