Author: carnold
Date: Tue Jun 5 06:41:39 2007
New Revision: 544486
URL: http://svn.apache.org/viewvc?view=rev&rev=544486
Log:
Bug 42589: Change version to 1.0 for logsf, productization changes
Added:
logging/log4j/companions/logsf/trunk/src/assembly/
- copied from r544483, logging/log4j/companions/logmf/trunk/src/assembly/
logging/log4j/companions/logsf/trunk/src/site/apt/
- copied from r544483, logging/log4j/companions/logmf/trunk/src/site/apt/
Modified:
logging/log4j/companions/logsf/trunk/build.xml
logging/log4j/companions/logsf/trunk/pom.xml
logging/log4j/companions/logsf/trunk/src/assembly/bin.xml
logging/log4j/companions/logsf/trunk/src/changes/changes.xml
logging/log4j/companions/logsf/trunk/src/site/apt/download.apt
logging/log4j/companions/logsf/trunk/src/site/apt/index.apt
logging/log4j/companions/logsf/trunk/src/site/apt/roadmap.apt
logging/log4j/companions/logsf/trunk/src/site/site.xml
Modified: logging/log4j/companions/logsf/trunk/build.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/logsf/trunk/build.xml?view=diff&rev=544486&r1=544485&r2=544486
==============================================================================
--- logging/log4j/companions/logsf/trunk/build.xml (original)
+++ logging/log4j/companions/logsf/trunk/build.xml Tue Jun 5 06:41:39 2007
@@ -29,7 +29,7 @@
<!-- project details -->
<property name="project.name" value="apache-log4j-logsf"/>
<property name="project.title" value="Apache LogMF Companion for log4j
1.2."/>
- <property name="project.version" value="0.1-SNAPSHOT"/>
+ <property name="project.version" value="1.0"/>
<property name="project.jar"
value="${project.name}-${project.version}.jar"/>
<!-- Location of local Maven 2 repository -->
@@ -37,7 +37,7 @@
<!-- Versions for dependencies -->
<property name="log4j.version" value="1.2.8"/>
- <property name="junit.version" value="3.8.1"/>
+ <property name="junit.version" value="4.3.1"/>
<!-- Dependency locations - assumed to be in Maven 2 repository -->
<property name="junit.jar"
@@ -46,8 +46,8 @@
location="${m2_repo}/log4j/log4j/${log4j.version}/log4j-${log4j.version}.jar"/>
<!-- Java compiler settings -->
- <property name="javac.source" value="1.3"/>
- <property name="javac.target" value="1.2"/>
+ <property name="javac.source" value="1.2"/>
+ <property name="javac.target" value="1.1"/>
<property name="javac.deprecation" value="true"/>
<property name="javac.debug" value="true"/>
@@ -86,9 +86,6 @@
<manifest>
<attribute name="Built-By" value="${user.name}"/>
<section name="common">
- <attribute name="Specification-Title"
value="${project.title}"/>
- <attribute name="Specification-Version"
value="${project.version}"/>
- <attribute name="Specification-Vendor"
value="Apache Software Foundation"/>
<attribute name="Implementation-Title"
value="${project.title}"/>
<attribute name="Implementation-Version"
value="${project.version}"/>
<attribute name="Implementation-Vendor"
value="Apache Software Foundation"/>
Modified: logging/log4j/companions/logsf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/logsf/trunk/pom.xml?view=diff&rev=544486&r1=544485&r2=544486
==============================================================================
--- logging/log4j/companions/logsf/trunk/pom.xml (original)
+++ logging/log4j/companions/logsf/trunk/pom.xml Tue Jun 5 06:41:39 2007
@@ -21,7 +21,7 @@
<groupId>log4j</groupId>
<artifactId>apache-log4j-logsf</artifactId>
<packaging>jar</packaging>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
<name>Apache LogSF Companion for log4j 1.2.</name>
<description>This companion provides parameterized logging using a log4j 1.3
style message formatter
to simplify porting of code that used the parameterized logging facility in
log4j 1.3 or SLF4J.</description>
@@ -58,14 +58,6 @@
</otherArchives>
</mailingList>
</mailingLists>
-<developers>
- <developer>
- <id>carnold</id>
- <name>Curt Arnold</name>
- <email>[EMAIL PROTECTED]</email>
- <timezone>-6</timezone>
- </developer>
- </developers>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
@@ -74,9 +66,9 @@
</license>
</licenses>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/logging/sandbox/log4j/logsf</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/sandbox/log4j/logsf</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/logging/sandbox/log4j/logmf</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4j/companions/logsf/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/companions/logsf/trunk</developerConnection>
+
<url>http://svn.apache.org/viewcvs.cgi/logging/log4j/companions/logsf/trunk</url>
</scm>
<organization>
<name>Apache Software Foundation</name>
@@ -85,49 +77,103 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<workingDirectory>target</workingDirectory>
</configuration>
- </plugin>
+ </plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.3</source>
- <target>1.3</target>
+ <source>1.2</source>
+ <target>1.1</target>
</configuration>
</plugin>
- <!-- clean stray cobertura.ser -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>clean</id>
- <goals>
- <goal>clean</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestSections>
+ <manifestSection>
+ <name>org.apache.log4j</name>
+ <manifestEntries>
+
<Implementation-Title>${project.name}</Implementation-Title>
+
<Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-Vendor>Apache Software
Foundation</Implementation-Vendor>
+ </manifestEntries>
+ </manifestSection>
+ </manifestSections>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>site</phase>
+ <id>untag-site</id>
+ <configuration>
+ <tasks>
+ <taskdef name="replaceregexp"
classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp" />
+ <replaceregexp file="target/site/source-repository.html"
match="/tags/[^ ]*" replace="/trunk" flags="g" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>assembly</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ <goal>javadoc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.3.1</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -137,32 +183,34 @@
</dependency>
</dependencies>
<reporting>
+ <excludeDefaults>true</excludeDefaults>
<plugins>
<plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>scm</report>
+ <report>dependencies</report>
+ <report>cim</report>
+ <report>issue-tracking</report>
+ <report>mailing-list</report>
+ <report>license</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jxr-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <!-- version 2.1 was flawed and reports 100% coverage -->
- <version>2.0</version>
- </plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <goals>site-deploy</goals>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-changes-plugin</artifactId>
<reportSets>
<reportSet>
@@ -175,13 +223,22 @@
<issueLinkTemplate>%URL%/show_bug.cgi?id=%ISSUE%</issueLinkTemplate>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
</plugins>
</reporting>
<distributionManagement>
+ <repository>
+ <id>logging.repo</id>
+
<url>scp://people.apache.org/www/people.apache.org/builds/logging/repo/</url>
+ </repository>
<site>
- <id>apache.website</id>
-
<url>scp://people.apache.org/home/carnold/public_html/log4j/companions/logsf</url>
+ <id>logging.site</id>
+
<url>scp://people.apache.org/www/logging.apache.org/log4j/companions/logsf</url>
</site>
</distributionManagement>
-
</project>
Modified: logging/log4j/companions/logsf/trunk/src/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/logsf/trunk/src/assembly/bin.xml?view=diff&rev=544486&r1=544483&r2=544486
==============================================================================
--- logging/log4j/companions/logsf/trunk/src/assembly/bin.xml (original)
+++ logging/log4j/companions/logsf/trunk/src/assembly/bin.xml Tue Jun 5
06:41:39 2007
@@ -21,7 +21,7 @@
<format>zip</format>
<format>tar.gz</format>
</formats>
- <baseDirectory>apache-log4j-logmf-${project.version}</baseDirectory>
+ <baseDirectory>apache-log4j-logsf-${project.version}</baseDirectory>
<includeSiteDirectory>true</includeSiteDirectory>
<fileSets>
<fileSet>
@@ -37,7 +37,7 @@
<directory>target</directory>
<outputDirectory>.</outputDirectory>
<includes>
-
<include>apache-log4j-logmf-${project.version}.jar</include>
+
<include>apache-log4j-logsf-${project.version}.jar</include>
</includes>
</fileSet>
</fileSets>
Modified: logging/log4j/companions/logsf/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/logsf/trunk/src/changes/changes.xml?view=diff&rev=544486&r1=544485&r2=544486
==============================================================================
--- logging/log4j/companions/logsf/trunk/src/changes/changes.xml (original)
+++ logging/log4j/companions/logsf/trunk/src/changes/changes.xml Tue Jun 5
06:41:39 2007
@@ -1,11 +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>Log4J Message Formatting Utilities</title>
- <author email="[EMAIL PROTECTED]">Curt Arnold</author>
- </properties>
-
- <body>
- <release version="0.1" date="2006-01-11" desc="Initial commit to
sandbox">
- </release>
- </body>
-</document>
\ No newline at end of file
+ <properties>
+ <title>logsf</title>
+ </properties>
+ <body>
+ <release version="1.0" date="2007-06-05" description="Initial release">
+ <action issue="42589" type="add">
+ Initial release.
+ </action>
+ </release>
+ </body>
+</document>
Modified: logging/log4j/companions/logsf/trunk/src/site/apt/download.apt
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/logsf/trunk/src/site/apt/download.apt?view=diff&rev=544486&r1=544483&r2=544486
==============================================================================
--- logging/log4j/companions/logsf/trunk/src/site/apt/download.apt (original)
+++ logging/log4j/companions/logsf/trunk/src/site/apt/download.apt Tue Jun 5
06:41:39 2007
@@ -13,14 +13,14 @@
~~ See the License for the specific language governing permissions and
~~ limitations under the License.
------
-Download apache-log4j-logmf
+Download apache-log4j-logsf
------
------
------
-Download apache-log4j-logmf
+Download apache-log4j-logsf
- Apache LogMF Companion for log4j 1.2 is distributed under the
{{{http://www.apache.org/licenses/LICENSE-2.0.html} Apache License, version
2.0}}.
+ Apache LogSF Companion for log4j 1.2 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-logmf-1.0-bin (tar.gz) |
{{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/logmf/1.0/apache-log4j-logmf-1.0-bin.tar.gz}
apache-log4j-logmf-1.0-bin.tar.gz}} |
{{{http://www.apache.org/dist/logging/log4j/companions/logmf/1.0/apache-log4j-logmf-1.0-bin.tar.gz.md5}
apache-log4j-logmf-1.0-bin.tar.gz.md5}} |
{{{http://www.apache.org/dist/logging/log4j/companions/logmf/1.0/apache-log4j-logmf-1.0-bin.tar.gz.asc}
apache-log4j-logmf-1.0-bin.tar.gz.asc}} |
+| apache-log4j-logsf-1.0-bin (tar.gz) |
{{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/logsf/1.0/apache-log4j-logsf-1.0-bin.tar.gz}
apache-log4j-logsf-1.0-bin.tar.gz}} |
{{{http://www.apache.org/dist/logging/log4j/companions/logsf/1.0/apache-log4j-logsf-1.0-bin.tar.gz.md5}
apache-log4j-logsf-1.0-bin.tar.gz.md5}} |
{{{http://www.apache.org/dist/logging/log4j/companions/logsf/1.0/apache-log4j-logsf-1.0-bin.tar.gz.asc}
apache-log4j-logsf-1.0-bin.tar.gz.asc}} |
*-------------------------+---------+----------+-----------+
-| apache-log4j-logmf-1.0-bin (zip) |
{{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/logmf/1.0/apache-log4j-logmf-1.0-bin.zip}
apache-log4j-logmf-1.0-bin.zip}} |
{{{http://www.apache.org/dist/logging/log4j/companions/logmf/1.0/apache-log4j-logmf-1.0-bin.zip.md5}
apache-log4j-logmf-1.0-bin.zip.md5}} |
{{{http://www.apache.org/dist/logging/log4j/companions/logmf/1.0/apache-log4j-logmf-1.0-bin.zip.asc}
apache-log4j-logmf-1.0-bin.zip.asc}} |
+| apache-log4j-logsf-1.0-bin (zip) |
{{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/logsf/1.0/apache-log4j-logsf-1.0-bin.zip}
apache-log4j-logsf-1.0-bin.zip}} |
{{{http://www.apache.org/dist/logging/log4j/companions/logsf/1.0/apache-log4j-logsf-1.0-bin.zip.md5}
apache-log4j-logsf-1.0-bin.zip.md5}} |
{{{http://www.apache.org/dist/logging/log4j/companions/logsf/1.0/apache-log4j-logsf-1.0-bin.zip.asc}
apache-log4j-logsf-1.0-bin.zip.asc}} |
*-------------------------+---------+----------+-----------+
Please read {{{http://httpd.apache.org/dev/verification.html}Verifying
Apache HTTP Server Releases}}
Modified: logging/log4j/companions/logsf/trunk/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/logsf/trunk/src/site/apt/index.apt?view=diff&rev=544486&r1=544483&r2=544486
==============================================================================
--- logging/log4j/companions/logsf/trunk/src/site/apt/index.apt (original)
+++ logging/log4j/companions/logsf/trunk/src/site/apt/index.apt Tue Jun 5
06:41:39 2007
@@ -13,10 +13,11 @@
~~ See the License for the specific language governing permissions and
~~ limitations under the License.
------
- Apache LogMF Companion for log4j 1.2
+ Apache LogSF Companion for log4j 1.2
------
------
------
- This companion provides parameterized logging using java.text.MessageFormat
- compatible patterns.
\ No newline at end of file
+ This companion provides parameterized logging using patterns compatible
+ with log4j 1.3 parameterized logging. LogMF should be used
+ for new code.
\ No newline at end of file
Modified: logging/log4j/companions/logsf/trunk/src/site/apt/roadmap.apt
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/logsf/trunk/src/site/apt/roadmap.apt?view=diff&rev=544486&r1=544483&r2=544486
==============================================================================
--- logging/log4j/companions/logsf/trunk/src/site/apt/roadmap.apt (original)
+++ logging/log4j/companions/logsf/trunk/src/site/apt/roadmap.apt Tue Jun 5
06:41:39 2007
@@ -13,13 +13,13 @@
~~ See the License for the specific language governing permissions and
~~ limitations under the License.
------
- apache-log4j-logmf Roadmap
+ apache-log4j-logsf Roadmap
------
Curt Arnold
------
5 June 2007
------
-apache-log4j-logmf Roadmap
+apache-log4j-logsf Roadmap
No additional development is currently anticipated.
Modified: logging/log4j/companions/logsf/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/logsf/trunk/src/site/site.xml?view=diff&rev=544486&r1=544485&r2=544486
==============================================================================
--- logging/log4j/companions/logsf/trunk/src/site/site.xml (original)
+++ logging/log4j/companions/logsf/trunk/src/site/site.xml Tue Jun 5 06:41:39
2007
@@ -15,22 +15,50 @@
limitations under the License.
-->
-<project name="Component">
+<project name="logmf">
<bannerLeft>
<name>Logging Services</name>
<src>images/ls-logo.jpg</src>
<href>http://logging.apache.org/</href>
</bannerLeft>
<bannerRight>
+ <name>Apache log4j</name>
<src>images/logo.jpg</src>
+ <href>http://logging.apache.org/log4j</href>
</bannerRight>
<body>
- <links>
- <item name="Apache" href="http://www.apache.org/"; />
+ <breadcrumbs>
+ <item name="Apache" href="http://www.apache.org/"/>
<item name="Logging Services" href="http://logging.apache.org/"/>
- <item name="Log4j" href="http://logging.apache.org/log4j/"/>
- <item name="Log4j Companions"
href="http://logging.apache.org/log4j/companions"/>
- </links>
- <menu ref="reports"/>
+ <item name="log4j" href="http://logging.apache.org/log4j/"/>
+ <item name="Companions"
href="http://logging.apache.org/log4j/companions/"/>
+ <item name="LogSF"
href="http://logging.apache.org:80/log4j/companions/logsf/"/>
+ </breadcrumbs>
+
+ <menu name="Get LogSF">
+ <item name="Download" href="/download.html"/>
+ <item name="Changes" href="/changes-report.html"/>
+ <item name="License" href="/license.html"/>
+ </menu>
+
+ <menu name="About LogSF">
+ <item name="What is it?" href="/index.html"/>
+ <item name="Roadmap" href="/roadmap.html"/>
+ <item name="JavaDoc" href="/apidocs/index.html"/>
+ </menu>
+
+ <menu name="Community">
+ <item name="Mailing Lists" href="/mail-lists.html"/>
+ <item name="Issue Tracking" href="/issue-tracking.html"/>
+ </menu>
+
+ <menu name="Development">
+ <item name="Repository" href="/source-repository.html"/>
+ <item name="Cross Reference" href="/jxr.html"/>
+ <item name="Dependencies" href="/dependencies.html"/>
+ <item name="Continuous Integration" href="/integration.html"/>
+ <item name="Duplication" href="/cpd.html"/>
+ <item name="PMD" href="/pmd.html"/>
+ </menu>
</body>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
