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 2008/01/27 20:31:31 UTC
svn commit: r615633 - /logging/log4cxx/trunk/src/main/cpp/xmllayout.cpp
Author: carnold
Date: Sun Jan 27 11:31:30 2008
New Revision: 615633
URL: http://svn.apache.org/viewvc?rev=615633&view=rev
Log:
LOGCXX-60: Switch back to native EOL for XMLLayout
Modified:
logging/log4cxx/trunk/src/main/cpp/xmllayout.cpp
Modified: logging/log4cxx/trunk/src/main/cpp/xmllayout.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/xmllayout.cpp?rev=615633&r1=615632&r2=615633&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/xmllayout.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/xmllayout.cpp Sun Jan 27 11:31:30 2008
@@ -64,19 +64,22 @@
Transform::appendEscapingTags(output, event->getLevel()->toString());
output.append(LOG4CXX_STR("\" thread=\""));
Transform::appendEscapingTags(output, event->getThreadName());
- output.append(LOG4CXX_STR("\">\r\n"));
+ output.append(LOG4CXX_STR("\">"));
+ output.append(LOG4CXX_EOL);
output.append(LOG4CXX_STR("<log4j:message><![CDATA["));
// Append the rendered message. Also make sure to escape any
// existing CDATA sections.
Transform::appendEscapingCDATA(output, event->getRenderedMessage());
- output.append(LOG4CXX_STR("]]></log4j:message>\r\n"));
+ output.append(LOG4CXX_STR("]]></log4j:message>"));
+ output.append(LOG4CXX_EOL);
LogString ndc;
if(event->getNDC(ndc)) {
output.append(LOG4CXX_STR("<log4j:NDC><![CDATA["));
Transform::appendEscapingCDATA(output, ndc);
- output.append(LOG4CXX_STR("]]></log4j:NDC>\r\n"));
+ output.append(LOG4CXX_STR("]]></log4j:NDC>"));
+ output.append(LOG4CXX_EOL);
}
if(locationInfo)
@@ -93,14 +96,16 @@
Transform::appendEscapingTags(output, fileName);
output.append(LOG4CXX_STR("\" line=\""));
StringHelper::toString(locInfo.getLineNumber(), p, output);
- output.append(LOG4CXX_STR("\"/>\r\n"));
+ output.append(LOG4CXX_STR("\"/>"));
+ output.append(LOG4CXX_EOL);
}
if (properties) {
LoggingEvent::KeySet propertySet(event->getPropertyKeySet());
LoggingEvent::KeySet keySet(event->getMDCKeySet());
if (!(keySet.empty() && propertySet.empty())) {
- output.append(LOG4CXX_STR("<log4j:properties>\r\n"));
+ output.append(LOG4CXX_STR("<log4j:properties>"));
+ output.append(LOG4CXX_EOL);
for (LoggingEvent::KeySet::const_iterator i = keySet.begin();
i != keySet.end();
i++) {
@@ -111,7 +116,8 @@
Transform::appendEscapingTags(output, key);
output.append(LOG4CXX_STR("\" value=\""));
Transform::appendEscapingTags(output, value);
- output.append(LOG4CXX_STR("\"/>\r\n"));
+ output.append(LOG4CXX_STR("\"/>"));
+ output.append(LOG4CXX_EOL);
}
}
for (LoggingEvent::KeySet::const_iterator i = propertySet.begin();
@@ -124,13 +130,17 @@
Transform::appendEscapingTags(output, key);
output.append(LOG4CXX_STR("\" value=\""));
Transform::appendEscapingTags(output, value);
- output.append(LOG4CXX_STR("\"/>\r\n"));
+ output.append(LOG4CXX_STR("\"/>"));
+ output.append(LOG4CXX_EOL);
}
}
- output.append(LOG4CXX_STR("</log4j:properties>\r\n"));
+ output.append(LOG4CXX_STR("</log4j:properties>"));
+ output.append(LOG4CXX_EOL);
}
}
- output.append(LOG4CXX_STR("</log4j:event>\r\n\r\n"));
+ output.append(LOG4CXX_STR("</log4j:event>"));
+ output.append(LOG4CXX_EOL);
+ output.append(LOG4CXX_EOL);
}