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 2004/12/16 20:41:04 UTC

cvs commit: logging-log4cxx/tests/src/util filter.h

carnold     2004/12/16 11:41:04

  Modified:    include/log4cxx asyncappender.h logger.h
               include/log4cxx/helpers patternparser.h
               include/log4cxx/net socketappenderskeleton.h
               src      appenderskeleton.cpp asyncappender.cpp
                        hierarchy.cpp locationinfo.cpp logger.cpp mutex.cpp
                        patternparser.cpp socketappenderskeleton.cpp
               tests/src asyncappendertestcase.cpp main.cpp
                        minimumtestcase.cpp patternlayouttest.cpp
               tests/src/util filter.h
  Log:
  LOGCXX-10: tchar.h/Unicode: minor cosmetic changes
  
  Revision  Changes    Path
  1.16      +3 -3      logging-log4cxx/include/log4cxx/asyncappender.h
  
  Index: asyncappender.h
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/include/log4cxx/asyncappender.h,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- asyncappender.h	11 Dec 2004 04:53:21 -0000	1.15
  +++ asyncappender.h	16 Dec 2004 19:41:03 -0000	1.16
  @@ -58,7 +58,7 @@
   			LOG4CXX_CAST_ENTRY(spi::AppenderAttachable)
   		END_LOG4CXX_CAST_MAP()
   
  -                AsyncAppender();
  +		AsyncAppender();
   		virtual ~AsyncAppender();
   
   		void addAppender(const AppenderPtr& newAppender);
  @@ -118,9 +118,9 @@
   		int getBufferSize() const;
   
   	private:
  -                log4cxx::helpers::Pool pool;
  +		log4cxx::helpers::Pool pool;
   		std::deque<log4cxx::spi::LoggingEventPtr> queue;
  -		int size;
  +		size_t size;
   		//
   		//   Condition is signaled when there is room available on the queue
   		//
  
  
  
  1.30      +8 -8      logging-log4cxx/include/log4cxx/logger.h
  
  Index: logger.h
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/include/log4cxx/logger.h,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- logger.h	13 Dec 2004 05:05:13 -0000	1.29
  +++ logger.h	16 Dec 2004 19:41:03 -0000	1.30
  @@ -97,14 +97,14 @@
   
                   helpers::AppenderAttachableImplPtr aai;
   
  -       /** Additivity is set to true by default, that is children inherit
  -        the appenders of their ancestors by default. If this variable is
  -        set to <code>false</code> then the appenders found in the
  -        ancestors of this logger are not used. However, the children
  -        of this logger will inherit its appenders, unless the children
  -        have their additivity flag set to <code>false</code> too. See
  -        the user manual for more details. */
  -        bool additive;
  +				/** Additivity is set to true by default, that is children inherit
  +					the appenders of their ancestors by default. If this variable is
  +					set to <code>false</code> then the appenders found in the
  +					ancestors of this logger are not used. However, the children
  +					of this logger will inherit its appenders, unless the children
  +					have their additivity flag set to <code>false</code> too. See
  +					the user manual for more details. */
  +				bool additive;
   
       protected:
                   friend class DefaultCategoryFactory;
  
  
  
  1.16      +2 -2      logging-log4cxx/include/log4cxx/helpers/patternparser.h
  
  Index: patternparser.h
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/patternparser.h,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- patternparser.h	15 Dec 2004 00:38:47 -0000	1.15
  +++ patternparser.h	16 Dec 2004 19:41:03 -0000	1.16
  @@ -50,8 +50,8 @@
                   protected:
                           int state;
                           LogString currentLiteral;
  -                        int patternLength;
  -                        int i;
  +                        size_t patternLength;
  +                        size_t i;
                           PatternConverterPtr head;
                           PatternConverterPtr tail;
                           FormattingInfo formattingInfo;
  
  
  
  1.5       +1 -1      logging-log4cxx/include/log4cxx/net/socketappenderskeleton.h
  
  Index: socketappenderskeleton.h
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/include/log4cxx/net/socketappenderskeleton.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- socketappenderskeleton.h	15 Dec 2004 00:38:50 -0000	1.4
  +++ socketappenderskeleton.h	16 Dec 2004 19:41:03 -0000	1.5
  @@ -100,7 +100,7 @@
                           { return false; }
   
   
  -                        void append(const spi::LoggingEventPtr& event, apr_pool_t* p);
  +				void append(const spi::LoggingEventPtr& event, apr_pool_t* p);
   
   
                   /**
  
  
  
  1.12      +12 -12    logging-log4cxx/src/appenderskeleton.cpp
  
  Index: appenderskeleton.cpp
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/src/appenderskeleton.cpp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- appenderskeleton.cpp	11 Dec 2004 04:53:24 -0000	1.11
  +++ appenderskeleton.cpp	16 Dec 2004 19:41:03 -0000	1.12
  @@ -28,25 +28,25 @@
   using namespace log4cxx::helpers;
   
   AppenderSkeleton::AppenderSkeleton()
  -: errorHandler(new OnlyOnceErrorHandler()),
  -  closed(0),
  -  threshold(Level::getAll()),
  -  layout(),
  -  name(),
  -  headFilter(),
  -  tailFilter(),
  -  mutex(getSynchronizationPool())
  +:   layout(),
  +    name(),
  +    threshold(Level::getAll()),
  +    errorHandler(new OnlyOnceErrorHandler()),
  +    headFilter(),
  +    tailFilter(),
  +    closed(0),
  +    mutex(getSynchronizationPool())
   {
   }
   
   AppenderSkeleton::AppenderSkeleton(const LayoutPtr& layout)
  -: errorHandler(new OnlyOnceErrorHandler()),
  -  closed(0),
  -  threshold(Level::getAll()),
  -  layout(layout),
  +: layout(layout),
     name(),
  +  threshold(Level::getAll()),
  +  errorHandler(new OnlyOnceErrorHandler()),
     headFilter(),
     tailFilter(),
  +  closed(0),
     mutex(getSynchronizationPool())
   {
   }
  
  
  
  1.16      +18 -12    logging-log4cxx/src/asyncappender.cpp
  
  Index: asyncappender.cpp
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/src/asyncappender.cpp,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- asyncappender.cpp	11 Dec 2004 04:53:24 -0000	1.15
  +++ asyncappender.cpp	16 Dec 2004 19:41:03 -0000	1.16
  @@ -32,13 +32,16 @@
   
   
   AsyncAppender::AsyncAppender()
  -: AppenderSkeleton(), locationInfo(true),
  +: AppenderSkeleton(), 
  +  pool(), 
  +  queue(), 
     size(DEFAULT_BUFFER_SIZE),
  -  queue(), pending(pool), available(pool)
  -{
  -    aai = new AppenderAttachableImpl();
  -
  -	thread.run(pool, dispatch, this);
  +  available(pool), 
  +  pending(pool),
  +  thread(),
  +  locationInfo(true),
  +  aai(new AppenderAttachableImpl()) {
  +  thread.run(pool, dispatch, this);
   }
   
   AsyncAppender::~AsyncAppender()
  @@ -69,7 +72,7 @@
   	{
   		synchronized sync(mutex);
   		count = queue.size();
  -                full = count >= size;
  +		full = count >= size;
   		if (!full) {
   			queue.push_back(event);
   		}
  @@ -92,7 +95,7 @@
   	//
   	//   if was full, add it now
   	//
  -        if (full) {
  +	if (full) {
   		synchronized sync(mutex);
   		queue.push_back(event);
   		pending.broadcast();
  @@ -132,6 +135,9 @@
   
   void AsyncAppender::setBufferSize(int size)
   {
  +    if (size < 0) {
  +	  throw IllegalArgumentException();
  +	}
   	this->size = size;
   }
   
  @@ -179,17 +185,17 @@
   			}
   			pThis->pending.wait();
   		} else {
  -	                if(pThis->aai != 0) {
  +			if(pThis->aai != 0) {
   			    synchronized sync(pThis->aai->getMutex());
  -                            Pool p;
  +				Pool p;
   			    pThis->aai->appendLoopOnAppenders(event, p);
   			}
   
  -			if (count == pThis->getBufferSize()) {
  +			if (count == (size_t) pThis->getBufferSize()) {
   				pThis->available.broadcast();
   			}
   
  -                        LoggingEventPtr nullEvent;
  +			LoggingEventPtr nullEvent;
   			event = nullEvent;
   		}
   	}
  
  
  
  1.18      +1 -1      logging-log4cxx/src/hierarchy.cpp
  
  Index: hierarchy.cpp
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/src/hierarchy.cpp,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- hierarchy.cpp	13 Dec 2004 05:05:13 -0000	1.17
  +++ hierarchy.cpp	16 Dec 2004 19:41:03 -0000	1.18
  @@ -288,7 +288,7 @@
           //tcout << _T("UpdateParents called for ") << name << std::endl;
   
           // if name = "w.x.y.z", loop thourgh "w.x.y", "w.x" and "w", but not "w.x.y.z"
  -        for(int i = name.find_last_of(L'.', length-1); i != LogString::npos;
  +        for(size_t i = name.find_last_of(L'.', length-1); i != LogString::npos;
           i = name.find_last_of(L'.', i-1))
           {
                   LogString substr = name.substr(0, i);
  
  
  
  1.5       +7 -8      logging-log4cxx/src/locationinfo.cpp
  
  Index: locationinfo.cpp
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/src/locationinfo.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- locationinfo.cpp	11 Dec 2004 04:53:25 -0000	1.4
  +++ locationinfo.cpp	16 Dec 2004 19:41:03 -0000	1.5
  @@ -38,21 +38,20 @@
                 const char * const className,
                 const char * const methodName,
                 int lineNumber )
  -     : fileName( fileName ),
  -       className( className ),
  -       methodName( methodName ),
  -       lineNumber( lineNumber )
  -     {
  +     :  lineNumber( lineNumber ),
  +        fileName( fileName ),
  +        className( className ),
  +        methodName( methodName ) {
   }
   
   /**
   *   Default constructor.
   */
    LocationInfo::LocationInfo()
  -   : fileName(LocationInfo::NA),
  +   : lineNumber( -1 ),
  +     fileName(LocationInfo::NA),
        className(LocationInfo::NA),
  -     methodName(LocationInfo::NA),
  -     lineNumber(-1) {
  +     methodName(LocationInfo::NA) {
   }
   
   /**
  
  
  
  1.21      +2 -1      logging-log4cxx/src/logger.cpp
  
  Index: logger.cpp
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/src/logger.cpp,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- logger.cpp	13 Dec 2004 05:05:13 -0000	1.20
  +++ logger.cpp	16 Dec 2004 19:41:03 -0000	1.21
  @@ -35,7 +35,8 @@
   IMPLEMENT_LOG4CXX_OBJECT(Logger)
   
   Logger::Logger(const LogString& name)
  -: name(name), additive(true), repository(0), pool(), mutex(pool)
  +: name(name), level(), parent(), resourceBundle(),
  +  repository(0), aai(), additive(true),  pool(), mutex(pool)
   {
   }
   
  
  
  
  1.9       +2 -0      logging-log4cxx/src/mutex.cpp
  
  Index: mutex.cpp
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/src/mutex.cpp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- mutex.cpp	26 Nov 2004 07:23:30 -0000	1.8
  +++ mutex.cpp	16 Dec 2004 19:41:03 -0000	1.9
  @@ -18,6 +18,7 @@
   
   #include <log4cxx/helpers/mutex.h>
   #include <apr_thread_mutex.h>
  +#include <assert.h>
   
   using namespace log4cxx::helpers;
   using namespace log4cxx;
  @@ -33,4 +34,5 @@
   
   Mutex::~Mutex() {
   	apr_status_t stat = apr_thread_mutex_destroy(mutex);
  +	assert(stat == APR_SUCCESS);
   }
  
  
  
  1.21      +33 -19    logging-log4cxx/src/patternparser.cpp
  
  Index: patternparser.cpp
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/src/patternparser.cpp,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- patternparser.cpp	11 Dec 2004 04:53:25 -0000	1.20
  +++ patternparser.cpp	16 Dec 2004 19:41:03 -0000	1.21
  @@ -60,8 +60,16 @@
   
   
   PatternParser::PatternParser(const LogString& pattern, const LogString& timeZone)
  -: pattern(pattern), patternLength(pattern.length()), state(LITERAL_STATE), i(0),
  -timeZone(timeZone), currentLiteral()
  +: 
  +   state(LITERAL_STATE), 
  +   currentLiteral(),
  +   patternLength(pattern.length()), 
  +   i(0),
  +   head(),
  +   tail(),
  +   formattingInfo(),
  +   pattern(pattern), 
  +   timeZone(timeZone) 
   {
   }
   
  @@ -82,7 +90,7 @@
   {
   	if((i < patternLength) && (pattern.at(i) == LOG4CXX_STR('{')))
   	{
  -		int end = pattern.find(LOG4CXX_STR('}'), i);
  +		size_t end = pattern.find(LOG4CXX_STR('}'), i);
   		if (end > i)
   		{
   			LogString r = pattern.substr(i + 1, end - (i + 1));
  @@ -261,18 +269,18 @@
   			df = new DateTimeDateFormat();
   		else
   		{
  -                        if (dateFormatStr.find(LOG4CXX_STR('%')) == std::string::npos) {
  -			  df = new SimpleDateFormat(dateFormatStr);
  -                        } else {
  -                          df = new StrftimeDateFormat(dateFormatStr);
  -                        }
  +			if (dateFormatStr.find(LOG4CXX_STR('%')) == std::string::npos) {
  +			    df = new SimpleDateFormat(dateFormatStr);
  +			} else {
  +				df = new StrftimeDateFormat(dateFormatStr);
  +			}
   		}
                   DateFormatPtr formatter(df);
                   df = new CachedDateFormat(formatter);
   		pc = new DatePatternConverter(formattingInfo, df);
   		//LogLog.debug("DATE converter {"+dateFormatStr+"}.");
   		//formattingInfo.dump();
  -                currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
  +		currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
   		break;
   	}
   	case LOG4CXX_STR('F'):
  @@ -287,7 +295,7 @@
   			FULL_LOCATION_CONVERTER);
   		//LogLog.debug("Location converter.");
   		//formattingInfo.dump();
  -                currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
  +		currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
   		break;
   	case LOG4CXX_STR('L'):
   
  @@ -295,20 +303,20 @@
   			LINE_LOCATION_CONVERTER);
   		//LogLog.debug("LINE NUMBER converter.");
   		//formattingInfo.dump();
  -                currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
  +		currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
   		break;
   	case LOG4CXX_STR('m'):
   		pc = new BasicPatternConverter(formattingInfo, MESSAGE_CONVERTER);
   		//LogLog.debug("MESSAGE converter.");
   		//formattingInfo.dump();
  -                currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
  +		currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
   		break;
   	case LOG4CXX_STR('p'):
   		{
   		pc = new BasicPatternConverter(formattingInfo, LEVEL_CONVERTER);
   		//LogLog.debug("LEVEL converter.");
   		//formattingInfo.dump();
  -                currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
  +        currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
   		}
   		break;
   	case LOG4CXX_STR('r'):
  @@ -318,12 +326,15 @@
   		//formattingInfo.dump();
                   currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
   		break;
  +
   	case LOG4CXX_STR('t'):
   		pc = new BasicPatternConverter(formattingInfo, THREAD_CONVERTER);
   		//LogLog.debug("THREAD converter.");
   		//formattingInfo.dump();
  -                currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
  +        currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
   		break;
  +		
  +		
   		/*case 'u':
   		if(i < patternLength) {
   		char cNext = pattern.charAt(i);
  @@ -338,18 +349,21 @@
   		LogLog.error("Unexpected char" +cNext+" at position "+i);
   		}
   		break;*/
  +
   	case LOG4CXX_STR('x'):
   		pc = new BasicPatternConverter(formattingInfo, NDC_CONVERTER);
   		//LogLog.debug("NDC converter.");
  -                currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
  +		currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
   		break;
  +
   	case LOG4CXX_STR('X'):
   	{
   		LogString xOpt = extractOption();
   		pc = new MDCPatternConverter(formattingInfo, xOpt);
  -                currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
  +		currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
   		break;
   	}
  +	
   	default:
   		LogLog::error(((LogString) LOG4CXX_STR("Unexpected char ["))
                           + LogString(1, c)
  @@ -357,7 +371,7 @@
                           + StringHelper::toString(i)
   			+ LOG4CXX_STR(" in conversion pattern."));
   		pc = new LiteralPatternConverter(currentLiteral);
  -                currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
  +		currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
   	}
   
   	addConverter(pc);
  @@ -514,11 +528,11 @@
   
   	if(precision <= 0)
   	{
  -                sbuf.append(event->getLoggerName());
  +		sbuf.append(event->getLoggerName());
   	}
   	else
   	{
  -                const LogString& n = event->getLoggerName();
  +		const LogString& n = event->getLoggerName();
   		LogString::size_type len = n.length();
   
   		// We substract 1 from 'len' when assigning to 'end' to avoid out of
  
  
  
  1.4       +25 -14    logging-log4cxx/src/socketappenderskeleton.cpp
  
  Index: socketappenderskeleton.cpp
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/src/socketappenderskeleton.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- socketappenderskeleton.cpp	11 Dec 2004 04:53:25 -0000	1.3
  +++ socketappenderskeleton.cpp	16 Dec 2004 19:41:03 -0000	1.4
  @@ -38,28 +38,39 @@
   
   
   SocketAppenderSkeleton::SocketAppenderSkeleton(int defaultPort, int reconnectionDelay)
  -: port(defaultPort), reconnectionDelay(reconnectionDelay),
  -locationInfo(false),
  -remoteHost(), address(), os(), thread()
  -
  -{
  +:  pool(),
  +   remoteHost(), 
  +   address(), 
  +   port(defaultPort), 
  +   os(), 
  +   reconnectionDelay(reconnectionDelay),
  +   locationInfo(false),
  +   thread() {
   }
   
   SocketAppenderSkeleton::SocketAppenderSkeleton(unsigned long address, int port, int delay)
  -: port(port), reconnectionDelay(delay),
  -locationInfo(false),
  -os(), thread() {
  +:
  +   pool(),
  +   remoteHost(),
  +   address(), 
  +   port(port), 
  +   os(), 
  +   reconnectionDelay(delay),
  +   locationInfo(false),
  +   thread() {
       this->address.address = address;
       remoteHost = this->address.getHostName();
   }
   
   SocketAppenderSkeleton::SocketAppenderSkeleton(const LogString& host, int port, int delay)
  -: address(InetAddress::getByName(host)), port(port),
  -reconnectionDelay(delay), locationInfo(false),
  -remoteHost(host),
  -os(), thread()
  -
  -{
  +:   pool(),
  +    remoteHost(host),
  +    address(InetAddress::getByName(host)), 
  +	port(port),
  +    os(), 
  +    reconnectionDelay(delay), 
  +	locationInfo(false),
  +	thread() {
   }
   
   SocketAppenderSkeleton::~SocketAppenderSkeleton()
  
  
  
  1.11      +9 -13     logging-log4cxx/tests/src/asyncappendertestcase.cpp
  
  Index: asyncappendertestcase.cpp
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/tests/src/asyncappendertestcase.cpp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- asyncappendertestcase.cpp	16 Dec 2004 06:41:16 -0000	1.10
  +++ asyncappendertestcase.cpp	16 Dec 2004 19:41:03 -0000	1.11
  @@ -23,7 +23,7 @@
   #include "vectorappender.h"
   #include <log4cxx/asyncappender.h>
   #include "appenderskeletontestcase.h"
  -#include <apr_pools.h>
  +#include <log4cxx/helpers/pool.h>
   #include <apr_strings.h>
   #include "testchar.h"
   
  @@ -111,7 +111,7 @@
   	void test3()
   	{
   		typedef std::vector<spi::LoggingEventPtr>::size_type size_type;
  -		int LEN = 200;
  +		size_t LEN = 200;
   		LoggerPtr root = Logger::getRootLogger();
   		LayoutPtr layout = new SimpleLayout();
   		VectorAppenderPtr vectorAppender = new VectorAppender();
  @@ -120,24 +120,20 @@
   		asyncAppender->addAppender(vectorAppender);
   		root->addAppender(asyncAppender);
   
  -                apr_pool_t* pool;
  -                apr_status_t rv = apr_pool_create(&pool, NULL);
  -                std::string msg("message");
  -		for (int i = 0; i < LEN; i++)
  -		{
  -                        msg.erase(msg.begin() + 7, msg.end());
  -                        msg.append(apr_itoa(pool, i));
  +        Pool pool;
  +		std::string msg("message");
  +		for (size_t i = 0; i < LEN; i++) {
  +			msg.erase(msg.begin() + 7, msg.end());
  +			msg.append(apr_itoa(pool, i));
   			LOG4CXX_DEBUG(root, msg);
   		}
   
   		asyncAppender->close();
   		root->debug(LOG4CXX_TEST_STR("m2"));
   
  -                apr_pool_destroy(pool);
  -
   		const std::vector<spi::LoggingEventPtr>& v = vectorAppender->getVector();
  -		CPPUNIT_ASSERT(v.size() == LEN);
  -		CPPUNIT_ASSERT(vectorAppender->isClosed());
  +		CPPUNIT_ASSERT_EQUAL(LEN, v.size());
  +		CPPUNIT_ASSERT_EQUAL(true, vectorAppender->isClosed());
   	}
   };
   
  
  
  
  1.9       +1 -1      logging-log4cxx/tests/src/main.cpp
  
  Index: main.cpp
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/tests/src/main.cpp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- main.cpp	15 Dec 2004 08:10:39 -0000	1.8
  +++ main.cpp	16 Dec 2004 19:41:03 -0000	1.9
  @@ -59,7 +59,7 @@
           }
           else
           {
  -                bool wasSuccessful = runner.run("", false);
  +                wasSuccessful = runner.run("", false);
           }
   
           apr_terminate();
  
  
  
  1.10      +4 -7      logging-log4cxx/tests/src/minimumtestcase.cpp
  
  Index: minimumtestcase.cpp
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/tests/src/minimumtestcase.cpp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- minimumtestcase.cpp	16 Dec 2004 06:41:16 -0000	1.9
  +++ minimumtestcase.cpp	16 Dec 2004 19:41:03 -0000	1.10
  @@ -31,7 +31,7 @@
   #include "util/threadfilter.h"
   #include <log4cxx/file.h>
   #include <iostream>
  -#include <apr_pools.h>
  +#include <log4cxx/helpers/pool.h>
   #include <apr_strings.h>
   #include "testchar.h"
   
  @@ -140,10 +140,9 @@
   		LoggerPtr INF_ERR_UNDEF = Logger::getLogger(LOG4CXX_TEST_STR("INF.ERR.UNDEF"));
   		LoggerPtr UNDEF = Logger::getLogger(LOG4CXX_TEST_STR("UNDEF"));
   
  -                apr_pool_t* pool;
  -                apr_status_t rv = apr_pool_create(&pool, NULL);
  +        Pool pool;
   
  -                std::string msg("Message ");
  +		std::string msg("Message ");
   
   		// These should all log.----------------------------
   		LOG4CXX_FATAL(ERR, createMessage(i, pool));
  @@ -231,9 +230,7 @@
   
   		// -------------------------------------------------
   		LOG4CXX_INFO(INF, LOG4CXX_TEST_STR("Messages should bear numbers 0 through 23."));
  -
  -                apr_pool_destroy(pool);
  -	}
  +   }
   
   	LoggerPtr root;
   	LoggerPtr logger;
  
  
  
  1.9       +3 -5      logging-log4cxx/tests/src/patternlayouttest.cpp
  
  Index: patternlayouttest.cpp
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/tests/src/patternlayouttest.cpp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- patternlayouttest.cpp	16 Dec 2004 06:41:16 -0000	1.8
  +++ patternlayouttest.cpp	16 Dec 2004 19:41:03 -0000	1.9
  @@ -35,7 +35,7 @@
   #include "util/filenamefilter.h"
   #include <iostream>
   #include <log4cxx/helpers/transcoder.h>
  -#include <apr_pools.h>
  +#include <log4cxx/helpers/pool.h>
   #include <apr_strings.h>
   #include <log4cxx/helpers/pool.h>
   #include "testchar.h"
  @@ -57,6 +57,7 @@
   #define PAT_MDC_1 LOG4CXX_STR("")
   
   using namespace log4cxx;
  +using namespace log4cxx::helpers;
   
   class PatternLayoutTest : public CppUnit::TestFixture
   {
  @@ -510,8 +511,7 @@
   	{
   		int i = -1;
   
  -                apr_pool_t* pool;
  -                apr_status_t rv = apr_pool_create(&pool, NULL);
  +        Pool pool;
   
   
   		LOG4CXX_DEBUG(logger, createMessage(pool, ++i));
  @@ -528,8 +528,6 @@
   
   		LOG4CXX_FATAL(logger, createMessage(pool, ++i));
   		LOG4CXX_FATAL(root, createMessage(pool, i));
  -
  -                apr_pool_destroy(pool);
   	}
   };
   
  
  
  
  1.9       +9 -3      logging-log4cxx/tests/src/util/filter.h
  
  Index: filter.h
  ===================================================================
  RCS file: /home/cvs/logging-log4cxx/tests/src/util/filter.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- filter.h	12 Dec 2004 05:53:58 -0000	1.8
  +++ filter.h	16 Dec 2004 19:41:04 -0000	1.9
  @@ -41,17 +41,23 @@
   	class Filter
   	{
   	public:
  +	    Filter() {}
  +	    virtual ~Filter() {}
   		virtual LogString filter(const LogString& in)
   			const throw(UnexpectedFormatException) = 0;
   
   		static std::string merge(const std::string& pattern,
  -                   const std::string& in, const std::string& fmt);
  +		const std::string& in, const std::string& fmt);
   		static bool match(const std::string& pattern,
                       const std::string& in);
  -                static std::wstring merge(const std::wstring& pattern,
  +		static std::wstring merge(const std::wstring& pattern,
                       const std::wstring& in, const std::wstring& fmt);
  -                static bool match(const std::wstring& pattern,
  +		static bool match(const std::wstring& pattern,
                       const std::wstring& in);
  +					
  +	private:
  +	    Filter(const Filter&);
  +	    Filter& operator=(const Filter&);
   	};
   }