improved site with standard reports
git-svn-id: https://svn.apache.org/repos/asf/logging/log4j/trunk@1333761 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 72b5865..f38771d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
<url>http://logging.apache.org/log4j/1.2/</url>
<issueManagement>
<system>Bugzilla</system>
- <url>http://issues.apache.org/bugzilla/</url>
+ <url>https://issues.apache.org/bugzilla/describecomponents.cgi?product=Log4j</url>
</issueManagement>
<ciManagement>
<system>Gump</system>
@@ -446,8 +446,10 @@
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
+ <version>3.1</version>
<configuration>
<templateFile>${basedir}/src/site/maven-site.vm</templateFile>
+ <excludeDefaults>true</excludeDefaults>
</configuration>
<executions>
<execution>
@@ -466,6 +468,41 @@
</testResource>
</testResources>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.4</version>
+ <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>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.7</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
<profiles>
<profile>
<id>mac</id>
@@ -541,42 +578,6 @@
<optional>true</optional>
</dependency>
</dependencies>
- <reporting>
- <excludeDefaults>true</excludeDefaults>
- <plugins>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.2</version>
- <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>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-changes-plugin</artifactId>
- <version>2.7</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>changes-report</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
<distributionManagement>
<repository>
<id>logging.repo</id>
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index 1111b3c..6d39707 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -21,10 +21,15 @@
Apache log4j\u2122 1.2
Welcome to Apache log4j, a logging library for Java. Apache log4j
- is an Apache Software Foundation Project and developed by a dedicated
- team of Committers of the Apache Software Foundation.
- For more info, please see {{{http://www.apache.org}The Apache Software Foundation}}.
- Apache log4j is also part of a project which is known as {{{http://logging.apache.org}Apache Logging}}.
+ is an Apache Software Foundation Project and developed by a dedicated
+ team of Committers of the Apache Software Foundation.
+ For more info, please see {{{http://www.apache.org}The Apache Software Foundation}}.
+ Apache log4j is also part of a project which is known as {{{http://logging.apache.org}Apache Logging}}.
+ Please see the {{{/license.html}License}}.
+
+ If you are interested in the recent changes, visit our {{{/changes-report.html}changes report}}.
+
+* Why logging?
Inserting log statements into your code is a low-tech method
for debugging it. It may also be the only way because
@@ -40,6 +45,7 @@
contain thousands of log statements, speed is of particular
importance.
+* Why log4j?
With log4j it is possible to enable logging at runtime
without modifying the application binary. The log4j package is
@@ -66,6 +72,8 @@
OutputStream, a java.io.Writer, a
remote log4j server, a remote Unix Syslog daemon, or many other output targets.
+* Performance
+
On an AMD Duron clocked at 800Mhz running JDK 1.3.1, it costs
about 5 nanoseconds to determine if a logging statement should
be logged or not. Actual logging is also quite fast, ranging
@@ -74,5 +82,10 @@
PatternLayout is almost as good as the dedicated layouts,
except that it is much more flexible.
+* Roadmap
+
The package is being constantly improved thanks to input from
- users and code contributed by authors in the community.
+ users and code contributed by authors in the community.
+
+ Please note, the team is currently working on log4j 2 which will replace
+ log4j 1 in near future.
diff --git a/src/site/apt/roadmap.apt b/src/site/apt/roadmap.apt
index 0f8e74b..980fbfc 100644
--- a/src/site/apt/roadmap.apt
+++ b/src/site/apt/roadmap.apt
@@ -23,7 +23,5 @@
Apache log4j 1.2 is mature and widely deployed. Significant
changes are unlikely. Bug fixes and maintenance releases are anticipated.
- New features are unlikely to be added. The next version with new features
- is Apache log4j 2.0 which currently can be found here:
- {{{http://logging.apache.org/log4j/2.0/index.html}Apache log4j 2}}
+ The next major version with is {{{http://logging.apache.org/log4j/2.0/index.html}Apache log4j 2}}
diff --git a/src/site/site.xml b/src/site/site.xml
index 36b036b..9c5b3f6 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -34,14 +34,9 @@
<item name="1.2" href="http://logging.apache.org/log4j/1.2/"/>
</breadcrumbs>
- <menu name="Get Apache log4j 1.2">
- <item name="Download" href="/download.html"/>
- <item name="Changes" href="/changes-report.html"/>
- <item name="License" href="/license.html"/>
- </menu>
-
<menu name="About log4j 1.2">
<item name="What is log4j?" href="/index.html"/>
+ <item name="Download" href="/download.html"/>
<item name="FAQ" href="/faq.html"/>
<item name="Roadmap" href="/roadmap.html"/>
</menu>
@@ -52,13 +47,6 @@
<item name="Blog" href="http://blogs.apache.org/logging/"/>
</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"/>
- </menu>
-
<menu name="Documentation">
<item name="Introduction" href="/manual.html"/>
<item name="JavaDoc" href="/apidocs/index.html"/>
@@ -66,6 +54,8 @@
<item name="Wiki" href="http://wiki.apache.org/logging-log4j"/>
</menu>
+ <menu ref="reports"/>
+
<menu name="Apache">
<item name="Home" href="http://www.apache.org"/>
<item name="License" href="http://www.apache.org/licenses"/>
