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/25 07:53:51 UTC
svn commit: r615127 - in /logging/log4cxx/trunk: ./ src/main/cpp/
src/test/cpp/ src/test/cpp/net/ src/test/java/org/apache/log4j/net/
src/test/resources/input/ src/test/resources/witness/
Author: carnold
Date: Thu Jan 24 22:53:49 2008
New Revision: 615127
URL: http://svn.apache.org/viewvc?rev=615127&view=rev
Log:
LOGCXX-142: socketservertestcase.cpp does not compile on Sun et al
Added:
logging/log4cxx/trunk/src/test/java/org/apache/log4j/net/
logging/log4cxx/trunk/src/test/java/org/apache/log4j/net/ShortSocketServer.java
- copied, changed from r612852, logging/log4j/trunk/tests/src/java/org/apache/log4j/net/ShortSocketServer.java
Modified:
logging/log4cxx/trunk/build.xml
logging/log4cxx/trunk/src/main/cpp/locationinfo.cpp
logging/log4cxx/trunk/src/main/cpp/socketappender.cpp
logging/log4cxx/trunk/src/main/cpp/sockethubappender.cpp
logging/log4cxx/trunk/src/test/cpp/main.cpp
logging/log4cxx/trunk/src/test/cpp/net/socketservertestcase.cpp
logging/log4cxx/trunk/src/test/resources/input/socketServer1.properties
logging/log4cxx/trunk/src/test/resources/input/socketServer2.properties
logging/log4cxx/trunk/src/test/resources/input/socketServer3.properties
logging/log4cxx/trunk/src/test/resources/input/socketServer4.properties
logging/log4cxx/trunk/src/test/resources/input/socketServer5.properties
logging/log4cxx/trunk/src/test/resources/input/socketServer6.properties
logging/log4cxx/trunk/src/test/resources/input/socketServer7.properties
logging/log4cxx/trunk/src/test/resources/input/socketServer8.properties
logging/log4cxx/trunk/src/test/resources/witness/socketServer.1
logging/log4cxx/trunk/src/test/resources/witness/socketServer.2
logging/log4cxx/trunk/src/test/resources/witness/socketServer.3
logging/log4cxx/trunk/src/test/resources/witness/socketServer.4
logging/log4cxx/trunk/src/test/resources/witness/socketServer.5
logging/log4cxx/trunk/src/test/resources/witness/socketServer.6
logging/log4cxx/trunk/src/test/resources/witness/socketServer.7
logging/log4cxx/trunk/src/test/resources/witness/socketServer.8
Modified: logging/log4cxx/trunk/build.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/build.xml?rev=615127&r1=615126&r2=615127&view=diff
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Thu Jan 24 22:53:49 2008
@@ -56,6 +56,11 @@
<property name="performance.dir" location="${base.dir}/src/performance"/>
<property name="performance.src.dir" location="${performance.dir}/cpp"/>
<property name="performance.include.dir" location="${performance.dir}/include"/>
+<property name="m2_repo" location="${user.home}/.m2/repository"/>
+<property name="log4j.version" value="1.2.15"/>
+<property name="log4j.jar"
+ location="${m2_repo}/log4j/log4j/${log4j.version}/log4j-${log4j.version}.jar"/>
+
<property name="doxygen.exe" value="doxygen"/>
<property name="enable_dot" value="YES"/>
@@ -1049,6 +1054,41 @@
<env key="Path"
value="${log4cxx.lib.dir};${env.Path}"/>
</exec>
+</target>
+
+<target name="run-socketserver" depends="build-unittest, clean-output"
+ description="Runs SocketServer test">
+ <property environment="env"/>
+ <mkdir dir="${tests.output.dir}"/>
+ <delete>
+ <fileset dir="${tests.output.dir}" includes="*"/>
+ </delete>
+ <mkdir dir="target/test-classes"/>
+ <javac srcdir="src/test/java"
+ includes="org/apache/log4j/net/ShortSocketServer.java"
+ destdir="target/test-classes"
+ classpath="${log4j.jar}"/>
+ <parallel>
+ <java classname="org.apache.log4j.net.ShortSocketServer"
+ fork="yes" dir="src/test/resources" classpath="target/test-classes:${log4j.jar}">
+ <arg value="8"/>
+ <arg value="input/socketServer"/>
+ </java>
+ <sequential>
+ <sleep seconds="2"/>
+ <exec executable="${log4cxx-test.exe}" dir="${tests.resources.dir}"
+ failonerror="true">
+ <arg value="SocketServerTestCase"/>
+ <env key="LD_LIBRARY_PATH"
+ value="${log4cxx.lib.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${cppunit.lib.dir}:${env.LD_LIBRARY_PATH}"/>
+ <env key="DYLD_LIBRARY_PATH"
+ value="${log4cxx.lib.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${cppunit.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
+ <env key="Path"
+ value="${log4cxx.lib.dir};${env.Path}"/>
+ </exec>
+ </sequential>
+ </parallel>
+
</target>
<target name="build-projects">
Modified: logging/log4cxx/trunk/src/main/cpp/locationinfo.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/locationinfo.cpp?rev=615127&r1=615126&r2=615127&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/locationinfo.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/locationinfo.cpp Thu Jan 24 22:53:49 2008
@@ -160,17 +160,29 @@
0x78, 0x70, 0x74 };
os.writeBytes(prolog, sizeof(prolog), p);
char* line = apr_itoa((apr_pool_t*) p.getAPRPool(), lineNumber);
- size_t len = strlen(methodName) + strlen(fileName) + 3 + strlen(line);
+ //
+ // construct Java-like fullInfo (replace "::" with ".")
+ //
+ std::string fullInfo(methodName);
+ size_t classSep = fullInfo.find("::");
+ if (classSep != std::string::npos) {
+ fullInfo.replace(classSep, 2, ".");
+ size_t space = fullInfo.rfind(' ', classSep);
+ if (space != std::string::npos) {
+ fullInfo.erase(0, space + 1);
+ }
+ }
+ fullInfo.append(1, '(');
+ fullInfo.append(fileName);
+ fullInfo.append(1, ':');
+ fullInfo.append(line);
+ fullInfo.append(1, ')');
+ size_t len = fullInfo.length();
char lenBytes[2];
lenBytes[1] = len & 0xFF;
lenBytes[0] = (len >> 8) & 0xFF;
os.writeBytes(lenBytes, sizeof(lenBytes), p);
- os.writeBytes(methodName, strlen(methodName), p);
- os.writeByte('(', p);
- os.writeBytes(fileName, strlen(fileName), p);
- os.writeByte(':', p);
- os.writeBytes(line, strlen(line), p);
- os.writeByte(')', p);
+ os.writeBytes(fullInfo.data(), len, p);
}
}
Modified: logging/log4cxx/trunk/src/main/cpp/socketappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/socketappender.cpp?rev=615127&r1=615126&r2=615127&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/socketappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/socketappender.cpp Thu Jan 24 22:53:49 2008
@@ -89,6 +89,11 @@
void SocketAppender::append(const spi::LoggingEventPtr& event, log4cxx::helpers::Pool& p) {
if (oos != 0) {
+ LogString ndcVal;
+ event->getNDC(ndcVal);
+ event->getThreadName();
+ // Get a copy of this thread's MDC.
+ event->getMDCCopy();
try {
event->write(*oos, p);
oos->flush(p);
Modified: logging/log4cxx/trunk/src/main/cpp/sockethubappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/sockethubappender.cpp?rev=615127&r1=615126&r2=615127&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/sockethubappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/sockethubappender.cpp Thu Jan 24 22:53:49 2008
@@ -123,6 +123,13 @@
{
return;
}
+
+ LogString ndcVal;
+ event->getNDC(ndcVal);
+ event->getThreadName();
+ // Get a copy of this thread's MDC.
+ event->getMDCCopy();
+
// loop through the current set of open connections, appending the event to each
std::vector<ObjectOutputStreamPtr>::iterator it = streams.begin();
Modified: logging/log4cxx/trunk/src/test/cpp/main.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/main.cpp?rev=615127&r1=615126&r2=615127&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/main.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/main.cpp Thu Jan 24 22:53:49 2008
@@ -47,6 +47,7 @@
extern CPPUNIT_NS::Test* createTestCase2();
extern CPPUNIT_NS::Test* createTestCase4();
+extern CPPUNIT_NS::Test* createSocketServerTestCase();
//
// initializing a logger will cause the APR used by log4cxx library to be initialized
@@ -122,6 +123,10 @@
default:
break;
}
+ }
+
+ if (testName == "SocketServerTestCase") {
+ runner.addTest(createSocketServerTestCase());
}
if (runAll) {
Modified: logging/log4cxx/trunk/src/test/cpp/net/socketservertestcase.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/net/socketservertestcase.cpp?rev=615127&r1=615126&r2=615127&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/net/socketservertestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/net/socketservertestcase.cpp Thu Jan 24 22:53:49 2008
@@ -28,11 +28,9 @@
#include "socketservertestcase.h"
#include "../util/compare.h"
#include "../util/transformer.h"
-#include "../util/linenumberfilter.h"
#include "../util/controlfilter.h"
#include "../util/absolutedateandtimefilter.h"
#include "../util/threadfilter.h"
-#include "../xml/xlevel.h"
#include "../util/filenamefilter.h"
#include <apr_time.h>
#include <log4cxx/file.h>
@@ -93,49 +91,13 @@
REGEX_STR("^(DEBUG| INFO| WARN|ERROR|FATAL|LETHAL) some8 T8 shortSocketServer") \
REGEX_STR(" MDC-TEST8 \\[0x[0-9A-F]*]\\ (root|SocketServerTestCase) - Message [0-9]\\{1,2\\}")
-class ShortSocketServerLauncher
-{
-public:
- ShortSocketServerLauncher()
- {
- if (!launched)
- {
- //
- // should be replaced with apr_proc calls
-#ifdef WIN32
- PROCESS_INFORMATION pi;
- STARTUPINFO si;
- ZeroMemory( &si, sizeof(si) );
- si.cb = sizeof(si);
- ZeroMemory( &pi, sizeof(pi) );
- char commandLine[] = "src\\shortsocketserver 8 input/socketServer";
-
- BOOL bResult = ::CreateProcessA(NULL, commandLine, NULL, NULL,
- TRUE, 0, NULL, NULL, &si, &pi);
-#else
- if(!::fork())
- {
- ::execl("src/shortsocketserver", "shortsocketserver",
- "8", "input/socketServer", NULL);
- ::perror("execl() failed");
- ::exit(1);
- }
- else
- {
- sleep(1);
- }
-#endif
- launched = true;
- }
- }
-
- static bool launched;
-
-};
-
-bool ShortSocketServerLauncher::launched = false;
+/**
+ * This test checks receipt of SocketAppender messages by the ShortSocketServer
+ * class from log4j. That class must be started externally to this class
+ * for this test to succeed.
+ */
class SocketServerTestCase : public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE(SocketServerTestCase);
@@ -153,11 +115,16 @@
LoggerPtr logger;
LoggerPtr root;
+ class LineNumberFilter : public Filter {
+ public:
+ LineNumberFilter() {
+ patterns.push_back(PatternReplacement("cpp:[0-9]*", "cpp:XXX"));
+ }
+ };
public:
void setUp()
{
- ShortSocketServerLauncher();
logger = Logger::getLogger(LOG4CXX_STR("org.apache.log4j.net.SocketServerTestCase"));
root = Logger::getRootLogger();
}
@@ -180,7 +147,7 @@
SocketAppenderPtr socketAppender1 =
new SocketAppender(LOG4CXX_STR("localhost"), PORT);
root->addAppender(socketAppender1);
- common(LOG4CXX_STR("T1"), LOG4CXX_STR("key1"), LOG4CXX_STR("MDC-TEST1"));
+ common("test1", LOG4CXX_STR("T1"), LOG4CXX_STR("key1"), LOG4CXX_STR("MDC-TEST1"));
delay(1);
ControlFilter cf;
@@ -210,7 +177,7 @@
SocketAppenderPtr socketAppender1 =
new SocketAppender(LOG4CXX_STR("localhost"), PORT);
root->addAppender(socketAppender1);
- common(LOG4CXX_STR("T2"), LOG4CXX_STR("key2"), LOG4CXX_STR("MDC-TEST2"));
+ common("test2", LOG4CXX_STR("T2"), LOG4CXX_STR("key2"), LOG4CXX_STR("MDC-TEST2"));
delay(1);
ControlFilter cf;
@@ -245,7 +212,7 @@
SocketAppenderPtr socketAppender1 =
new SocketAppender(LOG4CXX_STR("localhost"), PORT);
root->addAppender(socketAppender1);
- common(LOG4CXX_STR("T3"), LOG4CXX_STR("key3"), LOG4CXX_STR("MDC-TEST3"));
+ common("test3", LOG4CXX_STR("T3"), LOG4CXX_STR("key3"), LOG4CXX_STR("MDC-TEST3"));
delay(1);
ControlFilter cf;
@@ -281,7 +248,7 @@
new SocketAppender(LOG4CXX_STR("localhost"), PORT);
root->addAppender(socketAppender1);
NDC::push(LOG4CXX_TEST_STR("some"));
- common(LOG4CXX_STR("T4"), LOG4CXX_STR("key4"), LOG4CXX_STR("MDC-TEST4"));
+ common("test4", LOG4CXX_STR("T4"), LOG4CXX_STR("key4"), LOG4CXX_STR("MDC-TEST4"));
NDC::pop();
delay(1);
@@ -317,7 +284,7 @@
root->addAppender(asyncAppender);
NDC::push(LOG4CXX_TEST_STR("some5"));
- common(LOG4CXX_STR("T5"), LOG4CXX_STR("key5"), LOG4CXX_STR("MDC-TEST5"));
+ common("test5", LOG4CXX_STR("T5"), LOG4CXX_STR("key5"), LOG4CXX_STR("MDC-TEST5"));
NDC::pop();
delay(2);
@@ -354,7 +321,7 @@
NDC::push(LOG4CXX_TEST_STR("some6"));
MDC::put(LOG4CXX_TEST_STR("hostID"), LOG4CXX_TEST_STR("client-test6"));
- common(LOG4CXX_STR("T6"), LOG4CXX_STR("key6"), LOG4CXX_STR("MDC-TEST6"));
+ common("test6", LOG4CXX_STR("T6"), LOG4CXX_STR("key6"), LOG4CXX_STR("MDC-TEST6"));
NDC::pop();
MDC::remove(LOG4CXX_TEST_STR("hostID"));
delay(2);
@@ -392,7 +359,7 @@
NDC::push(LOG4CXX_TEST_STR("some7"));
MDC::put(LOG4CXX_TEST_STR("hostID"), LOG4CXX_TEST_STR("client-test7"));
- common(LOG4CXX_STR("T7"), LOG4CXX_STR("key7"), LOG4CXX_STR("MDC-TEST7"));
+ common("test7", LOG4CXX_STR("T7"), LOG4CXX_STR("key7"), LOG4CXX_STR("MDC-TEST7"));
NDC::pop();
MDC::remove(LOG4CXX_TEST_STR("hostID"));
delay(2);
@@ -427,7 +394,7 @@
root->addAppender(socketAppender1);
NDC::push(LOG4CXX_TEST_STR("some8"));
- common(LOG4CXX_STR("T8"), LOG4CXX_STR("key8"), LOG4CXX_STR("MDC-TEST8"));
+ common("test8", LOG4CXX_STR("T8"), LOG4CXX_STR("key8"), LOG4CXX_STR("MDC-TEST8"));
NDC::pop();
delay(2);
@@ -453,26 +420,48 @@
CPPUNIT_ASSERT(Compare::compare(FILTERED, LOG4CXX_FILE("witness/socketServer.8")));
}
- void common(const LogString& dc, const LogString& key, const LogString& val)
+ void common(const std::string& testName, const LogString& dc, const LogString& key, const LogString& val)
{
int i = -1;
NDC::push(dc);
MDC::put(key, val);
+
+ logger->setLevel(Level::getDebug());
+ root->setLevel(Level::getDebug());
+ LOG4CXX_TRACE(logger, "Message " << i);
i++;
- std::string msg("Message ");
- LOG4CXX_LOG(logger, XLevel::getTrace(), msg << i);
- i++;
- LOG4CXX_DEBUG(logger, msg << i);
- i++;
- LOG4CXX_DEBUG(root, msg << i);
- i++;
- LOG4CXX_INFO(logger, msg << i);
- i++;
- LOG4CXX_WARN(logger, msg << i);
- i++;
- LOG4CXX_LOG(logger, XLevel::getLethal(), msg << i); //5
+ logger->setLevel(Level::getTrace());
+ root->setLevel(Level::getTrace());
+
+ LOG4CXX_TRACE(logger, "Message " << ++i);
+ LOG4CXX_TRACE(root, "Message " << ++i);
+
+ LOG4CXX_DEBUG(logger, "Message " << ++i);
+ LOG4CXX_DEBUG(root, "Message " << ++i);
+
+ LOG4CXX_INFO(logger, "Message " << ++i);
+ LOG4CXX_WARN(logger, "Message " << ++i);
+ LOG4CXX_FATAL(logger, "Message " << ++i); //5
+
+ std::string exceptionMsg("\njava.lang.Exception: Just testing\n"
+ "\tat org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)\n"
+ "\tat org.apache.log4j.net.SocketServerTestCase.");
+ exceptionMsg.append(testName);
+ exceptionMsg.append("(SocketServerTestCase.java:XXX)\n"
+ "\tat junit.framework.TestCase.runTest(TestCase.java:XXX)\n"
+ "\tat junit.framework.TestCase.runBare(TestCase.java:XXX)\n"
+ "\tat junit.framework.TestResult$1.protect(TestResult.java:XXX)\n"
+ "\tat junit.framework.TestResult.runProtected(TestResult.java:XXX)\n"
+ "\tat junit.framework.TestResult.run(TestResult.java:XXX)\n"
+ "\tat junit.framework.TestCase.run(TestCase.java:XXX)\n"
+ "\tat junit.framework.TestSuite.runTest(TestSuite.java:XXX)\n"
+ "\tat junit.framework.TestSuite.run(TestSuite.java:XXX)");
+
+
+ LOG4CXX_DEBUG(logger, "Message " << ++i << exceptionMsg);
+ LOG4CXX_ERROR(root, "Message " << ++i << exceptionMsg);
NDC::pop();
MDC::remove(key);
@@ -492,7 +481,6 @@
const File SocketServerTestCase::FILTERED("output/filtered");
-//
-// Tests off line until implementation is APR'd
-//
-//CPPUNIT_TEST_SUITE_REGISTRATION(SocketServerTestCase);
+CPPUNIT_NS::Test* createSocketServerTestCase() {
+ return SocketServerTestCase::suite();
+}
Copied: logging/log4cxx/trunk/src/test/java/org/apache/log4j/net/ShortSocketServer.java (from r612852, logging/log4j/trunk/tests/src/java/org/apache/log4j/net/ShortSocketServer.java)
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/java/org/apache/log4j/net/ShortSocketServer.java?p2=logging/log4cxx/trunk/src/test/java/org/apache/log4j/net/ShortSocketServer.java&p1=logging/log4j/trunk/tests/src/java/org/apache/log4j/net/ShortSocketServer.java&r1=612852&r2=615127&rev=615127&view=diff
==============================================================================
--- logging/log4j/trunk/tests/src/java/org/apache/log4j/net/ShortSocketServer.java (original)
+++ logging/log4cxx/trunk/src/test/java/org/apache/log4j/net/ShortSocketServer.java Thu Jan 24 22:53:49 2008
@@ -59,8 +59,9 @@
}
- LogLog.debug("Listening on port " + SocketServerTestCase.PORT);
- ServerSocket serverSocket = new ServerSocket(SocketServerTestCase.PORT);
+ int port = Integer.valueOf(System.getProperty("port", "12345"));
+ LogLog.debug("Listening on port " + port);
+ ServerSocket serverSocket = new ServerSocket(port);
MDC.put("hostID", "shortSocketServer");
Modified: logging/log4cxx/trunk/src/test/resources/input/socketServer1.properties
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/resources/input/socketServer1.properties?rev=615127&r1=615126&r2=615127&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/resources/input/socketServer1.properties (original)
+++ logging/log4cxx/trunk/src/test/resources/input/socketServer1.properties Thu Jan 24 22:53:49 2008
@@ -12,8 +12,7 @@
# 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.
-#
-log4j.rootLogger=DEBUG, A
+log4j.rootLogger=TRACE, A
log4j.logger.org.apache.log4j.test.ShortSocketServer=WARN
log4j.logger.org.apache.log4j.net.SocketNode=WARN
log4j.appender.A=org.apache.log4j.FileAppender
Modified: logging/log4cxx/trunk/src/test/resources/input/socketServer2.properties
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/resources/input/socketServer2.properties?rev=615127&r1=615126&r2=615127&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/resources/input/socketServer2.properties (original)
+++ logging/log4cxx/trunk/src/test/resources/input/socketServer2.properties Thu Jan 24 22:53:49 2008
@@ -12,13 +12,12 @@
# 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.
-#
-log4j.rootLogger=DEBUG, A
+log4j.rootLogger=TRACE, A
log4j.logger.org.apache.log4j.test.ShortSocketServer=WARN
log4j.logger.org.apache.log4j.net.SocketNode=WARN
log4j.appender.A=org.apache.log4j.FileAppender
log4j.appender.A.file=output/temp
log4j.appender.A.Append=false
log4j.appender.A.layout=org.apache.log4j.PatternLayout
-log4j.appender.A.layout.ConversionPattern=%5p %x [%t] %F(%L) %m%n
+log4j.appender.A.layout.ConversionPattern=%5p %x [%t] %C (%F:%L) %m%n
Modified: logging/log4cxx/trunk/src/test/resources/input/socketServer3.properties
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/resources/input/socketServer3.properties?rev=615127&r1=615126&r2=615127&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/resources/input/socketServer3.properties (original)
+++ logging/log4cxx/trunk/src/test/resources/input/socketServer3.properties Thu Jan 24 22:53:49 2008
@@ -12,12 +12,11 @@
# 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.
-#
-log4j.rootLogger=DEBUG, A
+log4j.rootLogger=TRACE, A
log4j.Logger.org.apache.log4j.test.ShortSocketServer=WARN
log4j.Logger.org.apache.log4j.net.SocketNode=WARN
log4j.appender.A=org.apache.log4j.FileAppender
log4j.appender.A.file=output/temp
log4j.appender.A.Append=false
log4j.appender.A.layout=org.apache.log4j.PatternLayout
-log4j.appender.A.layout.ConversionPattern=%5p %x [%t] %F(%L) %m%n
+log4j.appender.A.layout.ConversionPattern=%5p %x [%t] %C (%F:%L) %m%n
Modified: logging/log4cxx/trunk/src/test/resources/input/socketServer4.properties
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/resources/input/socketServer4.properties?rev=615127&r1=615126&r2=615127&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/resources/input/socketServer4.properties (original)
+++ logging/log4cxx/trunk/src/test/resources/input/socketServer4.properties Thu Jan 24 22:53:49 2008
@@ -12,8 +12,7 @@
# 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.
-#
-log4j.rootLogger=DEBUG, A
+log4j.rootLogger=TRACE, A
log4j.Logger.org.apache.log4j.test.ShortSocketServer=WARN
log4j.Logger.org.apache.log4j.net.SocketNode=WARN
log4j.appender.A=org.apache.log4j.FileAppender
Modified: logging/log4cxx/trunk/src/test/resources/input/socketServer5.properties
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/resources/input/socketServer5.properties?rev=615127&r1=615126&r2=615127&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/resources/input/socketServer5.properties (original)
+++ logging/log4cxx/trunk/src/test/resources/input/socketServer5.properties Thu Jan 24 22:53:49 2008
@@ -12,8 +12,7 @@
# 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.
-#
-log4j.rootLogger=DEBUG, A
+log4j.rootLogger=TRACE, A
log4j.Logger.org.apache.log4j.test.ShortSocketServer=WARN
log4j.Logger.org.apache.log4j.net.SocketNode=WARN
log4j.appender.A=org.apache.log4j.FileAppender
Modified: logging/log4cxx/trunk/src/test/resources/input/socketServer6.properties
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/resources/input/socketServer6.properties?rev=615127&r1=615126&r2=615127&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/resources/input/socketServer6.properties (original)
+++ logging/log4cxx/trunk/src/test/resources/input/socketServer6.properties Thu Jan 24 22:53:49 2008
@@ -12,8 +12,7 @@
# 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.
-#
-log4j.rootLogger=DEBUG, A
+log4j.rootLogger=TRACE, A
log4j.Logger.org.apache.log4j.test.ShortSocketServer=WARN
log4j.Logger.org.apache.log4j.net.SocketNode=WARN
log4j.appender.A=org.apache.log4j.FileAppender
Modified: logging/log4cxx/trunk/src/test/resources/input/socketServer7.properties
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/resources/input/socketServer7.properties?rev=615127&r1=615126&r2=615127&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/resources/input/socketServer7.properties (original)
+++ logging/log4cxx/trunk/src/test/resources/input/socketServer7.properties Thu Jan 24 22:53:49 2008
@@ -12,8 +12,7 @@
# 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.
-#
-log4j.rootLogger=DEBUG, A
+log4j.rootLogger=TRACE, A
log4j.Logger.org.apache.log4j.test.ShortSocketServer=WARN
log4j.Logger.org.apache.log4j.net.SocketNode=WARN
log4j.appender.A=org.apache.log4j.FileAppender
Modified: logging/log4cxx/trunk/src/test/resources/input/socketServer8.properties
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/resources/input/socketServer8.properties?rev=615127&r1=615126&r2=615127&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/resources/input/socketServer8.properties (original)
+++ logging/log4cxx/trunk/src/test/resources/input/socketServer8.properties Thu Jan 24 22:53:49 2008
@@ -12,8 +12,7 @@
# 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.
-#
-log4j.rootLogger=DEBUG, A
+log4j.rootLogger=TRACE, A
log4j.Logger.org.apache.log4j.test.ShortSocketServer=WARN
log4j.Logger.org.apache.log4j.net.SocketNode=WARN
log4j.appender.A=org.apache.log4j.FileAppender
Modified: logging/log4cxx/trunk/src/test/resources/witness/socketServer.1
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/resources/witness/socketServer.1?rev=615127&r1=615126&r2=615127&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/resources/witness/socketServer.1 (original)
+++ logging/log4cxx/trunk/src/test/resources/witness/socketServer.1 Thu Jan 24 22:53:49 2008
@@ -1,5 +1,31 @@
-DEBUG T1 [main] org.apache.log4j.net.SocketServerTestCase Message 1
-DEBUG T1 [main] root Message 2
- INFO T1 [main] org.apache.log4j.net.SocketServerTestCase Message 3
- WARN T1 [main] org.apache.log4j.net.SocketServerTestCase Message 4
-LETHAL T1 [main] org.apache.log4j.net.SocketServerTestCase Message 5
+TRACE T1 [main] org.apache.log4j.net.SocketServerTestCase Message 1
+TRACE T1 [main] root Message 2
+DEBUG T1 [main] org.apache.log4j.net.SocketServerTestCase Message 3
+DEBUG T1 [main] root Message 4
+ INFO T1 [main] org.apache.log4j.net.SocketServerTestCase Message 5
+ WARN T1 [main] org.apache.log4j.net.SocketServerTestCase Message 6
+FATAL T1 [main] org.apache.log4j.net.SocketServerTestCase Message 7
+DEBUG T1 [main] org.apache.log4j.net.SocketServerTestCase Message 8
+java.lang.Exception: Just testing
+ at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
+ at org.apache.log4j.net.SocketServerTestCase.test1(SocketServerTestCase.java:XXX)
+ at junit.framework.TestCase.runTest(TestCase.java:XXX)
+ at junit.framework.TestCase.runBare(TestCase.java:XXX)
+ at junit.framework.TestResult$1.protect(TestResult.java:XXX)
+ at junit.framework.TestResult.runProtected(TestResult.java:XXX)
+ at junit.framework.TestResult.run(TestResult.java:XXX)
+ at junit.framework.TestCase.run(TestCase.java:XXX)
+ at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
+ at junit.framework.TestSuite.run(TestSuite.java:XXX)
+ERROR T1 [main] root Message 9
+java.lang.Exception: Just testing
+ at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
+ at org.apache.log4j.net.SocketServerTestCase.test1(SocketServerTestCase.java:XXX)
+ at junit.framework.TestCase.runTest(TestCase.java:XXX)
+ at junit.framework.TestCase.runBare(TestCase.java:XXX)
+ at junit.framework.TestResult$1.protect(TestResult.java:XXX)
+ at junit.framework.TestResult.runProtected(TestResult.java:XXX)
+ at junit.framework.TestResult.run(TestResult.java:XXX)
+ at junit.framework.TestCase.run(TestCase.java:XXX)
+ at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
+ at junit.framework.TestSuite.run(TestSuite.java:XXX)
Modified: logging/log4cxx/trunk/src/test/resources/witness/socketServer.2
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/resources/witness/socketServer.2?rev=615127&r1=615126&r2=615127&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/resources/witness/socketServer.2 (original)
+++ logging/log4cxx/trunk/src/test/resources/witness/socketServer.2 Thu Jan 24 22:53:49 2008
@@ -1,5 +1,31 @@
-DEBUG T2 [main] socketservertestcase.cpp(X) Message 1
-DEBUG T2 [main] socketservertestcase.cpp(X) Message 2
- INFO T2 [main] socketservertestcase.cpp(X) Message 3
- WARN T2 [main] socketservertestcase.cpp(X) Message 4
-LETHAL T2 [main] socketservertestcase.cpp(X) Message 5
+TRACE T2 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 1
+TRACE T2 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 2
+DEBUG T2 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 3
+DEBUG T2 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 4
+ INFO T2 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 5
+ WARN T2 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 6
+FATAL T2 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 7
+DEBUG T2 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 8
+java.lang.Exception: Just testing
+ at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
+ at org.apache.log4j.net.SocketServerTestCase.test2(SocketServerTestCase.java:XXX)
+ at junit.framework.TestCase.runTest(TestCase.java:XXX)
+ at junit.framework.TestCase.runBare(TestCase.java:XXX)
+ at junit.framework.TestResult$1.protect(TestResult.java:XXX)
+ at junit.framework.TestResult.runProtected(TestResult.java:XXX)
+ at junit.framework.TestResult.run(TestResult.java:XXX)
+ at junit.framework.TestCase.run(TestCase.java:XXX)
+ at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
+ at junit.framework.TestSuite.run(TestSuite.java:XXX)
+ERROR T2 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 9
+java.lang.Exception: Just testing
+ at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
+ at org.apache.log4j.net.SocketServerTestCase.test2(SocketServerTestCase.java:XXX)
+ at junit.framework.TestCase.runTest(TestCase.java:XXX)
+ at junit.framework.TestCase.runBare(TestCase.java:XXX)
+ at junit.framework.TestResult$1.protect(TestResult.java:XXX)
+ at junit.framework.TestResult.runProtected(TestResult.java:XXX)
+ at junit.framework.TestResult.run(TestResult.java:XXX)
+ at junit.framework.TestCase.run(TestCase.java:XXX)
+ at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
+ at junit.framework.TestSuite.run(TestSuite.java:XXX)
Modified: logging/log4cxx/trunk/src/test/resources/witness/socketServer.3
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/resources/witness/socketServer.3?rev=615127&r1=615126&r2=615127&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/resources/witness/socketServer.3 (original)
+++ logging/log4cxx/trunk/src/test/resources/witness/socketServer.3 Thu Jan 24 22:53:49 2008
@@ -1,5 +1,31 @@
-DEBUG T3 [main] socketservertestcase.cpp(X) Message 1
-DEBUG T3 [main] socketservertestcase.cpp(X) Message 2
- INFO T3 [main] socketservertestcase.cpp(X) Message 3
- WARN T3 [main] socketservertestcase.cpp(X) Message 4
-LETHAL T3 [main] socketservertestcase.cpp(X) Message 5
+TRACE T3 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 1
+TRACE T3 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 2
+DEBUG T3 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 3
+DEBUG T3 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 4
+ INFO T3 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 5
+ WARN T3 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 6
+FATAL T3 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 7
+DEBUG T3 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 8
+java.lang.Exception: Just testing
+ at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
+ at org.apache.log4j.net.SocketServerTestCase.test3(SocketServerTestCase.java:XXX)
+ at junit.framework.TestCase.runTest(TestCase.java:XXX)
+ at junit.framework.TestCase.runBare(TestCase.java:XXX)
+ at junit.framework.TestResult$1.protect(TestResult.java:XXX)
+ at junit.framework.TestResult.runProtected(TestResult.java:XXX)
+ at junit.framework.TestResult.run(TestResult.java:XXX)
+ at junit.framework.TestCase.run(TestCase.java:XXX)
+ at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
+ at junit.framework.TestSuite.run(TestSuite.java:XXX)
+ERROR T3 [main] SocketServerTestCase (socketservertestcase.cpp:XXX) Message 9
+java.lang.Exception: Just testing
+ at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
+ at org.apache.log4j.net.SocketServerTestCase.test3(SocketServerTestCase.java:XXX)
+ at junit.framework.TestCase.runTest(TestCase.java:XXX)
+ at junit.framework.TestCase.runBare(TestCase.java:XXX)
+ at junit.framework.TestResult$1.protect(TestResult.java:XXX)
+ at junit.framework.TestResult.runProtected(TestResult.java:XXX)
+ at junit.framework.TestResult.run(TestResult.java:XXX)
+ at junit.framework.TestCase.run(TestCase.java:XXX)
+ at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
+ at junit.framework.TestSuite.run(TestSuite.java:XXX)
Modified: logging/log4cxx/trunk/src/test/resources/witness/socketServer.4
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/resources/witness/socketServer.4?rev=615127&r1=615126&r2=615127&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/resources/witness/socketServer.4 (original)
+++ logging/log4cxx/trunk/src/test/resources/witness/socketServer.4 Thu Jan 24 22:53:49 2008
@@ -1,5 +1,31 @@
-DEBUG some T4 MDC-TEST4 [main] SocketServerTestCase - Message 1
-DEBUG some T4 MDC-TEST4 [main] root - Message 2
- INFO some T4 MDC-TEST4 [main] SocketServerTestCase - Message 3
- WARN some T4 MDC-TEST4 [main] SocketServerTestCase - Message 4
-LETHAL some T4 MDC-TEST4 [main] SocketServerTestCase - Message 5
+TRACE some T4 MDC-TEST4 [main] SocketServerTestCase - Message 1
+TRACE some T4 MDC-TEST4 [main] root - Message 2
+DEBUG some T4 MDC-TEST4 [main] SocketServerTestCase - Message 3
+DEBUG some T4 MDC-TEST4 [main] root - Message 4
+ INFO some T4 MDC-TEST4 [main] SocketServerTestCase - Message 5
+ WARN some T4 MDC-TEST4 [main] SocketServerTestCase - Message 6
+FATAL some T4 MDC-TEST4 [main] SocketServerTestCase - Message 7
+DEBUG some T4 MDC-TEST4 [main] SocketServerTestCase - Message 8
+java.lang.Exception: Just testing
+ at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
+ at org.apache.log4j.net.SocketServerTestCase.test4(SocketServerTestCase.java:XXX)
+ at junit.framework.TestCase.runTest(TestCase.java:XXX)
+ at junit.framework.TestCase.runBare(TestCase.java:XXX)
+ at junit.framework.TestResult$1.protect(TestResult.java:XXX)
+ at junit.framework.TestResult.runProtected(TestResult.java:XXX)
+ at junit.framework.TestResult.run(TestResult.java:XXX)
+ at junit.framework.TestCase.run(TestCase.java:XXX)
+ at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
+ at junit.framework.TestSuite.run(TestSuite.java:XXX)
+ERROR some T4 MDC-TEST4 [main] root - Message 9
+java.lang.Exception: Just testing
+ at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
+ at org.apache.log4j.net.SocketServerTestCase.test4(SocketServerTestCase.java:XXX)
+ at junit.framework.TestCase.runTest(TestCase.java:XXX)
+ at junit.framework.TestCase.runBare(TestCase.java:XXX)
+ at junit.framework.TestResult$1.protect(TestResult.java:XXX)
+ at junit.framework.TestResult.runProtected(TestResult.java:XXX)
+ at junit.framework.TestResult.run(TestResult.java:XXX)
+ at junit.framework.TestCase.run(TestCase.java:XXX)
+ at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
+ at junit.framework.TestSuite.run(TestSuite.java:XXX)
Modified: logging/log4cxx/trunk/src/test/resources/witness/socketServer.5
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/resources/witness/socketServer.5?rev=615127&r1=615126&r2=615127&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/resources/witness/socketServer.5 (original)
+++ logging/log4cxx/trunk/src/test/resources/witness/socketServer.5 Thu Jan 24 22:53:49 2008
@@ -1,5 +1,31 @@
-DEBUG some5 T5 MDC-TEST5 [main] SocketServerTestCase - Message 1
-DEBUG some5 T5 MDC-TEST5 [main] root - Message 2
- INFO some5 T5 MDC-TEST5 [main] SocketServerTestCase - Message 3
- WARN some5 T5 MDC-TEST5 [main] SocketServerTestCase - Message 4
-LETHAL some5 T5 MDC-TEST5 [main] SocketServerTestCase - Message 5
+TRACE some5 T5 MDC-TEST5 [main] SocketServerTestCase - Message 1
+TRACE some5 T5 MDC-TEST5 [main] root - Message 2
+DEBUG some5 T5 MDC-TEST5 [main] SocketServerTestCase - Message 3
+DEBUG some5 T5 MDC-TEST5 [main] root - Message 4
+ INFO some5 T5 MDC-TEST5 [main] SocketServerTestCase - Message 5
+ WARN some5 T5 MDC-TEST5 [main] SocketServerTestCase - Message 6
+FATAL some5 T5 MDC-TEST5 [main] SocketServerTestCase - Message 7
+DEBUG some5 T5 MDC-TEST5 [main] SocketServerTestCase - Message 8
+java.lang.Exception: Just testing
+ at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
+ at org.apache.log4j.net.SocketServerTestCase.test5(SocketServerTestCase.java:XXX)
+ at junit.framework.TestCase.runTest(TestCase.java:XXX)
+ at junit.framework.TestCase.runBare(TestCase.java:XXX)
+ at junit.framework.TestResult$1.protect(TestResult.java:XXX)
+ at junit.framework.TestResult.runProtected(TestResult.java:XXX)
+ at junit.framework.TestResult.run(TestResult.java:XXX)
+ at junit.framework.TestCase.run(TestCase.java:XXX)
+ at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
+ at junit.framework.TestSuite.run(TestSuite.java:XXX)
+ERROR some5 T5 MDC-TEST5 [main] root - Message 9
+java.lang.Exception: Just testing
+ at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
+ at org.apache.log4j.net.SocketServerTestCase.test5(SocketServerTestCase.java:XXX)
+ at junit.framework.TestCase.runTest(TestCase.java:XXX)
+ at junit.framework.TestCase.runBare(TestCase.java:XXX)
+ at junit.framework.TestResult$1.protect(TestResult.java:XXX)
+ at junit.framework.TestResult.runProtected(TestResult.java:XXX)
+ at junit.framework.TestResult.run(TestResult.java:XXX)
+ at junit.framework.TestCase.run(TestCase.java:XXX)
+ at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
+ at junit.framework.TestSuite.run(TestSuite.java:XXX)
Modified: logging/log4cxx/trunk/src/test/resources/witness/socketServer.6
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/resources/witness/socketServer.6?rev=615127&r1=615126&r2=615127&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/resources/witness/socketServer.6 (original)
+++ logging/log4cxx/trunk/src/test/resources/witness/socketServer.6 Thu Jan 24 22:53:49 2008
@@ -1,5 +1,31 @@
-DEBUG some6 T6 client-test6 MDC-TEST6 [main] SocketServerTestCase - Message 1
-DEBUG some6 T6 client-test6 MDC-TEST6 [main] root - Message 2
- INFO some6 T6 client-test6 MDC-TEST6 [main] SocketServerTestCase - Message 3
- WARN some6 T6 client-test6 MDC-TEST6 [main] SocketServerTestCase - Message 4
-LETHAL some6 T6 client-test6 MDC-TEST6 [main] SocketServerTestCase - Message 5
+TRACE some6 T6 client-test6 MDC-TEST6 [main] SocketServerTestCase - Message 1
+TRACE some6 T6 client-test6 MDC-TEST6 [main] root - Message 2
+DEBUG some6 T6 client-test6 MDC-TEST6 [main] SocketServerTestCase - Message 3
+DEBUG some6 T6 client-test6 MDC-TEST6 [main] root - Message 4
+ INFO some6 T6 client-test6 MDC-TEST6 [main] SocketServerTestCase - Message 5
+ WARN some6 T6 client-test6 MDC-TEST6 [main] SocketServerTestCase - Message 6
+FATAL some6 T6 client-test6 MDC-TEST6 [main] SocketServerTestCase - Message 7
+DEBUG some6 T6 client-test6 MDC-TEST6 [main] SocketServerTestCase - Message 8
+java.lang.Exception: Just testing
+ at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
+ at org.apache.log4j.net.SocketServerTestCase.test6(SocketServerTestCase.java:XXX)
+ at junit.framework.TestCase.runTest(TestCase.java:XXX)
+ at junit.framework.TestCase.runBare(TestCase.java:XXX)
+ at junit.framework.TestResult$1.protect(TestResult.java:XXX)
+ at junit.framework.TestResult.runProtected(TestResult.java:XXX)
+ at junit.framework.TestResult.run(TestResult.java:XXX)
+ at junit.framework.TestCase.run(TestCase.java:XXX)
+ at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
+ at junit.framework.TestSuite.run(TestSuite.java:XXX)
+ERROR some6 T6 client-test6 MDC-TEST6 [main] root - Message 9
+java.lang.Exception: Just testing
+ at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
+ at org.apache.log4j.net.SocketServerTestCase.test6(SocketServerTestCase.java:XXX)
+ at junit.framework.TestCase.runTest(TestCase.java:XXX)
+ at junit.framework.TestCase.runBare(TestCase.java:XXX)
+ at junit.framework.TestResult$1.protect(TestResult.java:XXX)
+ at junit.framework.TestResult.runProtected(TestResult.java:XXX)
+ at junit.framework.TestResult.run(TestResult.java:XXX)
+ at junit.framework.TestCase.run(TestCase.java:XXX)
+ at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
+ at junit.framework.TestSuite.run(TestSuite.java:XXX)
Modified: logging/log4cxx/trunk/src/test/resources/witness/socketServer.7
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/resources/witness/socketServer.7?rev=615127&r1=615126&r2=615127&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/resources/witness/socketServer.7 (original)
+++ logging/log4cxx/trunk/src/test/resources/witness/socketServer.7 Thu Jan 24 22:53:49 2008
@@ -1,5 +1,31 @@
-DEBUG some7 T7 client-test7 MDC-TEST7 [main] SocketServerTestCase - Message 1
-DEBUG some7 T7 client-test7 MDC-TEST7 [main] root - Message 2
- INFO some7 T7 client-test7 MDC-TEST7 [main] SocketServerTestCase - Message 3
- WARN some7 T7 client-test7 MDC-TEST7 [main] SocketServerTestCase - Message 4
-LETHAL some7 T7 client-test7 MDC-TEST7 [main] SocketServerTestCase - Message 5
+TRACE some7 T7 client-test7 MDC-TEST7 [main] SocketServerTestCase - Message 1
+TRACE some7 T7 client-test7 MDC-TEST7 [main] root - Message 2
+DEBUG some7 T7 client-test7 MDC-TEST7 [main] SocketServerTestCase - Message 3
+DEBUG some7 T7 client-test7 MDC-TEST7 [main] root - Message 4
+ INFO some7 T7 client-test7 MDC-TEST7 [main] SocketServerTestCase - Message 5
+ WARN some7 T7 client-test7 MDC-TEST7 [main] SocketServerTestCase - Message 6
+FATAL some7 T7 client-test7 MDC-TEST7 [main] SocketServerTestCase - Message 7
+DEBUG some7 T7 client-test7 MDC-TEST7 [main] SocketServerTestCase - Message 8
+java.lang.Exception: Just testing
+ at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
+ at org.apache.log4j.net.SocketServerTestCase.test7(SocketServerTestCase.java:XXX)
+ at junit.framework.TestCase.runTest(TestCase.java:XXX)
+ at junit.framework.TestCase.runBare(TestCase.java:XXX)
+ at junit.framework.TestResult$1.protect(TestResult.java:XXX)
+ at junit.framework.TestResult.runProtected(TestResult.java:XXX)
+ at junit.framework.TestResult.run(TestResult.java:XXX)
+ at junit.framework.TestCase.run(TestCase.java:XXX)
+ at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
+ at junit.framework.TestSuite.run(TestSuite.java:XXX)
+ERROR some7 T7 client-test7 MDC-TEST7 [main] root - Message 9
+java.lang.Exception: Just testing
+ at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
+ at org.apache.log4j.net.SocketServerTestCase.test7(SocketServerTestCase.java:XXX)
+ at junit.framework.TestCase.runTest(TestCase.java:XXX)
+ at junit.framework.TestCase.runBare(TestCase.java:XXX)
+ at junit.framework.TestResult$1.protect(TestResult.java:XXX)
+ at junit.framework.TestResult.runProtected(TestResult.java:XXX)
+ at junit.framework.TestResult.run(TestResult.java:XXX)
+ at junit.framework.TestCase.run(TestCase.java:XXX)
+ at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
+ at junit.framework.TestSuite.run(TestSuite.java:XXX)
Modified: logging/log4cxx/trunk/src/test/resources/witness/socketServer.8
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/resources/witness/socketServer.8?rev=615127&r1=615126&r2=615127&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/resources/witness/socketServer.8 (original)
+++ logging/log4cxx/trunk/src/test/resources/witness/socketServer.8 Thu Jan 24 22:53:49 2008
@@ -1,5 +1,31 @@
-DEBUG some8 T8 shortSocketServer MDC-TEST8 [main] SocketServerTestCase - Message 1
-DEBUG some8 T8 shortSocketServer MDC-TEST8 [main] root - Message 2
- INFO some8 T8 shortSocketServer MDC-TEST8 [main] SocketServerTestCase - Message 3
- WARN some8 T8 shortSocketServer MDC-TEST8 [main] SocketServerTestCase - Message 4
-LETHAL some8 T8 shortSocketServer MDC-TEST8 [main] SocketServerTestCase - Message 5
+TRACE some8 T8 shortSocketServer MDC-TEST8 [main] SocketServerTestCase - Message 1
+TRACE some8 T8 shortSocketServer MDC-TEST8 [main] root - Message 2
+DEBUG some8 T8 shortSocketServer MDC-TEST8 [main] SocketServerTestCase - Message 3
+DEBUG some8 T8 shortSocketServer MDC-TEST8 [main] root - Message 4
+ INFO some8 T8 shortSocketServer MDC-TEST8 [main] SocketServerTestCase - Message 5
+ WARN some8 T8 shortSocketServer MDC-TEST8 [main] SocketServerTestCase - Message 6
+FATAL some8 T8 shortSocketServer MDC-TEST8 [main] SocketServerTestCase - Message 7
+DEBUG some8 T8 shortSocketServer MDC-TEST8 [main] SocketServerTestCase - Message 8
+java.lang.Exception: Just testing
+ at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
+ at org.apache.log4j.net.SocketServerTestCase.test8(SocketServerTestCase.java:XXX)
+ at junit.framework.TestCase.runTest(TestCase.java:XXX)
+ at junit.framework.TestCase.runBare(TestCase.java:XXX)
+ at junit.framework.TestResult$1.protect(TestResult.java:XXX)
+ at junit.framework.TestResult.runProtected(TestResult.java:XXX)
+ at junit.framework.TestResult.run(TestResult.java:XXX)
+ at junit.framework.TestCase.run(TestCase.java:XXX)
+ at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
+ at junit.framework.TestSuite.run(TestSuite.java:XXX)
+ERROR some8 T8 shortSocketServer MDC-TEST8 [main] root - Message 9
+java.lang.Exception: Just testing
+ at org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)
+ at org.apache.log4j.net.SocketServerTestCase.test8(SocketServerTestCase.java:XXX)
+ at junit.framework.TestCase.runTest(TestCase.java:XXX)
+ at junit.framework.TestCase.runBare(TestCase.java:XXX)
+ at junit.framework.TestResult$1.protect(TestResult.java:XXX)
+ at junit.framework.TestResult.runProtected(TestResult.java:XXX)
+ at junit.framework.TestResult.run(TestResult.java:XXX)
+ at junit.framework.TestCase.run(TestCase.java:XXX)
+ at junit.framework.TestSuite.runTest(TestSuite.java:XXX)
+ at junit.framework.TestSuite.run(TestSuite.java:XXX)