You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by ca...@apache.org on 2007/07/24 22:18:30 UTC

svn commit: r559190 [2/2] - in /logging/log4cxx/trunk: ./ docs/ examples/ include/ mock/ performance/ simplesocketserver/ src/ src/apr-util/ src/apr-util/ant/ src/apr/ src/apr/ant/ src/assembly/ src/changes/ src/cppunit/ src/cppunit/ant/ src/examples/ ...

Added: logging/log4cxx/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/changes/changes.xml?view=auto&rev=559190
==============================================================================
--- logging/log4cxx/trunk/src/changes/changes.xml (added)
+++ logging/log4cxx/trunk/src/changes/changes.xml Tue Jul 24 13:18:15 2007
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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 log4cxx</title>
+</properties>
+<body>
+<release version="0.10.0" date="2007-07-30" description="First Apache release">
+<action issue="LOGCXX-2">logger.h includes config.h</action>
+<action issue="LOGCXX-3">Missing #else</action>
+<action issue="LOGCXX-4">initialization not working on many OS's</action>
+<action issue="LOGCXX-5">Preprocessor macro WIN32 used instead of _WIN32</action>
+<action issue="LOGCXX-8">Compilation problems using VC5 or VC6 with later Platform SDKs</action>
+<action issue="LOGCXX-10">Conflicting definitions of tchar.h/simulatenous Unicode+MBCS</action>
+<action issue="LOGCXX-11">Timezone may have side-effects</action>
+<action issue="LOGCXX-13">Add branch optimization hint to LOG4CXX_DEBUG macro</action>
+<action issue="LOGCXX-14">add -Wall to compile log4cxx will get many warning</action>
+<action issue="LOGCXX-15">PatternLayout don't use locale time zone,it's use GMT tome zone</action>
+<action issue="LOGCXX-16">Misleading statements in Introduction to log4cxx</action>
+<action issue="LOGCXX-17">Use of non reentrant time functions</action>
+<action issue="LOGCXX-19">Add .cvsignore's to ignore generated files</action>
+<action issue="LOGCXX-21">Add check that libxml2 not libxml has been included</action>
+<action issue="LOGCXX-22">Backslashes in filenames in XML config of FileAppender broken</action>
+<action issue="LOGCXX-23">Unit tests have become stale</action>
+<action issue="LOGCXX-24">Class and module name not available in LogEvent</action>
+<action issue="LOGCXX-25">Add Ant+cpptasks build file</action>
+<action issue="LOGCXX-26">Default initialization is broken</action>
+<action issue="LOGCXX-28">Appender threshold cannot be set in configuration files</action>
+<action issue="LOGCXX-29">Appender attributes are not passed passed to setOption correctly.</action>
+<action issue="LOGCXX-30">StringTokenizer uses evil strtok and wcstok functions</action>
+<action issue="LOGCXX-31">Missing const qualifiers, Exception::getMessage() in particular.</action>
+<action issue="LOGCXX-32">Missing copy constructors and assignment operators</action>
+<action issue="LOGCXX-33">log4cxx::Exception is not derived from std::exception</action>
+<action issue="LOGCXX-34">Visual Studio 6 CVS build broken</action>
+<action issue="LOGCXX-35">Avoid use of MSXML</action>
+<action issue="LOGCXX-36">Migrate to Apache Portable Runtime threads</action>
+<action issue="LOGCXX-37">Unable to build log4cxx under Borland C++</action>
+<action issue="LOGCXX-39">Remove DailyRollingFileAppender</action>
+<action issue="LOGCXX-40">PatternLayout does not support Java date format specifiers</action>
+<action issue="LOGCXX-41">Layout timestamp doesn't seem to adjust for daylight saving</action>
+<action issue="LOGCXX-43">configure/make help needed</action>
+<action issue="LOGCXX-44">GUMP integation</action>
+<action issue="LOGCXX-45">_T causes error : 1048576 cannot be used as a function</action>
+<action issue="LOGCXX-46">Extra semicolon after namespace closing paren</action>
+<action issue="LOGCXX-47">Check headers for missing declarations and Effective C++ violations</action>
+<action issue="LOGCXX-49">Move timezone specification into pattern, remove locale specification</action>
+<action issue="LOGCXX-50">variable name clash in macro</action>
+<action issue="LOGCXX-52">Migrate log4j 1.3 RollingFileAppender</action>
+<action issue="LOGCXX-53">Problems compiling with MsDev 6.0 (space in paths)</action>
+<action issue="LOGCXX-54">Eliminate use of boost-regex in unit tests</action>
+<action issue="LOGCXX-55">DailyRolling File Appender</action>
+<action issue="LOGCXX-56">BasicConfiguration is unreliable</action>
+<action issue="LOGCXX-57">Port log4j performance test</action>
+<action issue="LOGCXX-58">ImmediateFlush'd FileAppenders extremely slow on Windows</action>
+<action issue="LOGCXX-59">Implement encoding support for Writer appender</action>
+<action issue="LOGCXX-63">Platform appropriate line-feed convention</action>
+<action issue="LOGCXX-64">Migrate to APR network IO</action>
+<action issue="LOGCXX-66">SyslogAppender append method currently stubbed out</action>
+<action issue="LOGCXX-68">Client compiles fail if  _WIN32_WINNT</action>
+<action issue="LOGCXX-69">Macro definitions can collide with existing client coding</action>
+<action issue="LOGCXX-70">Logic flaws in StringHelper::startsWith and StringHelper::endsWith</action>
+<action issue="LOGCXX-73">Not loading configuration from log4cxx.properties or log4cxx.xml</action>
+<action issue="LOGCXX-76">user.home, user.dir, java.io.tmpdir available within configuration files</action>
+<action issue="LOGCXX-79">configure check for apr-util</action>
+<action issue="LOGCXX-80">Migrated network appenders to APR network IO</action>
+<action issue="LOGCXX-81">SimpleDateFormat does not compile on Solaris 2.95.2 gcc</action>
+<action issue="LOGCXX-83">log4cxx::Level::ERROR fails to compile when GDI enabled</action>
+<action issue="LOGCXX-88">Explore use of security-enhanced CRT methods</action>
+<action issue="LOGCXX-89">Parent-child logger hierarchy doens't work in some cases</action>
+<action issue="LOGCXX-93">Fail to link application with STLPort</action>
+<action issue="LOGCXX-94">simplesocketserver.cpp should use LOG4CXX_STR("...") not L"..."</action>
+<action issue="LOGCXX-98">Gump build fails for log4cxx-ant-no-wchar-t target</action>
+<action issue="LOGCXX-99">Named PDB files on Windows</action>
+<action issue="LOGCXX-100">Fixes for ODBCAppender</action>
+<action issue="LOGCXX-104">ODBCAppender::close does not check if appender is already closed</action>
+<action issue="LOGCXX-105">Infinite loop in string replacing</action>
+<action issue="LOGCXX-106">maxFileSize has bad type in SizeBasedTriggeringPolicy file</action>
+<action issue="LOGCXX-107">Can't compile log4cxx in ascii on Windows</action>
+<action issue="LOGCXX-108">LevelMatcher don't decide correctly to accept or not the LogEvent</action>
+<action issue="LOGCXX-109">NTEventLogAppender.dll distributed with Log4Cxx is different than the one distributed with Log4J</action>
+<action issue="LOGCXX-110">try fix 64bit log4cxx_intptr_t</action>
+<action issue="LOGCXX-111">make Logger cache a LoggerRepositoryPtr instead of a "blind" pointer</action>
+<action issue="LOGCXX-112">change "static" to "auto" for Transcoder::decode() decoder and CharsetDecoder::getDefaultDecoder() decoder</action>
+<action issue="LOGCXX-113">separate apr detection m4 codes from aclocal.m4</action>
+<action issue="LOGCXX-114">Upgrade APR to 1.2.2 from 1.1.0</action>
+<action issue="LOGCXX-116">SVN head does not compiler with MinGW compiler</action>
+<action issue="LOGCXX-118">Hierarchy corrupts with PropertyConfigurator</action>
+<action issue="LOGCXX-119">ndctestcase not working</action>
+<action issue="LOGCXX-120">Wrong parameter description in Patternlayout</action>
+<action issue="LOGCXX-122">Rolling file appender goes into infinite loop trying to convert backslash to forward slash in file paths</action>
+<action issue="LOGCXX-123">UTF-8 build fails on Linux</action>
+<action issue="LOGCXX-124">wchar_t constructor missing in class NDC</action>
+<action issue="LOGCXX-125">L7dTestCase is stubbed out</action>
+<action issue="LOGCXX-126">std::cout stops working if log4cxx is first to output</action>
+<action issue="LOGCXX-127">Main build.xml not referencing "env" properly.</action>
+<action issue="LOGCXX-128">Passing invalid argument to ::putenv function</action>
+<action issue="LOGCXX-130">Compile fails on gcc4.1</action>
+<action issue="LOGCXX-131">TimeBasedRollingPolicy is declared "abstract"</action>
+<action issue="LOGCXX-132">various segmentation faults in multithreaded application</action>
+<action issue="LOGCXX-133">Missing parenthesis in LOG4CXX_ASSERT</action>
+<action issue="LOGCXX-136">DailyRollingFileAppender not using Property options</action>
+<action issue="LOGCXX-138">XMLLayoutTestCase output and filtered output gets overwritten</action>
+<action issue="LOGCXX-139">XMLLayoutTestCase uses inadequate filters for 64 bit platforms</action>
+<action issue="LOGCXX-140">Handle leak with LoggingEvent::getCurrentThreadName</action>
+<action issue="LOGCXX-141">Upgrade to APR 1.2.7 or later</action>
+<action issue="LOGCXX-143">-xarch=v8plus should be removed from Makefile.in</action>
+<action issue="LOGCXX-146">DailyRollingFileAppender::~DailyRollingFileAppender must call finalize</action>
+<action issue="LOGCXX-149">make dist does not work</action>
+<action issue="LOGCXX-151">Umlauts as literal in patternlayout won't be logged correct</action>
+<action issue="LOGCXX-152">gcc warning about cast from `const void*' to `log4cxx::helpers::Object*' discards qualifiers from pointer target typ</action>
+<action issue="LOGCXX-153">Automate log4cxx site and doxygen generation and deployment</action>
+<action issue="LOGCXX-154">PropertyConfigurator::configure kill application</action>
+<action issue="LOGCXX-155">Update source headers per new ASF header policy</action>
+<action issue="LOGCXX-156">immediate flush in console appender</action>
+<action issue="LOGCXX-157">make install fails since @manual_dest@ replacement is missing in Makefiles</action>
+<action issue="LOGCXX-158">tolower not defined in stringhelper.cpp</action>
+<action issue="LOGCXX-160">helpers/object.h: DECLARE_LOG4CXX_OBJECT macro definition is missing virtual destructor declaration</action>
+<action issue="LOGCXX-161">Using RollingFileAppender increases the working set with each rollover</action>
+<action issue="LOGCXX-162">Problem printing string with embedded NULL character</action>
+<action issue="LOGCXX-164">XMLSocketAppender is disabled</action>
+<action issue="LOGCXX-169">XMLLayoutTestCase fails on compilers that do not provide location info</action>
+<action issue="LOGCXX-180">Build fails at domconfigurator.h</action>
+<action issue="LOGCXX-181">Level::DEBUG and other non-local statics cause crash on app shutdown on AIX</action>
+<action issue="LOGCXX-182">missing man page for simplesocketserver</action>
+<action issue="LOGCXX-187">LogLog::emit() could potentially interleave messages</action>
+<action issue="LOGCXX-188">Upgrade to apr 1.2.9 and apr-util 1.2.8</action>
+</release>
+</body>
+</document>

Added: logging/log4cxx/trunk/src/changes/changes.xslt
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/changes/changes.xslt?view=auto&rev=559190
==============================================================================
--- logging/log4cxx/trunk/src/changes/changes.xslt (added)
+++ logging/log4cxx/trunk/src/changes/changes.xslt Tue Jul 24 13:18:15 2007
@@ -0,0 +1,62 @@
+<!--
+ 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.
+
+-->
+<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xsl:version="1.0">
+
+   <xsl:output method="xml" indent="yes"/>
+
+   <xsl:apply-templates select="/"/>
+
+   <xsl:template match="/">
+  <xsl:comment>
+
+ 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.
+
+  </xsl:comment>
+  <document>
+  <properties>
+    <title>Apache log4cxx</title>
+  </properties>
+  <body>
+  
+    <release version="0.10.0" date="2007-07-30" description="First Apache release">
+       <xsl:apply-templates select='/rss/channel/item'>
+           <xsl:sort select="substring-after(key, '-')" data-type="number"/>
+       </xsl:apply-templates>
+     </release>
+  </body>
+</document>
+</xsl:template>
+
+<xsl:template match="item">
+      <action issue="{key}"><xsl:value-of select="summary"/></action>
+</xsl:template>
+
+</xsl:transform>

Copied: logging/log4cxx/trunk/src/site/apt/download.apt (from r558343, logging/log4j/branches/v1_2-branch/src/site/apt/download.apt)
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/site/apt/download.apt?view=diff&rev=559190&p1=logging/log4j/branches/v1_2-branch/src/site/apt/download.apt&r1=558343&p2=logging/log4cxx/trunk/src/site/apt/download.apt&r2=559190
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/site/apt/download.apt (original)
+++ logging/log4cxx/trunk/src/site/apt/download.apt Tue Jul 24 13:18:15 2007
@@ -13,14 +13,14 @@
 ~~ See the License for the specific language governing permissions and
 ~~ limitations under the License.
  ------
-Download Apache log4j 1.2
+Download Apache log4cxx 0.10.0
  ------
  ------
  ------
 
-Download Apache log4j 1.2.15
+Download Apache log4cxx 0.10.0
 
-  Apache log4j 1.2.15 is distributed under the {{{http://www.apache.org/licenses/LICENSE-2.0.html} Apache License, version 2.0}}.
+  Apache log4cxx 0.10.0 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.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 log4cxx 0.10.0 (tar.gz)      | {{{http://www.apache.org/dyn/closer.cgi/logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.tar.gz} apache-log4cxx-0.10.0.tar.gz}} | {{{http://www.apache.org/dist/logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.tar.gz.md5} apache-log4cxx-0.10.0.tar.gz.md5}} | {{{http://www.apache.org/dist/logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.tar.gz.asc} apache-log4cxx-0.10.0.tar.gz.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}} |
+| Apache log4cxx 0.10.0 (zip)      | {{{http://www.apache.org/dyn/closer.cgi/logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.zip} apache-log4cxx-0.10.0.zip}} | {{{http://www.apache.org/dist/logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.zip.md5} apache-log4cxx-0.10.0.zip.md5}} | {{{http://www.apache.org/dist/logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.zip.asc} apache-log4cxx-0.10.0.zip.asc}} |
 *-------------------------+---------+----------+-----------+
 
   Please read {{{http://httpd.apache.org/dev/verification.html}Verifying Apache HTTP Server Releases}}
@@ -41,4 +41,4 @@
 
 * Previous Releases
 
-  All previous releases of Apache log4j can be found in the {{{http://archive.apache.org/dist/logging/log4j}archive repository}}.
+  All previous releases of Apache log4cxx can be found in the {{{http://archive.apache.org/dist/logging/log4cxx}archive repository}}.

Copied: logging/log4cxx/trunk/src/site/apt/roadmap.apt (from r558343, logging/log4j/branches/v1_2-branch/src/site/apt/roadmap.apt)
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/site/apt/roadmap.apt?view=diff&rev=559190&p1=logging/log4j/branches/v1_2-branch/src/site/apt/roadmap.apt&r1=558343&p2=logging/log4cxx/trunk/src/site/apt/roadmap.apt&r2=559190
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/site/apt/roadmap.apt (original)
+++ logging/log4cxx/trunk/src/site/apt/roadmap.apt Tue Jul 24 13:18:15 2007
@@ -13,14 +13,9 @@
 ~~ See the License for the specific language governing permissions and
 ~~ limitations under the License.
  ------
- log4j 1.2 Roadmap
+ log4cxx 0.10.0 Roadmap
  ------
  ------
  ------
 
-log4j 1.2 Roadmap
-
-  log4j 1.2 is mature and future development on the log4j 1.2 branch
-  is expected to be limited to bug fixes and minor enhancements.
-  Any major new features for log4j 1.2 are likely to be developed
-  as companion products for log4j 1.2.
+TODO

Modified: logging/log4cxx/trunk/src/site/doxy/Doxyfile.in
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/site/doxy/Doxyfile.in?view=diff&rev=559190&r1=558835&r2=559190
==============================================================================
--- logging/log4cxx/trunk/src/site/doxy/Doxyfile.in (original)
+++ logging/log4cxx/trunk/src/site/doxy/Doxyfile.in Tue Jul 24 13:18:15 2007
@@ -209,7 +209,7 @@
 # If set to NO, the detailed description appears after the member 
 # documentation.
 
-DETAILS_AT_TOP         = NO
+DETAILS_AT_TOP         = YES
 
 # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
 # member inherits the documentation from any documented member that it 
@@ -352,10 +352,9 @@
 # with spaces.
 
 INPUT                  = \
-			@top_srcdir@/include \ 
-			@top_srcdir@/src \
-			@top_srcdir@/docs/mainpage.dox \
-			@top_srcdir@/docs/introduction.dox
+			@base_dir@/src/main/include \ 
+			@base_dir@/src/main/cpp \
+			@base_dir@/src/site/doxy/mainpage.dox
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
@@ -437,7 +436,7 @@
 # If the SOURCE_BROWSER tag is set to YES then a list of source files will 
 # be generated. Documented entities will be cross-referenced with these sources.
 
-SOURCE_BROWSER         = NO
+SOURCE_BROWSER         = YES
 
 # Setting the INLINE_SOURCES tag to YES will include the body 
 # of functions and classes directly in the documentation.

Modified: logging/log4cxx/trunk/src/site/doxy/mainpage.dox
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/site/doxy/mainpage.dox?view=diff&rev=559190&r1=558835&r2=559190
==============================================================================
--- logging/log4cxx/trunk/src/site/doxy/mainpage.dox (original)
+++ logging/log4cxx/trunk/src/site/doxy/mainpage.dox Tue Jul 24 13:18:15 2007
@@ -1,8 +1,4 @@
-/** @mainpage
-
-\ref Introduction
-<p>
-\ref LoggingMacros
+/*
 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.
@@ -18,4 +14,9 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 
-*/
\ No newline at end of file
+*/
+/** @mainpage
+
+\ref Introduction
+<p>
+\ref LoggingMacros

Copied: logging/log4cxx/trunk/src/site/site.xml (from r558232, incubator/log4php/trunk/src/site/site.xml)
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/site/site.xml?view=diff&rev=559190&p1=incubator/log4php/trunk/src/site/site.xml&r1=558232&p2=logging/log4cxx/trunk/src/site/site.xml&r2=559190
==============================================================================
--- incubator/log4php/trunk/src/site/site.xml (original)
+++ logging/log4cxx/trunk/src/site/site.xml Tue Jul 24 13:18:15 2007
@@ -15,7 +15,7 @@
  limitations under the License.
 
 -->
-<project name="log4php">
+<project name="log4cxx">
   <bannerLeft>
     <name>Logging Services</name>
     <src>images/ls-logo.jpg</src>
@@ -24,23 +24,21 @@
   <body>
     <breadcrumbs>
       <item name="Apache" href="http://www.apache.org/"/>
-      <item name="Incubator" href="http://incubator.apache.org/"/>
-      <item name="log4php" href="http://incubator.apache.org:80/log4php/"/>
+      <item name="Logging Services" href="http://logging.apache.org/"/>
+      <item name="log4cxx" href="http://logging.apache.org:80/log4cxx/"/>
     </breadcrumbs>
   
-        <menu name="Get log4php">
+        <menu name="Get log4cxx">
            <item name="Download" href="/download.html"/>
            <item name="Changes" href="/changes-report.html"/>
            <item name="License" href="/license.html"/>
         </menu>
 
-        <menu name="About log4php">
-           <item name="What is it?" href="/index.html"/>
-           <item name="Quick start" href="/qsg.html"/>
-           <item name="Usage" href="/usage.html"/>
-           <item name="Roadmap" href="/roadmap.html"/>
-           <item name="PHPDoc" href="/apidocs/index.html"/>
-        </menu>
+	<menu name="About log4cxx">
+	   <item name="What is log4cxx?" href="/index.html"/>
+	   <item name="FAQ" href="/faq.html"/>
+	   <item name="Roadmap" href="/roadmap.html"/>
+	</menu>
 
         <menu name="Community">
                 <item name="Mailing Lists" href="/mail-lists.html"/>
@@ -50,6 +48,13 @@
         <menu name="Development">
                 <item name="Repository" href="/source-repository.html"/>
         </menu>
+
+	<menu name="Documentation">
+		<item name="Introduction" href="/manual.html"/>
+		<item name="API Documentation" href="/apidocs/index.html"/>
+		<item name="Wiki" href="http://wiki.apache.org/logging-log4cxx"/>
+	</menu>
+
 
 	<menu name="Apache">
 		<item name="Home" href="http://www.apache.org"/>	

Copied: logging/log4cxx/trunk/src/site/xdoc/index.xml (from r558835, logging/log4cxx/trunk/xdocs/src/index.xml)
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/site/xdoc/index.xml?view=diff&rev=559190&p1=logging/log4cxx/trunk/xdocs/src/index.xml&r1=558835&p2=logging/log4cxx/trunk/src/site/xdoc/index.xml&r2=559190
==============================================================================
--- logging/log4cxx/trunk/xdocs/src/index.xml (original)
+++ logging/log4cxx/trunk/src/site/xdoc/index.xml Tue Jul 24 13:18:15 2007
@@ -36,35 +36,9 @@
 
                                 <p>
                                         Main concepts of the logging framework are exposed in the
-                                        <a href="manual/Introduction.html">short introduction to log4cxx</a>.
+                                        <a href="manual.html">short introduction to log4cxx</a>.
                                 </p>
 
-                        <h2>Versions:</h2>
-                                <p>log4cxx-0.9.7 can be downloaded from 
-                                       <a href="http://logging.apache.org/site/binindex.html">http://logging.apache.org/site/binindex.html</a>.
-                                      At this point, log4cxx-0.9.7 is substantially out of date, has known
-                                      serious deficiencies that have been resolved in the CVS, and should be avoided
-                                      for new code.  Bug reports are available from 
-                                      <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10550">http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10550</a>.                                      
-                                      Bugs <a href="http://issues.apache.org/jira/browse/LOGCXX-4">LOG4CXX-4</a> and  
-                                      <a href="http://issues.apache.org/jira/browse/LOGCXX-11">LOG4CXX-11</a> are 
-                                      the most likely to encountered by new users.  Due to the substantial architectural
-                                      differences between 0.9.7 and the CVS HEAD, new bug reports against 0.9.7 will be
-                                      given very low priority. 
-                                </p>
-                                
-                                 <p>A new release, tenatively designated 0.9.8, is forthcoming from the CVS HEAD.
-                                     Bug <a href="http://issues.apache.org/jira/browse/LOGCXX-62">LOGCXX-62</a> is
-                                     tracking the remaining blocking issues.  In general, the core 
-                                     has substantially improved of log4cxx-0.9.7 but several appenders have not been
-                                     adapted to the new architecture.  Major changes from log4cxx-0.9.7 include
-                                     use of <a href="http://apr.apache.org">Apache Portable Runtime</a> (APR) for
-                                     threading, networking and other services (<a href="http://issues.apache.org/jira/browse/LOGCXX-36">LOGCXX-36</a>,
-                                       <a href="http://issues.apache.org/jira/browse/LOGCXX-64">LOGCXX-64</a>),
-                                    and simultaneous support for both wide and multibyte messages (
-                                     <a href="http://issues.apache.org/jira/browse/LOGCXX-10">LOGCXX-10</a>).
-                                </p>
-                                
 
                         <h2>Platforms:</h2>
                                 <p>The CVS HEAD is automatically built and tested using the Ant build script