Author: carnold
Date: Mon Jun 7 04:27:39 2010
New Revision: 952086
URL: http://svn.apache.org/viewvc?rev=952086&view=rev
Log:
Bug 49361: Streamline nav menu and put log4j 2.0 description on landing page
Modified:
logging/site/trunk/author/src/site/site.xml
logging/site/trunk/author/src/site/xdoc/index.xml
Modified: logging/site/trunk/author/src/site/site.xml
URL:
http://svn.apache.org/viewvc/logging/site/trunk/author/src/site/site.xml?rev=952086&r1=952085&r2=952086&view=diff
==============================================================================
--- logging/site/trunk/author/src/site/site.xml (original)
+++ logging/site/trunk/author/src/site/site.xml Mon Jun 7 04:27:39 2010
@@ -30,40 +30,25 @@
<menu name="Project">
<item name="Welcome" href="/index.html"/>
<item name="News" href="/news.html"/>
- <item name="Charter" href="/charter.html"/>
- <item name="Guidelines" href="/guidelines.html"/>
<item name="Team" href="/team-list.html"/>
<item name="Mailing List" href="/mail-lists.html"/>
<item name="License" href="/license.html"/>
+ <item name="Wiki" href="http://wiki.apache.org/logging"/>
</menu>
<menu name="Products">
<item name="chainsaw" href="/chainsaw/index.html"/>
<item name="log4cxx" href="/log4cxx/index.html"/>
- <item name="log4j" collapse="false">
- <item name="1.2" href="/log4j/1.2/index.html"/>
- <item name="1.3" href="/log4j/1.3/index.html"/>
- <item name="2.0" href="/log4j/2.0/index.html"/>
- <item name="companions" collapse="false">
- <item name="component"
href="/log4j/companions/component/index.html"/>
- <item name="extras"
href="/log4j/companions/extras/index.html"/>
- <item name="receivers"
href="/log4j/companions/receivers/index.html"/>
- <item name="zeroconf"
href="/log4j/companions/zeroconf/index.html"/>
- </item>
- </item>
+ <item name="log4j" href="/log4j/1.2/index.html"/>
+ <item name="log4j companions" collapse="false">
+ <item name="component"
href="/log4j/companions/component/index.html"/>
+ <item name="extras" href="/log4j/companions/extras/index.html"/>
+ <item name="receivers"
href="/log4j/companions/receivers/index.html"/>
+ </item>
<item name="log4net" href="/log4net/index.html"/>
<item name="log4php" href="/log4php/index.html"/>
</menu>
- <menu name="Documentation">
- <item name="Catalog" href="/catalog.html"/>
- <item name="Wiki" href="http://wiki.apache.org/logging"/>
- </menu>
-
- <menu name="Website">
- <item name="Maintenance" href="/maintenance.html"/>
- <item name="Repository" href="/source-repository.html"/>
- </menu>
<menu name="Apache">
<item name="Home" href="http://www.apache.org"/>
Modified: logging/site/trunk/author/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/logging/site/trunk/author/src/site/xdoc/index.xml?rev=952086&r1=952085&r2=952086&view=diff
==============================================================================
--- logging/site/trunk/author/src/site/xdoc/index.xml (original)
+++ logging/site/trunk/author/src/site/xdoc/index.xml Mon Jun 7 04:27:39 2010
@@ -33,8 +33,26 @@
<li><a href="log4net/index.html">log4net</a> for the Microsoft
.NET framework</li>
<li><a href="log4php/index.html">log4php</a> for PHP</li>
</ul>
-
- and a log viewer and analysis tool: <a
href="chainsaw/index.html">Chainsaw</a>.</p>
+ three companions for log4j providing additional capabilities and
+ <a href="chainsaw/index.html">Chainsaw</a>, a log viewer and analysis
tool.</p>
+
+ <p>Apache log4j 2.0 is a development effort, currently in its infancy,
for
+ a log4j designed for Java 5 and concurrency.
+ Design principles, requirements and other development
+ suggestions are collected in the project
+ <a href="http://issues.apache.org/jira/browse/log4j2";>issue tracker</a>.
+ Development discussion occurs on the log4j-dev mailing list.</p>
+
+ <p>Experimental source can be checked out using Subversion:
+
+<pre>
+svn co
http://svn.apache.org/repos/asf/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL
+</pre>
+</p>
+
+
+
+
</section>
<div id="apachecon">
