Author: carnold
Date: Wed Jun 27 15:44:39 2007
New Revision: 551368
URL: http://svn.apache.org/viewvc?view=rev&rev=551368
Log:
Bug 42121: Harmonization of companions
Modified:
logging/log4j/companions/pattern-layout/trunk/NOTICE
logging/log4j/companions/pattern-layout/trunk/build.xml
logging/log4j/companions/pattern-layout/trunk/pom.xml
logging/log4j/companions/pattern-layout/trunk/src/changes/changes.xml
logging/log4j/companions/pattern-layout/trunk/src/main/resources/META-INF/NOTICE
logging/log4j/companions/pattern-layout/trunk/src/site/apt/download.apt
Modified: logging/log4j/companions/pattern-layout/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/pattern-layout/trunk/NOTICE?view=diff&rev=551368&r1=551367&r2=551368
==============================================================================
--- logging/log4j/companions/pattern-layout/trunk/NOTICE (original)
+++ logging/log4j/companions/pattern-layout/trunk/NOTICE Wed Jun 27 15:44:39
2007
@@ -1,4 +1,4 @@
-Apache log4j Enhanced PatternLayout for log4j 1.2.x
+Apache Enhanced Pattern Layout Companion for log4j 1.2.
Copyright 2007 The Apache Software Foundation
This product includes software developed at
Modified: logging/log4j/companions/pattern-layout/trunk/build.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/pattern-layout/trunk/build.xml?view=diff&rev=551368&r1=551367&r2=551368
==============================================================================
--- logging/log4j/companions/pattern-layout/trunk/build.xml (original)
+++ logging/log4j/companions/pattern-layout/trunk/build.xml Wed Jun 27 15:44:39
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 -->
@@ -28,7 +30,7 @@
<!-- project details -->
<property name="project.name" value="apache-log4j-pattern-layout"/>
- <property name="project.title" value="Enhanced Pattern Layout Component
for log4j 1.2"/>
+ <property name="project.title" value="Apache Enhanced Pattern Layout
Companion for log4j 1.2"/>
<property name="project.version" value="1.0"/>
<property name="project.jar"
value="${project.name}-${project.version}.jar"/>
@@ -36,8 +38,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"/>
<property name="oro.version" value="2.0.8"/>
<!-- Dependency locations - assumed to be in Maven 2 repository -->
@@ -62,7 +64,7 @@
</target>
- <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"
@@ -71,12 +73,12 @@
target="${javac.target}"
source="${javac.source}"
classpath="${log4j.jar}"/>
- <copy todir="target/classes">
+ <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>
@@ -90,7 +92,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"
@@ -98,8 +101,8 @@
debug="${javac.debug}"
target="${javac.target}"
source="${javac.source}"
- classpath="${log4j.jar}:${junit.jar}:target/classes:${oro.jar}"/>
- <copy todir="target/test-classes">
+ classpath=":${companion.jar}:${log4j.jar}:${oro.jar}:${junit.jar}"/>
+ <copy todir="target/test-classes" overwrite="true">
<fileset dir="src/test/resources"/>
</copy>
</target>
@@ -107,9 +110,10 @@
<target name="test" depends="test-compile" description="Run unit tests">
<junit printsummary="yes">
- <classpath
path="target/test-classes:target/classes:${log4j.jar}:${oro.jar}"/>
+ <classpath
path="target/test-classes:${companion.jar}:${log4j.jar}:${oro.jar}:${junit.jar}"/>
<batchtest>
<fileset dir="src/test/java/">
+ <include name="**/Test*.java"/>
<include name="**/*TestCase.java"/>
<include name="**/*Test.java"/>
</fileset>
Modified: logging/log4j/companions/pattern-layout/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/pattern-layout/trunk/pom.xml?view=diff&rev=551368&r1=551367&r2=551368
==============================================================================
--- logging/log4j/companions/pattern-layout/trunk/pom.xml (original)
+++ logging/log4j/companions/pattern-layout/trunk/pom.xml Wed Jun 27 15:44:39
2007
@@ -22,7 +22,7 @@
<artifactId>apache-log4j-pattern-layout</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
- <name>Enhanced Pattern Layout Companion for log4j 1.2.</name>
+ <name>Apache Enhanced Pattern Layout Companion for log4j 1.2.</name>
<description>This companion provides the enhanced pattern layout from the
log4j 1.3 project to users of log4j 1.2.</description>
<url>http://logging.apache.org:80/log4j/companions/pattern-layout</url>
<issueManagement>
@@ -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>
<dependency>
<groupId>oro</groupId>
@@ -243,7 +244,7 @@
</repository>
<site>
<id>logging.site</id>
-
<url>scp://people.apache.org/www/logging.apache.org/log4j/companions/component</url>
+
<url>scp://people.apache.org/www/logging.apache.org/log4j/companions/pattern-layout</url>
</site>
</distributionManagement>
</project>
Modified: logging/log4j/companions/pattern-layout/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/pattern-layout/trunk/src/changes/changes.xml?view=diff&rev=551368&r1=551367&r2=551368
==============================================================================
--- logging/log4j/companions/pattern-layout/trunk/src/changes/changes.xml
(original)
+++ logging/log4j/companions/pattern-layout/trunk/src/changes/changes.xml Wed
Jun 27 15:44:39 2007
@@ -1 +1,29 @@
-<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<document>
<properties>
<title>Pattern Layout</title>
</properties>
<body>
<release version="1.0" date="2007-06-05" description="First release">
<action issue="42121" type="add">
Init
ial release of Enhanced Pattern Layout backported from log4j 1.3.
</action>
</release>
</body>
</document>
\ No newline at end of file
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<document>
+ <properties>
+ <title>Apache Enhanced Pattern Layout Companion for log4j 1.2.</title>
+ </properties>
+ <body>
+ <release version="1.0" date="2007-06-27" description="First release">
+ <action issue="42121" type="add">
+ Initial release of Enhanced Pattern Layout backported from log4j 1.3.
+ </action>
+ </release>
+ </body>
+</document>
Modified:
logging/log4j/companions/pattern-layout/trunk/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/pattern-layout/trunk/src/main/resources/META-INF/NOTICE?view=diff&rev=551368&r1=551367&r2=551368
==============================================================================
---
logging/log4j/companions/pattern-layout/trunk/src/main/resources/META-INF/NOTICE
(original)
+++
logging/log4j/companions/pattern-layout/trunk/src/main/resources/META-INF/NOTICE
Wed Jun 27 15:44:39 2007
@@ -1,4 +1,4 @@
-Apache log4j Enhanced PatternLayout for log4j 1.2.x
+Apache Enhanced Pattern Layout Companion for log4j 1.2.
Copyright 2007 The Apache Software Foundation
This product includes software developed at
Modified:
logging/log4j/companions/pattern-layout/trunk/src/site/apt/download.apt
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/pattern-layout/trunk/src/site/apt/download.apt?view=diff&rev=551368&r1=551367&r2=551368
==============================================================================
--- logging/log4j/companions/pattern-layout/trunk/src/site/apt/download.apt
(original)
+++ logging/log4j/companions/pattern-layout/trunk/src/site/apt/download.apt Wed
Jun 27 15:44:39 2007
@@ -30,9 +30,9 @@
*-------------------------+---------+----------+-----------+
| | Mirrors | Checksum | Signature |
*-------------------------+---------+----------+-----------+
-| apache-log4j-pattern-layout-1.0-bin (tar.gz) |
{{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/pattern-layout/1.0/apache-log4j-pattern-layout-1.0-bin.tar.gz}
apache-log4j-pattern-layout-1.0-bin.tar.gz}} |
{{{http://www.apache.org/dist/logging/log4j/companions/pattern-layout/1.0/apache-log4j-pattern-layout-1.0-bin.tar.gz.md5}
apache-log4j-pattern-layout-1.0-bin.tar.gz.md5}} |
{{{http://www.apache.org/dist/logging/log4j/companions/pattern-layout/1.0/apache-log4j-pattern-layout-1.0-bin.tar.gz.asc}
apache-log4j-pattern-layout-1.0-bin.tar.gz.asc}} |
+| apache-log4j-pattern-layout-1.0 (tar.gz) |
{{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/pattern-layout/1.0/apache-log4j-pattern-layout-1.0.tar.gz}
apache-log4j-pattern-layout-1.0.tar.gz}} |
{{{http://www.apache.org/dist/logging/log4j/companions/pattern-layout/1.0/apache-log4j-pattern-layout-1.0.tar.gz.md5}
apache-log4j-pattern-layout-1.0.tar.gz.md5}} |
{{{http://www.apache.org/dist/logging/log4j/companions/pattern-layout/1.0/apache-log4j-pattern-layout-1.0.tar.gz.asc}
apache-log4j-pattern-layout-1.0.tar.gz.asc}} |
*-------------------------+---------+----------+-----------+
-| apache-log4j-pattern-layout-1.0-bin (zip) |
{{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/pattern-layout/1.0/apache-log4j-pattern-layout-1.0-bin.zip}
apache-log4j-pattern-layout-1.0-bin.zip}} |
{{{http://www.apache.org/dist/logging/log4j/companions/pattern-layout/1.0/apache-log4j-pattern-layout-1.0-bin.zip.md5}
apache-log4j-pattern-layout-1.0-bin.zip.md5}} |
{{{http://www.apache.org/dist/logging/log4j/companions/pattern-layout/1.0/apache-log4j-pattern-layout-1.0-bin.zip.asc}
apache-log4j-pattern-layout-1.0-bin.zip.asc}} |
+| apache-log4j-pattern-layout-1.0 (zip) |
{{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/pattern-layout/1.0/apache-log4j-pattern-layout-1.0.zip}
apache-log4j-pattern-layout-1.0.zip}} |
{{{http://www.apache.org/dist/logging/log4j/companions/pattern-layout/1.0/apache-log4j-pattern-layout-1.0.zip.md5}
apache-log4j-pattern-layout-1.0.zip.md5}} |
{{{http://www.apache.org/dist/logging/log4j/companions/pattern-layout/1.0/apache-log4j-pattern-layout-1.0.zip.asc}
apache-log4j-pattern-layout-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]
