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/05/15 19:10:37 UTC
svn commit: r538256 - in /logging/log4j/branches/v1_2-branch: pom.xml
src/assembly/ src/assembly/bin.xml src/site/apt/download.apt
src/site/site.xml
Author: carnold
Date: Tue May 15 10:10:36 2007
New Revision: 538256
URL: http://svn.apache.org/viewvc?view=rev&rev=538256
Log:
Bug 37930: Almost ready for a Maven-based release
Added:
logging/log4j/branches/v1_2-branch/src/assembly/
logging/log4j/branches/v1_2-branch/src/assembly/bin.xml
Modified:
logging/log4j/branches/v1_2-branch/pom.xml
logging/log4j/branches/v1_2-branch/src/site/apt/download.apt
logging/log4j/branches/v1_2-branch/src/site/site.xml
Modified: logging/log4j/branches/v1_2-branch/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/pom.xml?view=diff&rev=538256&r1=538255&r2=538256
==============================================================================
--- logging/log4j/branches/v1_2-branch/pom.xml (original)
+++ logging/log4j/branches/v1_2-branch/pom.xml Tue May 15 10:10:36 2007
@@ -24,6 +24,9 @@
<packaging>jar</packaging>
<name>Apache Log4j</name>
<version>1.2.15</version>
+ <properties>
+ <currentVersion>1.2.15</currentVersion>
+ </properties>
<description>Apache Log4j</description>
<url>http://logging.apache.org/log4j/1.2/</url>
<issueManagement>
@@ -127,7 +130,7 @@
<!-- ErrorHandlerTestCase is not run in Ant build either
<include>org/apache/log4j/varia/ErrorHandlerTestCase.java</include>
-->
- <include>org/apache/log4j/helpers/OptionConverterTestCase.java</include>
+ <!-- include>org/apache/log4j/helpers/OptionConverterTestCase.java</include -->
<include>org/apache/log4j/helpers/BoundedFIFOTestCase.java</include>
<include>org/apache/log4j/helpers/CyclicBufferTestCase.java</include>
<include>org/apache/log4j/helpers/PatternParserTestCase.java</include>
@@ -205,7 +208,15 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
</plugins>
<testSourceDirectory>tests/src/java</testSourceDirectory>
<testResources>
@@ -290,7 +301,7 @@
<distributionManagement>
<site>
<id>log4j12.website</id>
- <url>scp://people.apache.org/www/logging.apache.org/test/log4j/1.2/</url>
+ <url>scp://people.apache.org/www/logging.apache.org/log4j/1.2/</url>
</site>
</distributionManagement>
</project>
Added: logging/log4j/branches/v1_2-branch/src/assembly/bin.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/assembly/bin.xml?view=auto&rev=538256
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/assembly/bin.xml (added)
+++ logging/log4j/branches/v1_2-branch/src/assembly/bin.xml Tue May 15 10:10:36 2007
@@ -0,0 +1,61 @@
+<!--
+ 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.
+
+-->
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+ <baseDirectory>apache-log4j-${project.version}</baseDirectory>
+ <includeSiteDirectory>true</includeSiteDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>*.txt</include>
+ <include>*.sample</include>
+ <include>*.xml</include>
+ <include>*.rdf</include>
+ <include>INSTALL</include>
+ <include>KEYS</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>contrib/**</include>
+ <include>examples/**</include>
+ <include>src/assembly/**</include>
+ <include>src/changes/**</include>
+ <include>src/main/**</include>
+ <include>src/ntdll/**</include>
+ <include>src/performance/**</include>
+ <include>src/site/**</include>
+ <include>tests/*</include>
+ <include>tests/input/**</include>
+ <include>tests/resources/**</include>
+ <include>tests/src/**</include>
+ <include>tests/witness/**</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>log4j*.jar</include>
+ <include>NTEventLogAppender.dll</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Modified: logging/log4j/branches/v1_2-branch/src/site/apt/download.apt
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/site/apt/download.apt?view=diff&rev=538256&r1=538255&r2=538256
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/site/apt/download.apt (original)
+++ logging/log4j/branches/v1_2-branch/src/site/apt/download.apt Tue May 15 10:10:36 2007
@@ -18,9 +18,9 @@
------
------
-Download Apache log4j 1.2.14
+Download Apache log4j 1.2.15
- Apache log4j 1.2.14 is distributed under the {{{http://www.apache.org/licenses/LICENSE-2.0.html} Apache License, version 2.0}}.
+ Apache log4j 1.2.15 is distributed under the {{{http://www.apache.org/licenses/LICENSE-2.0.html} Apache License, version 2.0}}.
The link in the Mirrors column should display a list of available mirrors with a
default selection based on your inferred location. If you do not see that page,
@@ -30,9 +30,9 @@
*-------------------------+---------+----------+-----------+
| | Mirrors | Checksum | Signature |
*-------------------------+---------+----------+-----------+
-| Apache log4j 1.2.14 (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/logging/log4j/1.2.14/logging-log4j-1.2.14.tar.gz} logging-log4j-1.2.14.tar.gz}} | {{{http://www.apache.org/dist/logging/log4j/1.2.14/logging-log4j-1.2.14.tar.gz.md5} logging-log4j-1.2.14.tar.gz.md5}} | {{{http://www.apache.org/dist/logging/log4j/1.2.14/logging-log4j-1.2.14.tar.gz.asc} logging-log4j-1.2.14.tar.gz.asc}} |
+| Apache log4j 1.2.15 (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/logging/log4j/1.2.15/apache-log4j-1.2.15.tar.gz} apache-log4j-1.2.15.tar.gz}} | {{{http://www.apache.org/dist/logging/log4j/1.2.15/apache-log4j-1.2.15.tar.gz.md5} apache-log4j-1.2.15.tar.gz.md5}} | {{{http://www.apache.org/dist/logging/log4j/1.2.15/apache-log4j-1.2.15.tar.gz.asc} apache-log4j-1.2.15.tar.gz.asc}} |
*-------------------------+---------+----------+-----------+
-| Apache log4j 1.2.14 (zip) | {{{http://www.apache.org/dyn/closer.cgi/logging/log4j/1.2.14/logging-log4j-1.2.14.zip} logging-log4j-1.2.14.zip}} | {{{http://www.apache.org/dist/logging/log4j/1.2.14/logging-log4j-1.2.14.zip.md5} logging-log4j-1.2.14.zip.md5}} | {{{http://www.apache.org/dist/logging/log4j/1.2.14/logging-log4j-1.2.14.zip.asc} logging-log4j-1.2.14.zip.asc}} |
+| Apache log4j 1.2.15 (zip) | {{{http://www.apache.org/dyn/closer.cgi/logging/log4j/1.2.15/apache-log4j-1.2.15.zip} apache-log4j-1.2.15.zip}} | {{{http://www.apache.org/dist/logging/log4j/1.2.15/apache-log4j-1.2.15.zip.md5} apache-log4j-1.2.15.zip.md5}} | {{{http://www.apache.org/dist/logging/log4j/1.2.15/apache-log4j-1.2.15.zip.asc} apache-log4j-1.2.15.zip.asc}} |
*-------------------------+---------+----------+-----------+
Please read {{{http://httpd.apache.org/dev/verification.html}Verifying Apache HTTP Server Releases}}
Modified: logging/log4j/branches/v1_2-branch/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/site/site.xml?view=diff&rev=538256&r1=538255&r2=538256
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/site/site.xml (original)
+++ logging/log4j/branches/v1_2-branch/src/site/site.xml Tue May 15 10:10:36 2007
@@ -19,7 +19,7 @@
<bannerLeft>
<name>Apache log4j 1.2</name>
<src>images/ls-logo.jpg</src>
- <href>http://logging.apache.org/test/log4j/1.2</href>
+ <href>http://logging.apache.org/log4j/1.2</href>
</bannerLeft>
<bannerRight>
<src>images/logo.jpg</src>
@@ -27,9 +27,9 @@
<body>
<breadcrumbs>
<item name="Apache" href="http://www.apache.org/"/>
- <item name="Logging Services" href="http://logging.apache.org/test/"/>
- <item name="log4j" href="http://logging.apache.org/test/log4j/"/>
- <item name="1.2" href="http://logging.apache.org/test/log4j/1.2/"/>
+ <item name="Logging Services" href="http://logging.apache.org/"/>
+ <item name="log4j" href="http://logging.apache.org/log4j/"/>
+ <item name="1.2" href="http://logging.apache.org/log4j/1.2/"/>
</breadcrumbs>
<menu name="Get log4j 1.2">
@@ -63,8 +63,8 @@
</menu>
<menu name="Resources">
- <item name="Sandbox" href="http://logging.apache.org/test/sandbox"/>
- <item name="Catalog" href="http://logging.apache.org/test/catalog.html"/>
+ <item name="Sandbox" href="http://logging.apache.org/sandbox"/>
+ <item name="Catalog" href="http://logging.apache.org/catalog.html"/>
<item name="Wiki" href="http://wiki.apache.org/logging-log4j"/>
</menu>
</body>
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org