Author: carnold
Date: Wed Jun 27 15:46:22 2007
New Revision: 551371
URL: http://svn.apache.org/viewvc?view=rev&rev=551371
Log:
Bug 42595: Harmonization of companions
Modified:
logging/log4j/companions/sound/trunk/NOTICE
logging/log4j/companions/sound/trunk/build.xml
logging/log4j/companions/sound/trunk/pom.xml
logging/log4j/companions/sound/trunk/src/changes/changes.xml
logging/log4j/companions/sound/trunk/src/main/resources/META-INF/NOTICE
logging/log4j/companions/sound/trunk/src/site/apt/download.apt
Modified: logging/log4j/companions/sound/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/sound/trunk/NOTICE?view=diff&rev=551371&r1=551370&r2=551371
==============================================================================
--- logging/log4j/companions/sound/trunk/NOTICE (original)
+++ logging/log4j/companions/sound/trunk/NOTICE Wed Jun 27 15:46:22 2007
@@ -1,4 +1,4 @@
-Apache LogMF Companion for log4j 1.2
+Apache Sound Appender Companion for log4j 1.2.
Copyright 2007 The Apache Software Foundation
This product includes software developed at
Modified: logging/log4j/companions/sound/trunk/build.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/sound/trunk/build.xml?view=diff&rev=551371&r1=551370&r2=551371
==============================================================================
--- logging/log4j/companions/sound/trunk/build.xml (original)
+++ logging/log4j/companions/sound/trunk/build.xml Wed Jun 27 15:46:22 2007
@@ -21,6 +21,9 @@
This is a minimal build file to support Gump.
Use of Maven to build this component is recommended.
+
+Specify -Dcompanion.jar to test a previously prepared jar.
+
-->
<project default="test">
<!-- use build.properties file or command line to override these
properties -->
@@ -36,8 +39,8 @@
<property name="m2_repo" location="${user.home}/.m2/repository"/>
<!-- Versions for dependencies -->
- <property name="log4j.version" value="1.2.8"/>
- <property name="junit.version" value="4.3.1"/>
+ <property name="log4j.version" value="1.2.9"/>
+ <property name="junit.version" value="3.8.1"/>
<!-- Dependency locations - assumed to be in Maven 2 repository -->
<property name="junit.jar"
@@ -57,16 +60,7 @@
<delete dir="target"/>
</target>
- <path id="compile-classpath" path="${log4j.jar}"/>
- <path id="test-classpath">
- <path refid="compile-classpath"/>
- <pathelement location="target/classes"/>
- <pathelement location="${junit.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"
@@ -74,13 +68,13 @@
debug="${javac.debug}"
target="${javac.target}"
source="${javac.source}"
- classpathref="compile-classpath"/>
+ classpath="${log4j.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>
@@ -94,7 +88,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"
@@ -102,7 +97,7 @@
debug="${javac.debug}"
target="${javac.target}"
source="${javac.source}"
- classpathref="test-classpath"/>
+ classpath="${companion.jar}:${log4j.jar}:${junit.jar}"/>
<copy todir="target/test-classes" overwrite="true">
<fileset dir="src/test/resources"/>
</copy>
@@ -111,13 +106,11 @@
<target name="test" depends="test-compile" description="Run unit tests">
<junit printsummary="yes" fork="true" dir="target">
- <classpath>
- <path refid="test-classpath"/>
- <pathelement path="target/test-classes"/>
- </classpath>
+ <classpath
path="target/test-classes:${companion.jar}:${log4j.jar}:${junit.jar}"/>
<batchtest>
<fileset dir="src/test/java/">
<include name="**/Test*.java"/>
+ <include name="**/*TestCase.java"/>
</fileset>
</batchtest>
<formatter type="plain" usefile="false"/>
Modified: logging/log4j/companions/sound/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/sound/trunk/pom.xml?view=diff&rev=551371&r1=551370&r2=551371
==============================================================================
--- logging/log4j/companions/sound/trunk/pom.xml (original)
+++ logging/log4j/companions/sound/trunk/pom.xml Wed Jun 27 15:46:22 2007
@@ -136,6 +136,7 @@
<descriptors>
<descriptor>src/assembly/bin.xml</descriptor>
</descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
</configuration>
<executions>
<execution>
@@ -172,13 +173,13 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.3.1</version>
+ <version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.8</version>
+ <version>1.2.9</version>
</dependency>
</dependencies>
<reporting>
Modified: logging/log4j/companions/sound/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/sound/trunk/src/changes/changes.xml?view=diff&rev=551371&r1=551370&r2=551371
==============================================================================
--- logging/log4j/companions/sound/trunk/src/changes/changes.xml (original)
+++ logging/log4j/companions/sound/trunk/src/changes/changes.xml Wed Jun 27
15:46:22 2007
@@ -17,10 +17,10 @@
-->
<document>
<properties>
- <title>sound</title>
+ <title>Apache Sound Appender Companion for log4j 1.2.</title>
</properties>
<body>
- <release version="1.0" date="2007-06-05" description="Initial release">
+ <release version="1.0" date="2007-06-27" description="Initial release">
<action issue="42595" type="add">
Initial release.
</action>
Modified:
logging/log4j/companions/sound/trunk/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/sound/trunk/src/main/resources/META-INF/NOTICE?view=diff&rev=551371&r1=551370&r2=551371
==============================================================================
--- logging/log4j/companions/sound/trunk/src/main/resources/META-INF/NOTICE
(original)
+++ logging/log4j/companions/sound/trunk/src/main/resources/META-INF/NOTICE Wed
Jun 27 15:46:22 2007
@@ -1,4 +1,4 @@
-Apache LogMF Companion for log4j 1.2
+Apache Sound Appender Companion for log4j 1.2.
Copyright 2007 The Apache Software Foundation
This product includes software developed at
Modified: logging/log4j/companions/sound/trunk/src/site/apt/download.apt
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/sound/trunk/src/site/apt/download.apt?view=diff&rev=551371&r1=551370&r2=551371
==============================================================================
--- logging/log4j/companions/sound/trunk/src/site/apt/download.apt (original)
+++ logging/log4j/companions/sound/trunk/src/site/apt/download.apt Wed Jun 27
15:46:22 2007
@@ -30,9 +30,9 @@
*-------------------------+---------+----------+-----------+
| | Mirrors | Checksum | Signature |
*-------------------------+---------+----------+-----------+
-| apache-log4j-sound-1.0-bin (tar.gz) |
{{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/sound/1.0/apache-log4j-sound-1.0-bin.tar.gz}
apache-log4j-sound-1.0-bin.tar.gz}} |
{{{http://www.apache.org/dist/logging/log4j/companions/sound/1.0/apache-log4j-sound-1.0-bin.tar.gz.md5}
apache-log4j-sound-1.0-bin.tar.gz.md5}} |
{{{http://www.apache.org/dist/logging/log4j/companions/sound/1.0/apache-log4j-sound-1.0-bin.tar.gz.asc}
apache-log4j-sound-1.0-bin.tar.gz.asc}} |
+| apache-log4j-sound-1.0 (tar.gz) |
{{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/sound/1.0/apache-log4j-sound-1.0.tar.gz}
apache-log4j-sound-1.0.tar.gz}} |
{{{http://www.apache.org/dist/logging/log4j/companions/sound/1.0/apache-log4j-sound-1.0.tar.gz.md5}
apache-log4j-sound-1.0.tar.gz.md5}} |
{{{http://www.apache.org/dist/logging/log4j/companions/sound/1.0/apache-log4j-sound-1.0.tar.gz.asc}
apache-log4j-sound-1.0.tar.gz.asc}} |
*-------------------------+---------+----------+-----------+
-| apache-log4j-sound-1.0-bin (zip) |
{{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/sound/1.0/apache-log4j-sound-1.0-bin.zip}
apache-log4j-sound-1.0-bin.zip}} |
{{{http://www.apache.org/dist/logging/log4j/companions/sound/1.0/apache-log4j-sound-1.0-bin.zip.md5}
apache-log4j-sound-1.0-bin.zip.md5}} |
{{{http://www.apache.org/dist/logging/log4j/companions/sound/1.0/apache-log4j-sound-1.0-bin.zip.asc}
apache-log4j-sound-1.0-bin.zip.asc}} |
+| apache-log4j-sound-1.0 (zip) |
{{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/sound/1.0/apache-log4j-sound-1.0.zip}
apache-log4j-sound-1.0.zip}} |
{{{http://www.apache.org/dist/logging/log4j/companions/sound/1.0/apache-log4j-sound-1.0.zip.md5}
apache-log4j-sound-1.0.zip.md5}} |
{{{http://www.apache.org/dist/logging/log4j/companions/sound/1.0/apache-log4j-sound-1.0.zip.asc}
apache-log4j-sound-1.0.zip.asc}} |
*-------------------------+---------+----------+-----------+
Please read {{{http://httpd.apache.org/dev/verification.html}Verifying
Apache HTTP Server Releases}}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
