Modified: incubator/log4cxx/branches/latest_stable/src/site/doxy/Makefile.am URL: http://svn.apache.org/viewvc/incubator/log4cxx/branches/latest_stable/src/site/doxy/Makefile.am?rev=1557524&r1=1557523&r2=1557524&view=diff ============================================================================== --- incubator/log4cxx/branches/latest_stable/src/site/doxy/Makefile.am (original) +++ incubator/log4cxx/branches/latest_stable/src/site/doxy/Makefile.am Sun Jan 12 12:44:37 2014 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -EXTRA_DIST = Doxyfile mainpage.dox license_notice_footer.txt +EXTRA_DIST = Doxyfile license_notice_footer.txt # DOC is defined if installer requests doc generation. @@ -61,7 +61,7 @@ endif all-local: dox -@manual_dest@/index.html: Doxyfile mainpage.dox +@manual_dest@/index.html: Doxyfile "@DOXYGEN@" distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)
Modified: incubator/log4cxx/branches/latest_stable/src/site/doxy/license_notice_footer.txt URL: http://svn.apache.org/viewvc/incubator/log4cxx/branches/latest_stable/src/site/doxy/license_notice_footer.txt?rev=1557524&r1=1557523&r2=1557524&view=diff ============================================================================== --- incubator/log4cxx/branches/latest_stable/src/site/doxy/license_notice_footer.txt (original) +++ incubator/log4cxx/branches/latest_stable/src/site/doxy/license_notice_footer.txt Sun Jan 12 12:44:37 2014 @@ -1 +1 @@ -<!-- 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. --> </BODY> </HTML> \ No newline at end of file +<!-- 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. --> </body> </html> \ No newline at end of file Modified: incubator/log4cxx/branches/latest_stable/src/site/resources/css/site.css URL: http://svn.apache.org/viewvc/incubator/log4cxx/branches/latest_stable/src/site/resources/css/site.css?rev=1557524&r1=1557523&r2=1557524&view=diff ============================================================================== --- incubator/log4cxx/branches/latest_stable/src/site/resources/css/site.css (original) +++ incubator/log4cxx/branches/latest_stable/src/site/resources/css/site.css Sun Jan 12 12:44:37 2014 @@ -1,3 +1,5 @@ +@charset "UTF-8"; + /* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,3 +17,7 @@ limitations under the License. */ + +@import url('styles.css'); +@import url('colors.css'); +@import url('img.css'); Modified: incubator/log4cxx/branches/latest_stable/src/site/site.xml URL: http://svn.apache.org/viewvc/incubator/log4cxx/branches/latest_stable/src/site/site.xml?rev=1557524&r1=1557523&r2=1557524&view=diff ============================================================================== --- incubator/log4cxx/branches/latest_stable/src/site/site.xml (original) +++ incubator/log4cxx/branches/latest_stable/src/site/site.xml Sun Jan 12 12:44:37 2014 @@ -15,55 +15,131 @@ limitations under the License. --> -<project name="log4cxx"> - <bannerLeft> - <name>Logging Services</name> - <src>images/ls-logo.jpg</src> - <href>http://logging.apache.org/</href> - </bannerLeft> - <body> - <breadcrumbs> - <item name="Apache" href="http://www.apache.org/"/> - <item name="Logging Services" href="http://logging.apache.org/"/> - <item name="log4cxx" href="http://logging.apache.org:80/log4cxx/"/> - </breadcrumbs> - - <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 log4cxx"> - <item name="What is log4cxx?" href="/index.html"/> - <item name="API Documentation" href="/apidocs/index.html"/> - <item name="FAQ" href="/faq.html"/> - </menu> - - <menu name="Community"> - <item name="Mailing Lists" href="/mail-lists.html"/> - <item name="Issue Tracking" href="/issue-tracking.html"/> - <item name="Wiki" href="http://wiki.apache.org/logging-log4cxx"/> - </menu> - - <menu name="Development"> - <item name="Repository" href="/source-repository.html"/> - - <item name="Building"> - <item name="autotools" href="/building/autotools.html"/> - <item name="Apache Ant" href="/building/ant.html"/> - <item name="Apache Maven 2" href="/building/maven.html"/> - <item name="Microsoft Visual Studio" href="/building/vstudio.html"/> - <item name="Apple Xcode" href="/building/xcode.html"/> - </item> - </menu> - - <menu name="Apache"> - <item name="Home" href="http://www.apache.org"/> - <item name="Sponsorship" href="http://www.apache.org/foundation/sponsorship.html"/> - <item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/> - <item name="Conferences" href="http://www.apachecon.com"/> - </menu> +<project xmlns="http://maven.apache.org/DECORATION/1.4.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"; + name="log4cxx"> + <bannerLeft> + <name>Logging Services</name> + <src>images/logos/ls-logo.jpg</src> + <href>http://logging.apache.org</href> + <title>Open the Apache Logging homepage</title> + </bannerLeft> - </body> + <bannerRight> + <name>Apache Incubator</name> + <src>images/logos/egg-logo.png</src> + <href>http://incubator.apache.org</href> + <title>Open the Apache Incubator homepage</title> + </bannerRight> + + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-default-skin</artifactId> + <version>1.1</version> + </skin> + + <body> + <breadcrumbs> + <item name="Apache" + href="http://www.apache.org/"; + /> + <item name="Logging Services" + href="http://logging.apache.org/"; + /> + <item name="log4cxx" + href="http://incubator.apache.org/log4cxx"; + /> + </breadcrumbs> + + <menu name="About"> + <item name="What is log4cxx?" + href="/index.html" + /> + <item name="Project Information" + href="project-info.html" + /> + <item name="Generated Reports" + href="project-reports.html" + /> + </menu> + + <menu name="Usage"> + <item name="How to use log4cxx?" + href="/usage.html" + /> + <item name="API Documentation" + href="/apidocs/index.html" + /> + <item name="FAQ" + href="/faq.html" + /> + </menu> + + <menu name="Get"> + <item name="Download" + href="/download.html" + /> + <item name="Changes" + href="/changes-report.html" + /> + <item name="License" + href="/license.html" + /> + </menu> + + <menu name="Community"> + <item name="Mailing Lists" + href="/mail-lists.html" + /> + <item name="Issue Tracking" + href="/issue-tracking.html" + /> + <item name="Wiki" + href="http://wiki.apache.org/logging-log4cxx"; + /> + </menu> + + <menu name="Development"> + <item name="Repository" + href="/source-repository.html" + /> + <item name="Dependencies" + href="dependencies.html" + /> + <item name="Building" + href="/building/index.html"> + <item name="autotools" + href="/building/autotools.html" + /> + <item name="Apache Ant" + href="/building/ant.html" + /> + <item name="Apache Maven 2" + href="/building/maven.html" + /> + <item name="Microsoft Visual Studio" + href="/building/vstudio.html" + /> + <item name="Apple Xcode" + href="/building/xcode.html" + /> + </item> + </menu> + + <menu name="Apache"> + <item name="Home" + href="http://www.apache.org"; + /> + <item name="Sponsorship" + href="http://www.apache.org/foundation/sponsorship.html"; + /> + <item name="Thanks" + href="http://www.apache.org/foundation/thanks.html"; + /> + <item name="Conferences" + href="http://www.apachecon.com"; + /> + </menu> + </body> </project> Copied: incubator/log4cxx/branches/latest_stable/src/site/xdoc/usage.xml (from r1556204, incubator/log4cxx/trunk/src/site/xdoc/usage.xml) URL: http://svn.apache.org/viewvc/incubator/log4cxx/branches/latest_stable/src/site/xdoc/usage.xml?p2=incubator/log4cxx/branches/latest_stable/src/site/xdoc/usage.xml&p1=incubator/log4cxx/trunk/src/site/xdoc/usage.xml&r1=1556204&r2=1557524&rev=1557524&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/site/xdoc/usage.xml (original) +++ incubator/log4cxx/branches/latest_stable/src/site/xdoc/usage.xml Sun Jan 12 12:44:37 2014 @@ -75,9 +75,9 @@ </ol> <p> - Invoking the class static <a href="apidocs/classlog4cxx_1_1Logger.html#e3">log4cxx::Logger::getRootLogger</a> + Invoking the class static <a href="apidocs/classlog4cxx_1_1_logger.html#afc0e4d99cab7c38a2851d41e6edc1dee">log4cxx::Logger::getRootLogger</a> method retrieves it. All other loggers are instantiated and retrieved with the class static - <a href="apidocs/classlog4cxx_1_1Logger.html#e0">log4cxx::Logger::getLogger</a> + <a href="apidocs/classlog4cxx_1_1_logger.html#a76017df17da02bc11bfe50e47de703a3">log4cxx::Logger::getLogger</a> method. This method takes the name of the desired logger as a parameter. Some of the basic methods in the Logger class are listed below. </p> @@ -111,7 +111,7 @@ namespace log4cxx { <p> Loggers <em>may</em> be assigned levels. The pre-defined levels: TRACE, DEBUG, INFO, WARN, ERROR and FATAL are defined in the - <code> <a href="apidocs/classlog4cxx_1_1Level.html">log4cxx::Level</a></code> + <code> <a href="apidocs/classlog4cxx_1_1_level.html">log4cxx::Level</a></code> class which provides accessor functions. </p> @@ -125,12 +125,9 @@ namespace log4cxx { <dt><strong>Level Inheritance</strong></dt> <dd> - <p> - The <em>inherited level</em> for a given logger - <i>C</i>, is equal to the first non-null level in the logger - hierarchy, starting at <i>C</i> and proceeding upwards in the - hierarchy towards the <code>root</code> logger. - </p> + The <em>inherited level</em> for a given logger <i>C</i>, is equal to the + first non-null level in the logger hierarchy, starting at <i>C</i> and + proceeding upwards in the hierarchy towards the <code>root</code> logger. </dd> </dl> @@ -321,11 +318,9 @@ LOG4CXX_WARN(logger, L"" << i < <dt><strong>Basic Selection Rule</strong></dt> <dd> - <p> - A log request of level <i>p</i> in a logger with - (either assigned or inherited, whichever is appropriate) level <i>q</i>, is enabled if <i> p >= - q</i>. - </p> + A log request of level <i>p</i> in a logger with (either assigned or + inherited, whichever is appropriate) level <i>q</i>, is enabled if + <i>p >= q</i>. </dd> </dl> @@ -423,18 +418,18 @@ log4cxx::LoggerPtr y = log4cxx::Logger:: on their logger is only part of the picture. Log4cxx allows logging requests to print to multiple destinations. In log4cxx speak, an output destination is called an <em>appender</em>. Currently, appenders exist - for the <a href="apidocs/classlog4cxx_1_1ConsoleAppender.html">console</a>, - <a href="apidocs/classlog4cxx_1_1FileAppender.html">files</a>, GUI - components, <a href="apidocs/classlog4cxx_1_1net_1_1SocketAppender.html">remote socket</a> - servers, <a href="apidocs/classlog4cxx_1_1nt_1_1NTEventLogAppender.html"> NT Event Loggers</a>, and remote UNIX - <a href="apidocs/classlog4cxx_1_1net_1_1SyslogAppender.html">Syslog</a> - daemons. It is also possible to log <a href="apidocs/classlog4cxx_1_1AsyncAppender.html">asynchronously</a>. + for the <a href="apidocs/classlog4cxx_1_1_console_appender.html">console</a>, + <a href="apidocs/classlog4cxx_1_1_file_appender.html">files</a>, GUI + components, <a href="apidocs/classlog4cxx_1_1net_1_1_socket_appender.html">remote socket</a> + servers, <a href="apidocs/classlog4cxx_1_1nt_1_1_n_t_event_log_appender.html"> NT Event Loggers</a>, and remote UNIX + <a href="apidocs/classlog4cxx_1_1net_1_1_syslog_appender.html">Syslog</a> + daemons. It is also possible to log <a href="apidocs/classlog4cxx_1_1_async_appender.html">asynchronously</a>. </p> <p>More than one appender can be attached to a logger.</p> <p> - The <a href="apidocs/classlog4cxx_1_1Logger.html#a3">addAppender</a> + The <a href="apidocs/classlog4cxx_1_1_logger.html#a7c0629acee8dbd1251474bea15d7c9e2">addAppender</a> method adds an appender to a given logger. <strong> @@ -447,7 +442,7 @@ log4cxx::LoggerPtr y = log4cxx::Logger:: is added to a logger, say <em>C</em>, then enabled logging requests for <em>C</em> and <em>C</em>'s children will print on a file <em>and</em> on the console. It is possible to override this default behavior so that appender accumulation is no longer additive - by <a href="apidocs/classlog4cxx_1_1Logger.html#a46">setting the additivity flag</a> to + by <a href="apidocs/classlog4cxx_1_1_logger.html#a80f9397947dba9071ad485f178257c17">setting the additivity flag</a> to <code>false</code>. </p> @@ -457,23 +452,14 @@ log4cxx::LoggerPtr y = log4cxx::Logger:: <dt><strong>Appender Additivity</strong></dt> <dd> - <p> - The output of a log statement of logger <i>C</i> will - go to all the appenders in <i>C</i> and its ancestors. This is - the meaning of the term "appender additivity". - </p> - - <p> - However, if an ancestor of logger <i>C</i>, say <i>P</i>, - has the additivity flag set to <code>false</code>, then - <i>C</i>'s output will be directed to all the appenders in - <i>C</i> and it's ancestors upto and including <i>P</i> but - not the appenders in any of the ancestors of <i>P</i>. - </p> - - <p> - Loggers have their additivity flag set to <code>true</code> by default. - </p> + The output of a log statement of logger <i>C</i> will go to all the appenders + in <i>C</i> and its ancestors. This is the meaning of the term "appender + additivity". However, if an ancestor of logger <i>C</i>, say <i>P</i>, has the + additivity flag set to <code>false</code>, then <i>C</i>'s output will be + directed to all the appenders in <i>C</i> and it's ancestors up to and + including <i>P</i> but, not the appenders in any of the ancestors of <i>P</i>. + <br /><br /> + Loggers have their additivity flag set to <code>true</code> by default. </dd> </dl> @@ -552,7 +538,7 @@ log4cxx::LoggerPtr y = log4cxx::Logger:: </p> <p> - The <a href="apidocs/classlog4cxx_1_1PatternLayout.html">PatternLayout</a>, part + The <a href="apidocs/classlog4cxx_1_1_pattern_layout.html">PatternLayout</a>, part of the standard log4cxx distribution, lets the user specify the output format according to conversion patterns similar to the C language <code>printf</code> function. @@ -673,11 +659,11 @@ void Bar::doIt() { }</pre> <p> - The invocation of the <a href="apidocs/classlog4cxx_1_1BasicConfigurator.html#e0">BasicConfigurator::configure</a> + The invocation of the <a href="apidocs/classlog4cxx_1_1_basic_configurator.html#a4f96a09e1372664e3556ce94ace4a70c">BasicConfigurator::configure</a> method creates a rather simple log4cxx setup. This method is hardwired - to add to the root logger a <a href="apidocs/classlog4cxx_1_1ConsoleAppender.html"> + to add to the root logger a <a href="apidocs/classlog4cxx_1_1_console_appender.html"> ConsoleAppender</a>. The output will be formatted using a - <a href="apidocs/classlog4cxx_1_1PatternLayout.html">PatternLayout</a> set + <a href="apidocs/classlog4cxx_1_1_pattern_layout.html">PatternLayout</a> set to the pattern "%-4r [%t] %-5p %c %x - %m%n". </p>
