Author: carnold
Date: Thu Sep 20 15:46:03 2007
New Revision: 577950
URL: http://svn.apache.org/viewvc?rev=577950&view=rev
Log:
LOGCXX-87: Remove remaining uses of Category and Priority
Added:
logging/log4cxx/trunk/src/main/cpp/defaultloggerfactory.cpp
- copied, changed from r577446,
logging/log4cxx/trunk/src/main/cpp/defaultcategoryfactory.cpp
logging/log4cxx/trunk/src/main/cpp/rootlogger.cpp
- copied, changed from r577446,
logging/log4cxx/trunk/src/main/cpp/rootcategory.cpp
logging/log4cxx/trunk/src/main/include/log4cxx/defaultloggerfactory.h
- copied, changed from r577446,
logging/log4cxx/trunk/src/main/include/log4cxx/defaultcategoryfactory.h
logging/log4cxx/trunk/src/main/include/log4cxx/spi/rootlogger.h
- copied, changed from r577446,
logging/log4cxx/trunk/src/main/include/log4cxx/spi/rootcategory.h
Removed:
logging/log4cxx/trunk/src/main/cpp/defaultcategoryfactory.cpp
logging/log4cxx/trunk/src/main/cpp/rootcategory.cpp
logging/log4cxx/trunk/src/main/include/log4cxx/defaultcategoryfactory.h
logging/log4cxx/trunk/src/main/include/log4cxx/spi/rootcategory.h
Modified:
logging/log4cxx/trunk/src/main/cpp/Makefile.am
logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp
logging/log4cxx/trunk/src/main/cpp/hierarchy.cpp
logging/log4cxx/trunk/src/main/cpp/htmllayout.cpp
logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp
logging/log4cxx/trunk/src/main/cpp/logmanager.cpp
logging/log4cxx/trunk/src/main/cpp/nameabbreviator.cpp
logging/log4cxx/trunk/src/main/cpp/propertyconfigurator.cpp
logging/log4cxx/trunk/src/main/include/log4cxx/logger.h
logging/log4cxx/trunk/src/main/include/log4cxx/ndc.h
logging/log4cxx/trunk/src/main/include/log4cxx/patternlayout.h
logging/log4cxx/trunk/src/main/include/log4cxx/propertyconfigurator.h
logging/log4cxx/trunk/src/main/include/log4cxx/simplelayout.h
logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggingevent.h
logging/log4cxx/trunk/src/main/include/log4cxx/ttcclayout.h
logging/log4cxx/trunk/src/main/include/log4cxx/xml/domconfigurator.h
logging/log4cxx/trunk/src/test/cpp/customlogger/xlogger.h
logging/log4cxx/trunk/src/test/cpp/loggertestcase.cpp
logging/log4cxx/trunk/src/test/cpp/minimumtestcase.cpp
Modified: logging/log4cxx/trunk/src/main/cpp/Makefile.am
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/Makefile.am?rev=577950&r1=577949&r2=577950&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/Makefile.am (original)
+++ logging/log4cxx/trunk/src/main/cpp/Makefile.am Thu Sep 20 15:46:03 2007
@@ -45,7 +45,7 @@
dateformat.cpp \
datelayout.cpp \
datepatternconverter.cpp \
- defaultcategoryfactory.cpp \
+ defaultloggerfactory.cpp \
defaultconfigurator.cpp \
domconfigurator.cpp \
exception.cpp \
@@ -123,7 +123,7 @@
rollingpolicy.cpp \
rollingpolicybase.cpp \
rolloverdescription.cpp \
- rootcategory.cpp \
+ rootlogger.cpp \
serversocket.cpp \
simpledateformat.cpp \
simplelayout.cpp \
Copied: logging/log4cxx/trunk/src/main/cpp/defaultloggerfactory.cpp (from
r577446, logging/log4cxx/trunk/src/main/cpp/defaultcategoryfactory.cpp)
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/defaultloggerfactory.cpp?p2=logging/log4cxx/trunk/src/main/cpp/defaultloggerfactory.cpp&p1=logging/log4cxx/trunk/src/main/cpp/defaultcategoryfactory.cpp&r1=577446&r2=577950&rev=577950&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/defaultcategoryfactory.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/defaultloggerfactory.cpp Thu Sep 20
15:46:03 2007
@@ -15,14 +15,14 @@
* limitations under the License.
*/
#include <log4cxx/logstring.h>
-#include <log4cxx/defaultcategoryfactory.h>
+#include <log4cxx/defaultloggerfactory.h>
#include <log4cxx/logger.h>
using namespace log4cxx;
-IMPLEMENT_LOG4CXX_OBJECT(DefaultCategoryFactory)
+IMPLEMENT_LOG4CXX_OBJECT(DefaultLoggerFactory)
-LoggerPtr DefaultCategoryFactory::makeNewLoggerInstance(
+LoggerPtr DefaultLoggerFactory::makeNewLoggerInstance(
log4cxx::helpers::Pool& pool,
const LogString& name) const
{
Modified: logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp?rev=577950&r1=577949&r2=577950&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp Thu Sep 20 15:46:03
2007
@@ -33,7 +33,7 @@
#include <log4cxx/config/propertysetter.h>
#include <log4cxx/spi/errorhandler.h>
#include <log4cxx/spi/loggerfactory.h>
-#include <log4cxx/defaultcategoryfactory.h>
+#include <log4cxx/defaultloggerfactory.h>
#include <log4cxx/helpers/filewatchdog.h>
#include <log4cxx/helpers/synchronized.h>
#include <log4cxx/spi/loggerrepository.h>
@@ -332,20 +332,20 @@
}
/**
-Used internally to parse an category element.
+Used internally to parse an category or logger element.
*/
void DOMConfigurator::parseLogger(apr_xml_elem* loggerElement,
apr_xml_doc* doc,
AppenderMap& appenders)
{
- // Create a new org.apache.log4j.Category object from the <category>
element.
+ // Create a new Logger object from the <category> element.
LogString loggerName = subst(getAttribute(loggerElement, NAME_ATTR));
LogLog::debug(LOG4CXX_STR("Retreiving an instance of Logger."));
LoggerPtr logger = repository->getLogger(loggerName, loggerFactory);
- // Setting up a category needs to be an atomic operation, in order
- // to protect potential log operations while category
+ // Setting up a logger needs to be an atomic operation, in order
+ // to protect potential log operations while logger
// configuration is in progress.
synchronized sync(logger->getMutex());
bool additivity = OptionConverter::toBoolean(
@@ -368,7 +368,7 @@
if(className.empty())
{
LogLog::error(LOG4CXX_STR("Logger Factory tag class attribute
not found."));
- LogLog::debug(LOG4CXX_STR("No Category Logger configured."));
+ LogLog::debug(LOG4CXX_STR("No Logger Factory configured."));
}
else
{
@@ -391,12 +391,12 @@
}
/**
- Used internally to parse the roor category element.
+ Used internally to parse the root logger element.
*/
void DOMConfigurator::parseRoot(apr_xml_elem* rootElement, apr_xml_doc* doc,
AppenderMap& appenders)
{
LoggerPtr root = repository->getRootLogger();
- // category configuration needs to be atomic
+ // logger configuration needs to be atomic
synchronized sync(root->getMutex());
parseChildrenOfLoggerElement(rootElement, root, true, doc, appenders);
}
@@ -661,7 +661,7 @@
msg.append(LOG4CXX_STR("..."));
LogLog::debug(msg);
- loggerFactory = new DefaultCategoryFactory();
+ loggerFactory = new DefaultLoggerFactory();
Pool p;
apr_file_t *fd;
Modified: logging/log4cxx/trunk/src/main/cpp/hierarchy.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/hierarchy.cpp?rev=577950&r1=577949&r2=577950&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/hierarchy.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/hierarchy.cpp Thu Sep 20 15:46:03 2007
@@ -18,7 +18,7 @@
#include <log4cxx/logstring.h>
#include <log4cxx/spi/loggerfactory.h>
#include <log4cxx/hierarchy.h>
-#include <log4cxx/defaultcategoryfactory.h>
+#include <log4cxx/defaultloggerfactory.h>
#include <log4cxx/logger.h>
#include <log4cxx/spi/hierarchyeventlistener.h>
#include <log4cxx/level.h>
@@ -30,7 +30,7 @@
#include <log4cxx/helpers/stringhelper.h>
#include <log4cxx/helpers/aprinitializer.h>
#include <log4cxx/defaultconfigurator.h>
-#include <log4cxx/spi/rootcategory.h>
+#include <log4cxx/spi/rootlogger.h>
#include <apr_atomic.h>
#include "assert.h"
@@ -46,9 +46,9 @@
mutex(pool)
{
synchronized sync(mutex);
- root = new RootCategory(pool, Level::getDebug());
+ root = new RootLogger(pool, Level::getDebug());
root->setHierarchy(this);
- defaultFactory = new DefaultCategoryFactory();
+ defaultFactory = new DefaultLoggerFactory();
emittedNoAppenderWarning = false;
configured = false;
thresholdInt = Level::ALL_INT;
Modified: logging/log4cxx/trunk/src/main/cpp/htmllayout.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/htmllayout.cpp?rev=577950&r1=577949&r2=577950&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/htmllayout.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/htmllayout.cpp Thu Sep 20 15:46:03 2007
@@ -101,7 +101,7 @@
output.append(LOG4CXX_STR("<td title=\""));
output.append(event->getLoggerName());
- output.append(LOG4CXX_STR(" category\">"));
+ output.append(LOG4CXX_STR(" logger\">"));
Transform::appendEscapingTags(output, event->getLoggerName());
output.append(LOG4CXX_STR("</td>") LOG4CXX_EOL);
@@ -166,7 +166,7 @@
output.append(LOG4CXX_STR("<th>Time</th>") LOG4CXX_EOL);
output.append(LOG4CXX_STR("<th>Thread</th>") LOG4CXX_EOL);
output.append(LOG4CXX_STR("<th>Level</th>") LOG4CXX_EOL);
- output.append(LOG4CXX_STR("<th>Category</th>") LOG4CXX_EOL);
+ output.append(LOG4CXX_STR("<th>Logger</th>") LOG4CXX_EOL);
if(locationInfo)
{
output.append(LOG4CXX_STR("<th>File:Line</th>") LOG4CXX_EOL);
Modified: logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp?rev=577950&r1=577949&r2=577950&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp Thu Sep 20 15:46:03 2007
@@ -217,8 +217,8 @@
void LoggingEvent::read(const helpers::SocketInputStreamPtr& /* is */)
{
#if 0
- // fqnOfCategoryClass
- is->read(fqnOfCategoryClass);
+ // fqnOfLoggerClass
+ is->read(fqnOfLoggerClass);
// name
LogString name;
@@ -325,8 +325,8 @@
void LoggingEvent::write(helpers::SocketOutputStreamPtr& /* os */) const
{
#if 0
- // fqnOfCategoryClass
- os->write(fqnOfCategoryClass);
+ // fqnOfLoggerClass
+ os->write(fqnOfLoggerClass);
// name
os->write(logger->getName());
Modified: logging/log4cxx/trunk/src/main/cpp/logmanager.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/logmanager.cpp?rev=577950&r1=577949&r2=577950&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/logmanager.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/logmanager.cpp Thu Sep 20 15:46:03 2007
@@ -18,7 +18,7 @@
#include <log4cxx/logmanager.h>
#include <log4cxx/spi/defaultrepositoryselector.h>
#include <log4cxx/hierarchy.h>
-#include <log4cxx/spi/rootcategory.h>
+#include <log4cxx/spi/rootlogger.h>
#include <log4cxx/spi/loggerfactory.h>
#include <stdexcept>
#include <log4cxx/level.h>
Modified: logging/log4cxx/trunk/src/main/cpp/nameabbreviator.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/nameabbreviator.cpp?rev=577950&r1=577949&r2=577950&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/nameabbreviator.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/nameabbreviator.cpp Thu Sep 20 15:46:03
2007
@@ -89,7 +89,7 @@
void abbreviate(LogString::size_type nameStart, LogString& buf) const {
// We substract 1 from 'len' when assigning to 'end' to avoid out of
// bounds exception in return r.substring(end+1, len). This can happen if
- // precision is 1 and the category name ends with a dot.
+ // precision is 1 and the logger name ends with a dot.
LogString::size_type end = buf.length() - 1;
for (LogString::size_type i = count; i > 0; i--) {
Modified: logging/log4cxx/trunk/src/main/cpp/propertyconfigurator.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/propertyconfigurator.cpp?rev=577950&r1=577949&r2=577950&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/propertyconfigurator.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/propertyconfigurator.cpp Thu Sep 20
15:46:03 2007
@@ -24,7 +24,7 @@
#include <log4cxx/logmanager.h>
#include <log4cxx/helpers/optionconverter.h>
#include <log4cxx/level.h>
-#include <log4cxx/defaultcategoryfactory.h>
+#include <log4cxx/defaultloggerfactory.h>
#include <log4cxx/helpers/stringhelper.h>
#include <log4cxx/appender.h>
#include <log4cxx/logger.h>
@@ -74,7 +74,7 @@
PropertyConfigurator::PropertyConfigurator()
-: loggerFactory(new DefaultCategoryFactory())
+: loggerFactory(new DefaultLoggerFactory())
{
}
@@ -154,7 +154,7 @@
+ LOG4CXX_STR("]."));
}
- configureRootCategory(properties, hierarchy);
+ configureRootLogger(properties, hierarchy);
configureLoggerFactory(properties);
parseCatsAndRenderers(properties, hierarchy);
@@ -174,7 +174,7 @@
if (!factoryClassName.empty())
{
- LogString msg(LOG4CXX_STR("Setting category factory to ["));
+ LogString msg(LOG4CXX_STR("Setting logger factory to ["));
msg += factoryClassName;
msg += LOG4CXX_STR("].");
LogLog::debug(msg);
@@ -187,7 +187,7 @@
}
}
-void PropertyConfigurator::configureRootCategory(helpers::Properties& props,
+void PropertyConfigurator::configureRootLogger(helpers::Properties& props,
spi::LoggerRepositoryPtr& hierarchy)
{
static const LogString
ROOT_CATEGORY_PREFIX(LOG4CXX_STR("log4j.rootCategory"));
@@ -214,7 +214,7 @@
synchronized sync(root->getMutex());
static const LogString INTERNAL_ROOT_NAME(LOG4CXX_STR("root"));
- parseCategory(props, root, effectiveFrefix,
INTERNAL_ROOT_NAME, value);
+ parseLogger(props, root, effectiveFrefix, INTERNAL_ROOT_NAME,
value);
}
}
@@ -249,7 +249,7 @@
LoggerPtr logger = hierarchy->getLogger(loggerName,
loggerFactory);
synchronized sync(logger->getMutex());
- parseCategory(props, logger, key, loggerName, value);
+ parseLogger(props, logger, key, loggerName, value);
parseAdditivityForLogger(props, logger, loggerName);
}
}
@@ -280,9 +280,9 @@
}
/**
- This method must work for the root category as well.
+ This method must work for the root logger as well.
*/
-void PropertyConfigurator::parseCategory(
+void PropertyConfigurator::parseLogger(
helpers::Properties& props, LoggerPtr& logger, const LogString& /*
optionKey */,
const LogString& loggerName, const LogString& value)
{
@@ -309,9 +309,9 @@
+ levelStr + LOG4CXX_STR("]."));
- // If the level value is inherited, set category level value to
+ // If the level value is inherited, set logger level value to
// null. We also check that the user has not specified
inherited for the
- // root category.
+ // root logger.
if (StringHelper::equalsIgnoreCase(levelStr,
LOG4CXX_STR("INHERITED"), LOG4CXX_STR("inherited"))
|| StringHelper::equalsIgnoreCase(levelStr,
LOG4CXX_STR("NULL"), LOG4CXX_STR("null")))
{
Copied: logging/log4cxx/trunk/src/main/cpp/rootlogger.cpp (from r577446,
logging/log4cxx/trunk/src/main/cpp/rootcategory.cpp)
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/rootlogger.cpp?p2=logging/log4cxx/trunk/src/main/cpp/rootlogger.cpp&p1=logging/log4cxx/trunk/src/main/cpp/rootcategory.cpp&r1=577446&r2=577950&rev=577950&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/rootcategory.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/rootlogger.cpp Thu Sep 20 15:46:03 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
#include <log4cxx/logstring.h>
-#include <log4cxx/spi/rootcategory.h>
+#include <log4cxx/spi/rootlogger.h>
#include <log4cxx/helpers/loglog.h>
#include <log4cxx/level.h>
#include <log4cxx/appender.h>
@@ -24,18 +24,18 @@
using namespace log4cxx::spi;
using namespace log4cxx::helpers;
-RootCategory::RootCategory(Pool& pool, const LevelPtr& level1) :
+RootLogger::RootLogger(Pool& pool, const LevelPtr& level1) :
Logger(pool, LOG4CXX_STR("root"))
{
setLevel(level1);
}
-const LevelPtr& RootCategory::getEffectiveLevel() const
+const LevelPtr& RootLogger::getEffectiveLevel() const
{
return level;
}
-void RootCategory::setLevel(const LevelPtr& level1)
+void RootLogger::setLevel(const LevelPtr& level1)
{
if(level1 == 0)
{
Copied: logging/log4cxx/trunk/src/main/include/log4cxx/defaultloggerfactory.h
(from r577446,
logging/log4cxx/trunk/src/main/include/log4cxx/defaultcategoryfactory.h)
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/defaultloggerfactory.h?p2=logging/log4cxx/trunk/src/main/include/log4cxx/defaultloggerfactory.h&p1=logging/log4cxx/trunk/src/main/include/log4cxx/defaultcategoryfactory.h&r1=577446&r2=577950&rev=577950&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/defaultcategoryfactory.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/defaultloggerfactory.h Thu
Sep 20 15:46:03 2007
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _LOG4CXX_DEFAULT_CATEGORY_FACTORY_H
-#define _LOG4CXX_DEFAULT_CATEGORY_FACTORY_H
+#ifndef _LOG4CXX_DEFAULT_LOGGER_FACTORY_H
+#define _LOG4CXX_DEFAULT_LOGGER_FACTORY_H
#include <log4cxx/spi/loggerfactory.h>
#include <log4cxx/helpers/objectimpl.h>
@@ -26,12 +26,12 @@
class Logger;
typedef helpers::ObjectPtrT<Logger> LoggerPtr;
- class LOG4CXX_EXPORT DefaultCategoryFactory :
+ class LOG4CXX_EXPORT DefaultLoggerFactory :
public virtual spi::LoggerFactory,
public virtual helpers::ObjectImpl
{
public:
- DECLARE_ABSTRACT_LOG4CXX_OBJECT(DefaultCategoryFactory)
+ DECLARE_ABSTRACT_LOG4CXX_OBJECT(DefaultLoggerFactory)
BEGIN_LOG4CXX_CAST_MAP()
LOG4CXX_CAST_ENTRY(spi::LoggerFactory)
END_LOG4CXX_CAST_MAP()
@@ -42,4 +42,4 @@
};
} // namespace log4cxx
-#endif //_LOG4CXX_DEFAULT_CATEGORY_FACTORY_H
+#endif //_LOG4CXX_DEFAULT_LOGGER_FACTORY_H
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/logger.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/logger.h?rev=577950&r1=577949&r2=577950&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/logger.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/logger.h Thu Sep 20 15:46:03
2007
@@ -94,7 +94,7 @@
bool additive;
protected:
- friend class DefaultCategoryFactory;
+ friend class DefaultLoggerFactory;
/**
This constructor created a new <code>logger</code> instance and
@@ -325,7 +325,7 @@
protected:
/**
Returns the string resource coresponding to <code>key</code> in this
- category's inherited resource bundle.
+ logger's inherited resource bundle.
If the resource cannot be found, then an [EMAIL PROTECTED] #error
error} message
will be logged complaining about the missing resource.
@@ -357,7 +357,7 @@
void info(const std::string& msg);
/**
- Is the appender passed as parameter attached to this category?
+ Is the appender passed as parameter attached to this logger?
*/
bool isAttached(const AppenderPtr& appender) const;
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/ndc.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/ndc.h?rev=577950&r1=577949&r2=577950&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/ndc.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/ndc.h Thu Sep 20 15:46:03
2007
@@ -77,7 +77,7 @@
context for the current thread without any user intervention.
hence, even if a servlet is serving multiple clients
simultaneously, the logs emanating from the same code (belonging to
- the same category) can still be distinguished because each client
+ the same logger) can still be distinguished because each client
request will have a different ndc tag.
<p>heavy duty systems should call the #remove method when
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/patternlayout.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/patternlayout.h?rev=577950&r1=577949&r2=577950&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/patternlayout.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/patternlayout.h Thu Sep 20
15:46:03 2007
@@ -47,7 +47,7 @@
<p>Each conversion specifier starts with a percent sign (\%) and is
followed by optional <em>format modifiers</em> and a <em>conversion
character</em>. The conversion character specifies the type of
- data, e.g. logger, priority, date, thread name. The format
+ data, e.g. logger, level, date, thread name. The format
modifiers control such things as field width, padding, left and
right justification. The following is a simple example.
@@ -69,7 +69,7 @@
conversion specifiers. The pattern parser knows when it has reached
the end of a conversion specifier when it reads a conversion
character. In the example above the conversion specifier
- <b>\%-5p</b> means the priority of the logging event should be left
+ <b>\%-5p</b> means the level of the logging event should be left
justified to a width of five characters.
The recognized conversion characters are
@@ -158,7 +158,7 @@
<tr>
<td align=center><b>p</b></td>
- <td>Used to output the level(priority) of the logging event.</td>
+ <td>Used to output the level of the logging event.</td>
</tr>
<tr>
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/propertyconfigurator.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/propertyconfigurator.h?rev=577950&r1=577949&r2=577950&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/propertyconfigurator.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/propertyconfigurator.h Thu
Sep 20 15:46:03 2007
@@ -343,7 +343,7 @@
*/
void configureLoggerFactory(helpers::Properties& props);
- void configureRootCategory(helpers::Properties& props,
+ void configureRootLogger(helpers::Properties& props,
spi::LoggerRepositoryPtr& hierarchy);
/**
@@ -361,7 +361,7 @@
/**
This method must work for the root logger as well.
*/
- void parseCategory(
+ void parseLogger(
helpers::Properties& props, LoggerPtr& logger,
const LogString& optionKey, const LogString& loggerName,
const LogString& value);
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/simplelayout.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/simplelayout.h?rev=577950&r1=577949&r2=577950&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/simplelayout.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/simplelayout.h Thu Sep 20
15:46:03 2007
@@ -52,8 +52,6 @@
<code>message</code>. For example, <pre> INFO - "A message"
</pre>
- <p>The <code>category</code> parameter is ignored.
- <p>
@return A byte array in SimpleLayout format.
*/
virtual void format(LogString& output,
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggingevent.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggingevent.h?rev=577950&r1=577949&r2=577950&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggingevent.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggingevent.h Thu Sep
20 15:46:03 2007
@@ -187,9 +187,9 @@
public:
/**
- * Fully qualified name of the calling category class.
+ * Fully qualified name of the calling logger class.
*/
- LogString fqnOfCategoryClass;
+ LogString fqnOfLoggerClass;
private:
/**
Copied: logging/log4cxx/trunk/src/main/include/log4cxx/spi/rootlogger.h (from
r577446, logging/log4cxx/trunk/src/main/include/log4cxx/spi/rootcategory.h)
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/spi/rootlogger.h?p2=logging/log4cxx/trunk/src/main/include/log4cxx/spi/rootlogger.h&p1=logging/log4cxx/trunk/src/main/include/log4cxx/spi/rootcategory.h&r1=577446&r2=577950&rev=577950&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/rootcategory.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/rootlogger.h Thu Sep 20
15:46:03 2007
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _LOG4CXX_SPI_ROOT_CATEGORY_H
-#define _LOG4CXX_SPI_ROOT_CATEGORY_H
+#ifndef _LOG4CXX_SPI_ROOT_LOGGER_H
+#define _LOG4CXX_SPI_ROOT_LOGGER_H
#include <log4cxx/logger.h>
@@ -25,7 +25,7 @@
namespace spi
{
/**
- RootCategory sits at the top of the logger hierachy. It is a
+ RootLogger sits at the top of the logger hierachy. It is a
regular logger except that it provides several guarantees.
<p>First, it cannot be assigned a null
@@ -33,23 +33,23 @@
#getEffectiveLevel method always returns the value of the
level field without walking the hierarchy.
*/
- class LOG4CXX_EXPORT RootCategory : public Logger
+ class LOG4CXX_EXPORT RootLogger : public Logger
{
public:
/**
The root logger names itself as "root". However, the root
logger cannot be retrieved by name.
*/
- RootCategory(log4cxx::helpers::Pool& pool, const LevelPtr& level);
+ RootLogger(log4cxx::helpers::Pool& pool, const LevelPtr& level);
/**
- Return the assigned level value without walking the category
+ Return the assigned level value without walking the logger
hierarchy.
*/
virtual const LevelPtr& getEffectiveLevel() const;
/**
- Setting a null value to the level of the root category
may have catastrophic
+ Setting a null value to the level of the root logger
may have catastrophic
results. We prevent this here.
*/
void setLevel(const LevelPtr& level);
@@ -57,4 +57,4 @@
} // namespace spi
} // namespace log4cxx
-#endif //_LOG4CXX_SPI_ROOT_CATEGORY_H
+#endif //_LOG4CXX_SPI_ROOT_LOGGER_H
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/ttcclayout.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/ttcclayout.h?rev=577950&r1=577949&r2=577950&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/ttcclayout.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/ttcclayout.h Thu Sep 20
15:46:03 2007
@@ -26,7 +26,7 @@
typedef helpers::ObjectPtrT<TTCCLayout> TTCCLayoutPtr;
/**
- TTCC layout format consists of time, thread, category and nested
+ TTCC layout format consists of time, thread, logger name and nested
diagnostic context information, hence the name.
<p>Each of the four fields can be individually enabled or
@@ -53,7 +53,7 @@
<p>The first field is the number of milliseconds elapsed since the
start of the program. The second field is the thread outputting the
log statement. The third field is the level, the fourth field is
- the category to which the statement belongs.
+ the logger to which the statement belongs.
<p>The fifth field (just before the '-') is the nested diagnostic
context. Note the nested diagnostic context may be empty as in the
@@ -153,10 +153,10 @@
/**
In addition to the level of the statement and message, this function
- writes to the ouput stream time, thread, category and NDC
+ writes to the ouput stream time, thread, logger and NDC
information.
- <p>Time, thread, category and diagnostic context are printed
+ <p>Time, thread, logger and diagnostic context are printed
depending on options.
@param output
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/xml/domconfigurator.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/xml/domconfigurator.h?rev=577950&r1=577949&r2=577950&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/xml/domconfigurator.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/xml/domconfigurator.h Thu
Sep 20 15:46:03 2007
@@ -152,12 +152,12 @@
apr_xml_elem* factoryElement);
/**
- Used internally to parse the roor category element.
+ Used internally to parse the root logger element.
*/
void parseRoot(apr_xml_elem* rootElement, apr_xml_doc*
doc, AppenderMap& appenders);
/**
- Used internally to parse the children of a category
element.
+ Used internally to parse the children of a logger
element.
*/
void parseChildrenOfLoggerElement(
apr_xml_elem* catElement,
Modified: logging/log4cxx/trunk/src/test/cpp/customlogger/xlogger.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/customlogger/xlogger.h?rev=577950&r1=577949&r2=577950&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/customlogger/xlogger.h (original)
+++ logging/log4cxx/trunk/src/test/cpp/customlogger/xlogger.h Thu Sep 20
15:46:03 2007
@@ -28,7 +28,7 @@
}
}
// Any sub-class of Logger must also have its own implementation of
- // CategoryFactory.
+ // LoggerFactory.
class XFactory :
public virtual spi::LoggerFactory,
public virtual helpers::ObjectImpl
Modified: logging/log4cxx/trunk/src/test/cpp/loggertestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/loggertestcase.cpp?rev=577950&r1=577949&r2=577950&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/loggertestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/loggertestcase.cpp Thu Sep 20 15:46:03
2007
@@ -26,7 +26,7 @@
#include <log4cxx/logmanager.h>
#include <log4cxx/level.h>
#include <log4cxx/hierarchy.h>
-#include <log4cxx/spi/rootcategory.h>
+#include <log4cxx/spi/rootlogger.h>
#include <log4cxx/helpers/propertyresourcebundle.h>
#include "insertwide.h"
#include "testchar.h"
Modified: logging/log4cxx/trunk/src/test/cpp/minimumtestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/minimumtestcase.cpp?rev=577950&r1=577949&r2=577950&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/minimumtestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/minimumtestcase.cpp Thu Sep 20 15:46:03
2007
@@ -125,8 +125,8 @@
{
int i = 0;
- // In the lines below, the category names are chosen as an aid
in
- // remembering their level values. In general, the category
names
+ // In the lines below, the logger names are chosen as an aid in
+ // remembering their level values. In general, the logger names
// have no bearing to level values.
LoggerPtr ERRlogger =
Logger::getLogger(LOG4CXX_TEST_STR("ERR"));
ERRlogger->setLevel(Level::getError());
