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 2007/07/24 22:18:30 UTC

svn commit: r559190 [1/2] - in /logging/log4cxx/trunk: ./ docs/ examples/ include/ mock/ performance/ simplesocketserver/ src/ src/apr-util/ src/apr-util/ant/ src/apr/ src/apr/ant/ src/assembly/ src/changes/ src/cppunit/ src/cppunit/ant/ src/examples/ ...

Author: carnold
Date: Tue Jul 24 13:18:15 2007
New Revision: 559190

URL: http://svn.apache.org/viewvc?view=rev&rev=559190
Log:
LOGCXX-189: Migrate to Maven 2.0 and standard directory layout

Added:
    logging/log4cxx/trunk/pom.xml
      - copied, changed from r558239, incubator/log4php/trunk/pom.xml
    logging/log4cxx/trunk/src/apr/
    logging/log4cxx/trunk/src/apr-util/
    logging/log4cxx/trunk/src/apr-util/ant/
    logging/log4cxx/trunk/src/apr-util/ant/build.xml
      - copied unchanged from r558823, logging/log4cxx/trunk/aprutil-build.xml
    logging/log4cxx/trunk/src/apr/ant/
    logging/log4cxx/trunk/src/apr/ant/build.xml
      - copied unchanged from r558823, logging/log4cxx/trunk/apr-build.xml
    logging/log4cxx/trunk/src/assembly/
      - copied from r558343, logging/log4j/branches/v1_2-branch/src/assembly/
    logging/log4cxx/trunk/src/changes/
    logging/log4cxx/trunk/src/changes/changes.xml
    logging/log4cxx/trunk/src/changes/changes.xslt
    logging/log4cxx/trunk/src/cppunit/
    logging/log4cxx/trunk/src/cppunit/ant/
    logging/log4cxx/trunk/src/cppunit/ant/build.xml
      - copied unchanged from r558823, logging/log4cxx/trunk/cppunit-build.xml
    logging/log4cxx/trunk/src/examples/
    logging/log4cxx/trunk/src/examples/cpp/
      - copied from r558823, logging/log4cxx/trunk/examples/
    logging/log4cxx/trunk/src/examples/cpp/Makefile.am
      - copied unchanged from r558835, logging/log4cxx/trunk/examples/Makefile.am
    logging/log4cxx/trunk/src/examples/cpp/console.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/examples/console.cpp
    logging/log4cxx/trunk/src/examples/cpp/delayedloop.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/examples/delayedloop.cpp
    logging/log4cxx/trunk/src/examples/cpp/stream.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/examples/stream.cpp
    logging/log4cxx/trunk/src/examples/cpp/trivial.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/examples/trivial.cpp
    logging/log4cxx/trunk/src/main/
    logging/log4cxx/trunk/src/main/cpp/
    logging/log4cxx/trunk/src/main/cpp/Makefile.am
      - copied unchanged from r558835, logging/log4cxx/trunk/src/Makefile.am
    logging/log4cxx/trunk/src/main/cpp/action.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/action.cpp
    logging/log4cxx/trunk/src/main/cpp/appenderattachableimpl.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/appenderattachableimpl.cpp
    logging/log4cxx/trunk/src/main/cpp/appenderskeleton.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/appenderskeleton.cpp
    logging/log4cxx/trunk/src/main/cpp/aprinitializer.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/aprinitializer.cpp
    logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/asyncappender.cpp
    logging/log4cxx/trunk/src/main/cpp/basicconfigurator.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/basicconfigurator.cpp
    logging/log4cxx/trunk/src/main/cpp/bufferedwriter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/bufferedwriter.cpp
    logging/log4cxx/trunk/src/main/cpp/bytearrayinputstream.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/bytearrayinputstream.cpp
    logging/log4cxx/trunk/src/main/cpp/bytebuffer.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/bytebuffer.cpp
    logging/log4cxx/trunk/src/main/cpp/cacheddateformat.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/cacheddateformat.cpp
    logging/log4cxx/trunk/src/main/cpp/charsetdecoder.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/charsetdecoder.cpp
    logging/log4cxx/trunk/src/main/cpp/charsetencoder.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/charsetencoder.cpp
    logging/log4cxx/trunk/src/main/cpp/class.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/class.cpp
    logging/log4cxx/trunk/src/main/cpp/classnamepatternconverter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/classnamepatternconverter.cpp
    logging/log4cxx/trunk/src/main/cpp/classregistration.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/classregistration.cpp
    logging/log4cxx/trunk/src/main/cpp/condition.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/condition.cpp
    logging/log4cxx/trunk/src/main/cpp/configurator.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/configurator.cpp
    logging/log4cxx/trunk/src/main/cpp/consoleappender.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/consoleappender.cpp
    logging/log4cxx/trunk/src/main/cpp/cyclicbuffer.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/cyclicbuffer.cpp
    logging/log4cxx/trunk/src/main/cpp/dailyrollingfileappender.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/dailyrollingfileappender.cpp
    logging/log4cxx/trunk/src/main/cpp/datagrampacket.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/datagrampacket.cpp
    logging/log4cxx/trunk/src/main/cpp/datagramsocket.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/datagramsocket.cpp
    logging/log4cxx/trunk/src/main/cpp/date.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/date.cpp
    logging/log4cxx/trunk/src/main/cpp/dateformat.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/dateformat.cpp
    logging/log4cxx/trunk/src/main/cpp/datelayout.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/datelayout.cpp
    logging/log4cxx/trunk/src/main/cpp/datepatternconverter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/datepatternconverter.cpp
    logging/log4cxx/trunk/src/main/cpp/defaultcategoryfactory.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/defaultcategoryfactory.cpp
    logging/log4cxx/trunk/src/main/cpp/defaultconfigurator.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/defaultconfigurator.cpp
    logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/domconfigurator.cpp
    logging/log4cxx/trunk/src/main/cpp/exception.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/exception.cpp
    logging/log4cxx/trunk/src/main/cpp/fallbackerrorhandler.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/fallbackerrorhandler.cpp
    logging/log4cxx/trunk/src/main/cpp/file.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/file.cpp
    logging/log4cxx/trunk/src/main/cpp/fileappender.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/fileappender.cpp
    logging/log4cxx/trunk/src/main/cpp/filedatepatternconverter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/filedatepatternconverter.cpp
    logging/log4cxx/trunk/src/main/cpp/fileinputstream.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/fileinputstream.cpp
    logging/log4cxx/trunk/src/main/cpp/filelocationpatternconverter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/filelocationpatternconverter.cpp
    logging/log4cxx/trunk/src/main/cpp/fileoutputstream.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/fileoutputstream.cpp
    logging/log4cxx/trunk/src/main/cpp/filerenameaction.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/filerenameaction.cpp
    logging/log4cxx/trunk/src/main/cpp/filewatchdog.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/filewatchdog.cpp
    logging/log4cxx/trunk/src/main/cpp/filterbasedtriggeringpolicy.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/filterbasedtriggeringpolicy.cpp
    logging/log4cxx/trunk/src/main/cpp/fixedwindowrollingpolicy.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/fixedwindowrollingpolicy.cpp
    logging/log4cxx/trunk/src/main/cpp/formattinginfo.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/formattinginfo.cpp
    logging/log4cxx/trunk/src/main/cpp/fulllocationpatternconverter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/fulllocationpatternconverter.cpp
    logging/log4cxx/trunk/src/main/cpp/hierarchy.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/hierarchy.cpp
    logging/log4cxx/trunk/src/main/cpp/htmllayout.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/htmllayout.cpp
    logging/log4cxx/trunk/src/main/cpp/inetaddress.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/inetaddress.cpp
    logging/log4cxx/trunk/src/main/cpp/inputstream.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/inputstream.cpp
    logging/log4cxx/trunk/src/main/cpp/inputstreamreader.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/inputstreamreader.cpp
    logging/log4cxx/trunk/src/main/cpp/integer.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/integer.cpp
    logging/log4cxx/trunk/src/main/cpp/integerpatternconverter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/integerpatternconverter.cpp
    logging/log4cxx/trunk/src/main/cpp/layout.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/layout.cpp
    logging/log4cxx/trunk/src/main/cpp/level.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/level.cpp
    logging/log4cxx/trunk/src/main/cpp/levelmatchfilter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/levelmatchfilter.cpp
    logging/log4cxx/trunk/src/main/cpp/levelpatternconverter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/levelpatternconverter.cpp
    logging/log4cxx/trunk/src/main/cpp/levelrangefilter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/levelrangefilter.cpp
    logging/log4cxx/trunk/src/main/cpp/linelocationpatternconverter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/linelocationpatternconverter.cpp
    logging/log4cxx/trunk/src/main/cpp/lineseparatorpatternconverter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/lineseparatorpatternconverter.cpp
    logging/log4cxx/trunk/src/main/cpp/literalpatternconverter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/literalpatternconverter.cpp
    logging/log4cxx/trunk/src/main/cpp/loader.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/loader.cpp
    logging/log4cxx/trunk/src/main/cpp/locale.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/locale.cpp
    logging/log4cxx/trunk/src/main/cpp/locationinfo.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/locationinfo.cpp
    logging/log4cxx/trunk/src/main/cpp/logger.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/logger.cpp
    logging/log4cxx/trunk/src/main/cpp/loggerpatternconverter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/loggerpatternconverter.cpp
    logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/loggingevent.cpp
    logging/log4cxx/trunk/src/main/cpp/loggingeventpatternconverter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/loggingeventpatternconverter.cpp
    logging/log4cxx/trunk/src/main/cpp/loglog.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/loglog.cpp
    logging/log4cxx/trunk/src/main/cpp/logmanager.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/logmanager.cpp
    logging/log4cxx/trunk/src/main/cpp/logstream.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/logstream.cpp
    logging/log4cxx/trunk/src/main/cpp/manualtriggeringpolicy.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/manualtriggeringpolicy.cpp
    logging/log4cxx/trunk/src/main/cpp/mdc.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/mdc.cpp
    logging/log4cxx/trunk/src/main/cpp/messagepatternconverter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/messagepatternconverter.cpp
    logging/log4cxx/trunk/src/main/cpp/methodlocationpatternconverter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/methodlocationpatternconverter.cpp
    logging/log4cxx/trunk/src/main/cpp/mutex.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/mutex.cpp
    logging/log4cxx/trunk/src/main/cpp/nameabbreviator.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/nameabbreviator.cpp
    logging/log4cxx/trunk/src/main/cpp/namepatternconverter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/namepatternconverter.cpp
    logging/log4cxx/trunk/src/main/cpp/ndc.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/ndc.cpp
    logging/log4cxx/trunk/src/main/cpp/ndcpatternconverter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/ndcpatternconverter.cpp
    logging/log4cxx/trunk/src/main/cpp/nteventlogappender.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/nteventlogappender.cpp
    logging/log4cxx/trunk/src/main/cpp/objectimpl.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/objectimpl.cpp
    logging/log4cxx/trunk/src/main/cpp/objectptr.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/objectptr.cpp
    logging/log4cxx/trunk/src/main/cpp/obsoleterollingfileappender.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/obsoleterollingfileappender.cpp
    logging/log4cxx/trunk/src/main/cpp/odbcappender.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/odbcappender.cpp
    logging/log4cxx/trunk/src/main/cpp/onlyonceerrorhandler.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/onlyonceerrorhandler.cpp
    logging/log4cxx/trunk/src/main/cpp/optionconverter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/optionconverter.cpp
    logging/log4cxx/trunk/src/main/cpp/outputdebugstringappender.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/outputdebugstringappender.cpp
    logging/log4cxx/trunk/src/main/cpp/outputstream.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/outputstream.cpp
    logging/log4cxx/trunk/src/main/cpp/outputstreamwriter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/outputstreamwriter.cpp
    logging/log4cxx/trunk/src/main/cpp/patternconverter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/patternconverter.cpp
    logging/log4cxx/trunk/src/main/cpp/patternlayout.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/patternlayout.cpp
    logging/log4cxx/trunk/src/main/cpp/patternparser.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/patternparser.cpp
    logging/log4cxx/trunk/src/main/cpp/pool.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/pool.cpp
    logging/log4cxx/trunk/src/main/cpp/properties.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/properties.cpp
    logging/log4cxx/trunk/src/main/cpp/propertiespatternconverter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/propertiespatternconverter.cpp
    logging/log4cxx/trunk/src/main/cpp/propertyconfigurator.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/propertyconfigurator.cpp
    logging/log4cxx/trunk/src/main/cpp/propertyresourcebundle.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/propertyresourcebundle.cpp
    logging/log4cxx/trunk/src/main/cpp/propertysetter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/propertysetter.cpp
    logging/log4cxx/trunk/src/main/cpp/reader.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/reader.cpp
    logging/log4cxx/trunk/src/main/cpp/relativetimedateformat.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/relativetimedateformat.cpp
    logging/log4cxx/trunk/src/main/cpp/relativetimepatternconverter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/relativetimepatternconverter.cpp
    logging/log4cxx/trunk/src/main/cpp/resourcebundle.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/resourcebundle.cpp
    logging/log4cxx/trunk/src/main/cpp/rollingfileappender.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/rollingfileappender.cpp
    logging/log4cxx/trunk/src/main/cpp/rollingpolicy.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/rollingpolicy.cpp
    logging/log4cxx/trunk/src/main/cpp/rollingpolicybase.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/rollingpolicybase.cpp
    logging/log4cxx/trunk/src/main/cpp/rolloverdescription.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/rolloverdescription.cpp
    logging/log4cxx/trunk/src/main/cpp/rootcategory.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/rootcategory.cpp
    logging/log4cxx/trunk/src/main/cpp/serversocket.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/serversocket.cpp
    logging/log4cxx/trunk/src/main/cpp/simpledateformat.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/simpledateformat.cpp
    logging/log4cxx/trunk/src/main/cpp/simplelayout.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/simplelayout.cpp
    logging/log4cxx/trunk/src/main/cpp/sizebasedtriggeringpolicy.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/sizebasedtriggeringpolicy.cpp
    logging/log4cxx/trunk/src/main/cpp/smtpappender.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/smtpappender.cpp
    logging/log4cxx/trunk/src/main/cpp/socket.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/socket.cpp
    logging/log4cxx/trunk/src/main/cpp/socketappender.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/socketappender.cpp
    logging/log4cxx/trunk/src/main/cpp/socketappenderskeleton.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/socketappenderskeleton.cpp
    logging/log4cxx/trunk/src/main/cpp/sockethubappender.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/sockethubappender.cpp
    logging/log4cxx/trunk/src/main/cpp/socketimpl.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/socketimpl.cpp
    logging/log4cxx/trunk/src/main/cpp/socketinputstream.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/socketinputstream.cpp
    logging/log4cxx/trunk/src/main/cpp/socketnode.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/socketnode.cpp
    logging/log4cxx/trunk/src/main/cpp/socketoutputstream.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/socketoutputstream.cpp
    logging/log4cxx/trunk/src/main/cpp/strftimedateformat.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/strftimedateformat.cpp
    logging/log4cxx/trunk/src/main/cpp/stringhelper.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/stringhelper.cpp
    logging/log4cxx/trunk/src/main/cpp/stringmatchfilter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/stringmatchfilter.cpp
    logging/log4cxx/trunk/src/main/cpp/stringtokenizer.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/stringtokenizer.cpp
    logging/log4cxx/trunk/src/main/cpp/synchronized.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/synchronized.cpp
    logging/log4cxx/trunk/src/main/cpp/syslogappender.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/syslogappender.cpp
    logging/log4cxx/trunk/src/main/cpp/syslogwriter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/syslogwriter.cpp
    logging/log4cxx/trunk/src/main/cpp/system.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/system.cpp
    logging/log4cxx/trunk/src/main/cpp/systemerrwriter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/systemerrwriter.cpp
    logging/log4cxx/trunk/src/main/cpp/systemoutwriter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/systemoutwriter.cpp
    logging/log4cxx/trunk/src/main/cpp/telnetappender.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/telnetappender.cpp
    logging/log4cxx/trunk/src/main/cpp/thread.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/thread.cpp
    logging/log4cxx/trunk/src/main/cpp/threadpatternconverter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/threadpatternconverter.cpp
    logging/log4cxx/trunk/src/main/cpp/threadspecificdata.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/threadspecificdata.cpp
    logging/log4cxx/trunk/src/main/cpp/throwableinformationpatternconverter.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/throwableinformationpatternconverter.cpp
    logging/log4cxx/trunk/src/main/cpp/timebasedrollingpolicy.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/timebasedrollingpolicy.cpp
    logging/log4cxx/trunk/src/main/cpp/timezone.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/timezone.cpp
    logging/log4cxx/trunk/src/main/cpp/transcoder.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/transcoder.cpp
    logging/log4cxx/trunk/src/main/cpp/transform.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/transform.cpp
    logging/log4cxx/trunk/src/main/cpp/triggeringpolicy.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/triggeringpolicy.cpp
    logging/log4cxx/trunk/src/main/cpp/ttcclayout.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/ttcclayout.cpp
    logging/log4cxx/trunk/src/main/cpp/unicodehelper.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/unicodehelper.cpp
    logging/log4cxx/trunk/src/main/cpp/writer.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/writer.cpp
    logging/log4cxx/trunk/src/main/cpp/writerappender.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/writerappender.cpp
    logging/log4cxx/trunk/src/main/cpp/xmllayout.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/xmllayout.cpp
    logging/log4cxx/trunk/src/main/cpp/xmlsocketappender.cpp
      - copied unchanged from r558823, logging/log4cxx/trunk/src/xmlsocketappender.cpp
    logging/log4cxx/trunk/src/main/include/
      - copied from r558823, logging/log4cxx/trunk/include/
    logging/log4cxx/trunk/src/main/include/Makefile.am
      - copied unchanged from r558835, logging/log4cxx/trunk/include/Makefile.am
    logging/log4cxx/trunk/src/main/include/log4cxx/
      - copied from r558835, logging/log4cxx/trunk/include/log4cxx/
    logging/log4cxx/trunk/src/mock/
    logging/log4cxx/trunk/src/mock/include/
      - copied from r558823, logging/log4cxx/trunk/mock/
    logging/log4cxx/trunk/src/mock/include/deque
      - copied unchanged from r558835, logging/log4cxx/trunk/mock/deque
    logging/log4cxx/trunk/src/mock/include/list
      - copied unchanged from r558835, logging/log4cxx/trunk/mock/list
    logging/log4cxx/trunk/src/mock/include/map
      - copied unchanged from r558835, logging/log4cxx/trunk/mock/map
    logging/log4cxx/trunk/src/mock/include/set
      - copied unchanged from r558835, logging/log4cxx/trunk/mock/set
    logging/log4cxx/trunk/src/mock/include/sstream
      - copied unchanged from r558835, logging/log4cxx/trunk/mock/sstream
    logging/log4cxx/trunk/src/mock/include/stack
      - copied unchanged from r558835, logging/log4cxx/trunk/mock/stack
    logging/log4cxx/trunk/src/mock/include/vector
      - copied unchanged from r558835, logging/log4cxx/trunk/mock/vector
    logging/log4cxx/trunk/src/performance/
    logging/log4cxx/trunk/src/performance/cpp/
      - copied from r558823, logging/log4cxx/trunk/performance/
    logging/log4cxx/trunk/src/performance/cpp/Makefile.am
      - copied unchanged from r558835, logging/log4cxx/trunk/performance/Makefile.am
    logging/log4cxx/trunk/src/performance/cpp/main.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/performance/main.cpp
    logging/log4cxx/trunk/src/performance/cpp/nullappender.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/performance/nullappender.cpp
    logging/log4cxx/trunk/src/performance/cpp/xml/
      - copied from r558835, logging/log4cxx/trunk/performance/xml/
    logging/log4cxx/trunk/src/performance/include/
    logging/log4cxx/trunk/src/performance/include/nullappender.h
      - copied unchanged from r558823, logging/log4cxx/trunk/performance/nullappender.h
    logging/log4cxx/trunk/src/simplesocketserver/
    logging/log4cxx/trunk/src/simplesocketserver/cpp/
      - copied from r558823, logging/log4cxx/trunk/simplesocketserver/
    logging/log4cxx/trunk/src/simplesocketserver/cpp/Makefile.am
      - copied unchanged from r558835, logging/log4cxx/trunk/simplesocketserver/Makefile.am
    logging/log4cxx/trunk/src/simplesocketserver/cpp/simplesocketserver.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/simplesocketserver/simplesocketserver.cpp
    logging/log4cxx/trunk/src/site/
    logging/log4cxx/trunk/src/site/apt/
    logging/log4cxx/trunk/src/site/apt/download.apt
      - copied, changed from r558343, logging/log4j/branches/v1_2-branch/src/site/apt/download.apt
    logging/log4cxx/trunk/src/site/apt/roadmap.apt
      - copied, changed from r558343, logging/log4j/branches/v1_2-branch/src/site/apt/roadmap.apt
    logging/log4cxx/trunk/src/site/doxy/
      - copied from r558835, logging/log4cxx/trunk/docs/
    logging/log4cxx/trunk/src/site/fml/
      - copied from r558343, logging/log4j/branches/v1_2-branch/src/site/fml/
    logging/log4cxx/trunk/src/site/site.xml
      - copied, changed from r558232, incubator/log4php/trunk/src/site/site.xml
    logging/log4cxx/trunk/src/site/xdoc/
      - copied from r558823, logging/log4cxx/trunk/xdocs/src/
    logging/log4cxx/trunk/src/site/xdoc/download.xml
      - copied unchanged from r558835, logging/log4cxx/trunk/xdocs/src/download.xml
    logging/log4cxx/trunk/src/site/xdoc/index.xml
      - copied, changed from r558835, logging/log4cxx/trunk/xdocs/src/index.xml
    logging/log4cxx/trunk/src/site/xdoc/manual.xml
      - copied unchanged from r558343, logging/log4j/branches/v1_2-branch/src/site/xdoc/manual.xml
    logging/log4cxx/trunk/src/site/xdoc/news.xml
      - copied unchanged from r558835, logging/log4cxx/trunk/xdocs/src/news.xml
    logging/log4cxx/trunk/src/site/xdoc/performance.xml
      - copied unchanged from r558835, logging/log4cxx/trunk/xdocs/src/performance.xml
    logging/log4cxx/trunk/src/site/xdoc/stylesheets/
      - copied from r558835, logging/log4cxx/trunk/xdocs/src/stylesheets/
    logging/log4cxx/trunk/src/test/
    logging/log4cxx/trunk/src/test/cpp/
      - copied from r558823, logging/log4cxx/trunk/tests/src/
    logging/log4cxx/trunk/src/test/cpp/Makefile.am
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/Makefile.am
    logging/log4cxx/trunk/src/test/cpp/appenderskeletontestcase.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/appenderskeletontestcase.cpp
    logging/log4cxx/trunk/src/test/cpp/appenderskeletontestcase.h
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/appenderskeletontestcase.h
    logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/asyncappendertestcase.cpp
    logging/log4cxx/trunk/src/test/cpp/consoleappendertestcase.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/consoleappendertestcase.cpp
    logging/log4cxx/trunk/src/test/cpp/customlogger/
      - copied from r558835, logging/log4cxx/trunk/tests/src/customlogger/
    logging/log4cxx/trunk/src/test/cpp/db/
      - copied from r558835, logging/log4cxx/trunk/tests/src/db/
    logging/log4cxx/trunk/src/test/cpp/defaultinit/
      - copied from r558835, logging/log4cxx/trunk/tests/src/defaultinit/
    logging/log4cxx/trunk/src/test/cpp/encodingtest.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/encodingtest.cpp
    logging/log4cxx/trunk/src/test/cpp/fileappendertestcase.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/fileappendertestcase.cpp
    logging/log4cxx/trunk/src/test/cpp/fileappendertestcase.h
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/fileappendertestcase.h
    logging/log4cxx/trunk/src/test/cpp/filetestcase.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/filetestcase.cpp
    logging/log4cxx/trunk/src/test/cpp/helpers/
      - copied from r558835, logging/log4cxx/trunk/tests/src/helpers/
    logging/log4cxx/trunk/src/test/cpp/hierarchytest.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/hierarchytest.cpp
    logging/log4cxx/trunk/src/test/cpp/hierarchythresholdtestcase.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/hierarchythresholdtestcase.cpp
    logging/log4cxx/trunk/src/test/cpp/insertwide.h
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/insertwide.h
    logging/log4cxx/trunk/src/test/cpp/l7dtestcase.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/l7dtestcase.cpp
    logging/log4cxx/trunk/src/test/cpp/leveltestcase.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/leveltestcase.cpp
    logging/log4cxx/trunk/src/test/cpp/loggertestcase.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/loggertestcase.cpp
    logging/log4cxx/trunk/src/test/cpp/main.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/main.cpp
    logging/log4cxx/trunk/src/test/cpp/minimumtestcase.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/minimumtestcase.cpp
    logging/log4cxx/trunk/src/test/cpp/ndctestcase.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/ndctestcase.cpp
    logging/log4cxx/trunk/src/test/cpp/net/
      - copied from r558835, logging/log4cxx/trunk/tests/src/net/
    logging/log4cxx/trunk/src/test/cpp/nt/
      - copied from r558835, logging/log4cxx/trunk/tests/src/nt/
    logging/log4cxx/trunk/src/test/cpp/pattern/
      - copied from r558835, logging/log4cxx/trunk/tests/src/pattern/
    logging/log4cxx/trunk/src/test/cpp/patternlayouttest.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/patternlayouttest.cpp
    logging/log4cxx/trunk/src/test/cpp/rolling/
      - copied from r558835, logging/log4cxx/trunk/tests/src/rolling/
    logging/log4cxx/trunk/src/test/cpp/rollingfileappendertestcase.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/rollingfileappendertestcase.cpp
    logging/log4cxx/trunk/src/test/cpp/shortsocketserver.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/shortsocketserver.cpp
    logging/log4cxx/trunk/src/test/cpp/streamtestcase.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/streamtestcase.cpp
    logging/log4cxx/trunk/src/test/cpp/testchar.h
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/testchar.h
    logging/log4cxx/trunk/src/test/cpp/util/
      - copied from r558835, logging/log4cxx/trunk/tests/src/util/
    logging/log4cxx/trunk/src/test/cpp/varia/
      - copied from r558835, logging/log4cxx/trunk/tests/src/varia/
    logging/log4cxx/trunk/src/test/cpp/vectorappender.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/vectorappender.cpp
    logging/log4cxx/trunk/src/test/cpp/vectorappender.h
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/vectorappender.h
    logging/log4cxx/trunk/src/test/cpp/writerappendertestcase.cpp
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/writerappendertestcase.cpp
    logging/log4cxx/trunk/src/test/cpp/writerappendertestcase.h
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/src/writerappendertestcase.h
    logging/log4cxx/trunk/src/test/cpp/xml/
      - copied from r558835, logging/log4cxx/trunk/tests/src/xml/
    logging/log4cxx/trunk/src/test/resources/
      - copied from r558823, logging/log4cxx/trunk/tests/
    logging/log4cxx/trunk/src/test/resources/L7D_en_US.properties
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/L7D_en_US.properties
    logging/log4cxx/trunk/src/test/resources/L7D_fr.properties
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/L7D_fr.properties
    logging/log4cxx/trunk/src/test/resources/L7D_fr_CH.properties
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/L7D_fr_CH.properties
    logging/log4cxx/trunk/src/test/resources/Makefile.am
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/Makefile.am
    logging/log4cxx/trunk/src/test/resources/input/
      - copied from r558835, logging/log4cxx/trunk/tests/input/
    logging/log4cxx/trunk/src/test/resources/log4j.dtd
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/log4j.dtd
    logging/log4cxx/trunk/src/test/resources/performance.xml
      - copied unchanged from r558835, logging/log4cxx/trunk/tests/performance.xml
    logging/log4cxx/trunk/src/test/resources/witness/
      - copied from r558835, logging/log4cxx/trunk/tests/witness/
Removed:
    logging/log4cxx/trunk/AUTHORS
    logging/log4cxx/trunk/NEWS
    logging/log4cxx/trunk/STATUS
    logging/log4cxx/trunk/apr-build.xml
    logging/log4cxx/trunk/aprutil-build.xml
    logging/log4cxx/trunk/cppunit-build.xml
    logging/log4cxx/trunk/docs/
    logging/log4cxx/trunk/examples/
    logging/log4cxx/trunk/include/
    logging/log4cxx/trunk/mock/
    logging/log4cxx/trunk/performance/
    logging/log4cxx/trunk/simplesocketserver/
    logging/log4cxx/trunk/src/action.cpp
    logging/log4cxx/trunk/src/appenderattachableimpl.cpp
    logging/log4cxx/trunk/src/appenderskeleton.cpp
    logging/log4cxx/trunk/src/aprinitializer.cpp
    logging/log4cxx/trunk/src/asyncappender.cpp
    logging/log4cxx/trunk/src/basicconfigurator.cpp
    logging/log4cxx/trunk/src/bufferedwriter.cpp
    logging/log4cxx/trunk/src/bytearrayinputstream.cpp
    logging/log4cxx/trunk/src/bytebuffer.cpp
    logging/log4cxx/trunk/src/cacheddateformat.cpp
    logging/log4cxx/trunk/src/charsetdecoder.cpp
    logging/log4cxx/trunk/src/charsetencoder.cpp
    logging/log4cxx/trunk/src/class.cpp
    logging/log4cxx/trunk/src/classnamepatternconverter.cpp
    logging/log4cxx/trunk/src/classregistration.cpp
    logging/log4cxx/trunk/src/condition.cpp
    logging/log4cxx/trunk/src/configurator.cpp
    logging/log4cxx/trunk/src/consoleappender.cpp
    logging/log4cxx/trunk/src/cyclicbuffer.cpp
    logging/log4cxx/trunk/src/dailyrollingfileappender.cpp
    logging/log4cxx/trunk/src/datagrampacket.cpp
    logging/log4cxx/trunk/src/datagramsocket.cpp
    logging/log4cxx/trunk/src/date.cpp
    logging/log4cxx/trunk/src/dateformat.cpp
    logging/log4cxx/trunk/src/datelayout.cpp
    logging/log4cxx/trunk/src/datepatternconverter.cpp
    logging/log4cxx/trunk/src/defaultcategoryfactory.cpp
    logging/log4cxx/trunk/src/defaultconfigurator.cpp
    logging/log4cxx/trunk/src/domconfigurator.cpp
    logging/log4cxx/trunk/src/exception.cpp
    logging/log4cxx/trunk/src/fallbackerrorhandler.cpp
    logging/log4cxx/trunk/src/file.cpp
    logging/log4cxx/trunk/src/fileappender.cpp
    logging/log4cxx/trunk/src/filedatepatternconverter.cpp
    logging/log4cxx/trunk/src/fileinputstream.cpp
    logging/log4cxx/trunk/src/filelocationpatternconverter.cpp
    logging/log4cxx/trunk/src/fileoutputstream.cpp
    logging/log4cxx/trunk/src/filerenameaction.cpp
    logging/log4cxx/trunk/src/filewatchdog.cpp
    logging/log4cxx/trunk/src/filterbasedtriggeringpolicy.cpp
    logging/log4cxx/trunk/src/fixedwindowrollingpolicy.cpp
    logging/log4cxx/trunk/src/formattinginfo.cpp
    logging/log4cxx/trunk/src/fulllocationpatternconverter.cpp
    logging/log4cxx/trunk/src/hierarchy.cpp
    logging/log4cxx/trunk/src/htmllayout.cpp
    logging/log4cxx/trunk/src/inetaddress.cpp
    logging/log4cxx/trunk/src/inputstream.cpp
    logging/log4cxx/trunk/src/inputstreamreader.cpp
    logging/log4cxx/trunk/src/integer.cpp
    logging/log4cxx/trunk/src/integerpatternconverter.cpp
    logging/log4cxx/trunk/src/layout.cpp
    logging/log4cxx/trunk/src/level.cpp
    logging/log4cxx/trunk/src/levelmatchfilter.cpp
    logging/log4cxx/trunk/src/levelpatternconverter.cpp
    logging/log4cxx/trunk/src/levelrangefilter.cpp
    logging/log4cxx/trunk/src/linelocationpatternconverter.cpp
    logging/log4cxx/trunk/src/lineseparatorpatternconverter.cpp
    logging/log4cxx/trunk/src/literalpatternconverter.cpp
    logging/log4cxx/trunk/src/loader.cpp
    logging/log4cxx/trunk/src/locale.cpp
    logging/log4cxx/trunk/src/locationinfo.cpp
    logging/log4cxx/trunk/src/logger.cpp
    logging/log4cxx/trunk/src/loggerpatternconverter.cpp
    logging/log4cxx/trunk/src/loggingevent.cpp
    logging/log4cxx/trunk/src/loggingeventpatternconverter.cpp
    logging/log4cxx/trunk/src/loglog.cpp
    logging/log4cxx/trunk/src/logmanager.cpp
    logging/log4cxx/trunk/src/logstream.cpp
    logging/log4cxx/trunk/src/manualtriggeringpolicy.cpp
    logging/log4cxx/trunk/src/mdc.cpp
    logging/log4cxx/trunk/src/messagepatternconverter.cpp
    logging/log4cxx/trunk/src/methodlocationpatternconverter.cpp
    logging/log4cxx/trunk/src/mutex.cpp
    logging/log4cxx/trunk/src/nameabbreviator.cpp
    logging/log4cxx/trunk/src/namepatternconverter.cpp
    logging/log4cxx/trunk/src/ndc.cpp
    logging/log4cxx/trunk/src/ndcpatternconverter.cpp
    logging/log4cxx/trunk/src/nteventlogappender.cpp
    logging/log4cxx/trunk/src/objectimpl.cpp
    logging/log4cxx/trunk/src/objectptr.cpp
    logging/log4cxx/trunk/src/obsoleterollingfileappender.cpp
    logging/log4cxx/trunk/src/odbcappender.cpp
    logging/log4cxx/trunk/src/onlyonceerrorhandler.cpp
    logging/log4cxx/trunk/src/optionconverter.cpp
    logging/log4cxx/trunk/src/outputdebugstringappender.cpp
    logging/log4cxx/trunk/src/outputstream.cpp
    logging/log4cxx/trunk/src/outputstreamwriter.cpp
    logging/log4cxx/trunk/src/patternconverter.cpp
    logging/log4cxx/trunk/src/patternlayout.cpp
    logging/log4cxx/trunk/src/patternparser.cpp
    logging/log4cxx/trunk/src/performance/cpp/nullappender.h
    logging/log4cxx/trunk/src/pool.cpp
    logging/log4cxx/trunk/src/properties.cpp
    logging/log4cxx/trunk/src/propertiespatternconverter.cpp
    logging/log4cxx/trunk/src/propertyconfigurator.cpp
    logging/log4cxx/trunk/src/propertyresourcebundle.cpp
    logging/log4cxx/trunk/src/propertysetter.cpp
    logging/log4cxx/trunk/src/reader.cpp
    logging/log4cxx/trunk/src/relativetimedateformat.cpp
    logging/log4cxx/trunk/src/relativetimepatternconverter.cpp
    logging/log4cxx/trunk/src/resourcebundle.cpp
    logging/log4cxx/trunk/src/rollingfileappender.cpp
    logging/log4cxx/trunk/src/rollingpolicy.cpp
    logging/log4cxx/trunk/src/rollingpolicybase.cpp
    logging/log4cxx/trunk/src/rolloverdescription.cpp
    logging/log4cxx/trunk/src/rootcategory.cpp
    logging/log4cxx/trunk/src/serversocket.cpp
    logging/log4cxx/trunk/src/simpledateformat.cpp
    logging/log4cxx/trunk/src/simplelayout.cpp
    logging/log4cxx/trunk/src/site/xdoc/contributing.xml
    logging/log4cxx/trunk/src/site/xdoc/support.xml
    logging/log4cxx/trunk/src/site/xdoc/team.xml
    logging/log4cxx/trunk/src/sizebasedtriggeringpolicy.cpp
    logging/log4cxx/trunk/src/smtpappender.cpp
    logging/log4cxx/trunk/src/socket.cpp
    logging/log4cxx/trunk/src/socketappender.cpp
    logging/log4cxx/trunk/src/socketappenderskeleton.cpp
    logging/log4cxx/trunk/src/sockethubappender.cpp
    logging/log4cxx/trunk/src/socketimpl.cpp
    logging/log4cxx/trunk/src/socketinputstream.cpp
    logging/log4cxx/trunk/src/socketnode.cpp
    logging/log4cxx/trunk/src/socketoutputstream.cpp
    logging/log4cxx/trunk/src/strftimedateformat.cpp
    logging/log4cxx/trunk/src/stringhelper.cpp
    logging/log4cxx/trunk/src/stringmatchfilter.cpp
    logging/log4cxx/trunk/src/stringtokenizer.cpp
    logging/log4cxx/trunk/src/synchronized.cpp
    logging/log4cxx/trunk/src/syslogappender.cpp
    logging/log4cxx/trunk/src/syslogwriter.cpp
    logging/log4cxx/trunk/src/system.cpp
    logging/log4cxx/trunk/src/systemerrwriter.cpp
    logging/log4cxx/trunk/src/systemoutwriter.cpp
    logging/log4cxx/trunk/src/telnetappender.cpp
    logging/log4cxx/trunk/src/test/resources/src/
    logging/log4cxx/trunk/src/thread.cpp
    logging/log4cxx/trunk/src/threadpatternconverter.cpp
    logging/log4cxx/trunk/src/threadspecificdata.cpp
    logging/log4cxx/trunk/src/throwableinformationpatternconverter.cpp
    logging/log4cxx/trunk/src/timebasedrollingpolicy.cpp
    logging/log4cxx/trunk/src/timezone.cpp
    logging/log4cxx/trunk/src/transcoder.cpp
    logging/log4cxx/trunk/src/transform.cpp
    logging/log4cxx/trunk/src/triggeringpolicy.cpp
    logging/log4cxx/trunk/src/ttcclayout.cpp
    logging/log4cxx/trunk/src/unicodehelper.cpp
    logging/log4cxx/trunk/src/writer.cpp
    logging/log4cxx/trunk/src/writerappender.cpp
    logging/log4cxx/trunk/src/xmllayout.cpp
    logging/log4cxx/trunk/src/xmlsocketappender.cpp
    logging/log4cxx/trunk/tests/
    logging/log4cxx/trunk/xdocs/
Modified:
    logging/log4cxx/trunk/Makefile.am
    logging/log4cxx/trunk/build.xml
    logging/log4cxx/trunk/src/Makefile.am
    logging/log4cxx/trunk/src/site/doxy/Doxyfile.in
    logging/log4cxx/trunk/src/site/doxy/mainpage.dox

Modified: logging/log4cxx/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/Makefile.am?view=diff&rev=559190&r1=559189&r2=559190
==============================================================================
--- logging/log4cxx/trunk/Makefile.am (original)
+++ logging/log4cxx/trunk/Makefile.am Tue Jul 24 13:18:15 2007
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-SUBDIRS = docs src include simplesocketserver tests performance examples
-EXTRA_DIST = autogen.sh aclocal.m4 find_apr.m4 find_apu.m4 build.xml apr-build.xml aprutil-build.xml cppunit-build.xml apr-bug-39848.patch apr-bug-39852.patch apr-bug-39853.patch apr-bug-39856.patch apr-bug-39857.patch apr-bug-39858.patch apr-bug-39859.patch apr-bug-39867.patch apr-bug-39868.patch apr-bug-39869.patch apr-bug-39884.patch apr-bug-39886.patch apr-bug-39888.patch apr-bug-39889.patch apr-bug-39892.patch apr-bug-39895.patch apr-bug-39896.patch
+SUBDIRS = src
+EXTRA_DIST = autogen.sh aclocal.m4 find_apr.m4 find_apu.m4 build.xml pom.xml NOTICE LICENSE
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = liblog4cxx.pc

Modified: logging/log4cxx/trunk/build.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/build.xml?view=diff&rev=559190&r1=559189&r2=559190
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Tue Jul 24 13:18:15 2007
@@ -31,7 +31,6 @@
 -->
 
 <!--
-
 This file builds log4cxx using Apache Ant (http://ant.apache.org)
 and the C++ compilation tasks from http://ant-contrib.sourceforge.net.
 
@@ -45,18 +44,19 @@
 
 <property name="debug" value="true"/>
 <property name="base.dir" location="."/>
-<property name="src.dir" location="${base.dir}/src"/>
-<property name="lib.dir" location="${base.dir}/lib"/>
-<property name="include.dir" location="${base.dir}/include"/>
-<property name="build.dir" location="${base.dir}/build"/>
-<property name="examples.dir" location="${base.dir}/examples"/>
-<property name="tests.dir" location="${base.dir}/tests"/>
-<property name="performance.dir" location="${base.dir}/performance"/>
-<!-- Destination for documentation files -->
-<property name="docs.dest" value="${base.dir}/docs"/>
-<property name="manual.dest" value="${docs.dest}/manual"/>
-<!-- Source directory for xml docs -->
-<property name="xdocs.src" value="${base.dir}/xdocs/src"/>
+<property name="src.dir" location="${base.dir}/src/main/cpp"/>
+<property name="include.dir" location="${base.dir}/src/main/include"/>
+<property name="build.dir" location="${base.dir}/target"/>
+<property name="lib.dir" location="${build.dir}/lib"/>
+<property name="examples.dir" location="${base.dir}/src/examples/cpp"/>
+<property name="tests.dir" location="${base.dir}/src/test"/>
+<property name="tests.cpp.dir" location="${tests.dir}/cpp"/>
+<property name="tests.resources.dir" location="${tests.dir}/resources"/>
+<property name="tests.output.dir" location="${tests.resources.dir}/outputs"/>
+<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="doxygen.exe" value="doxygen"/>
 <property name="enable_dot" value="YES"/>
 
@@ -73,8 +73,6 @@
 <property name="apache.dist" value="http://archive.apache.org/dist"/>
 <!-- property name="apache.doc_dest" value="/www/logging.apache.org/log4cxx"/ -->
 <property name="apache.doc_dest" value="/home/${apache.user}/public_html/test"/>
-<property name="apache.manual_dest" value="${apache.doc_dest}/manual"/>
-<property name="apache.host" value="people.apache.org"/>
 
 
 <property name="apr.version" value="1.2.9"/>
@@ -90,25 +88,15 @@
 <property name="cppunit.lib.name" value="cppunit"/>
 <property name="cppunit.lib.type" value="static"/>
 
+<property name="svnrepo.url" value="https://svn.apache.org/repos/asf"/>
+<property name="svnsite.url" value="${svnrepo.url}/logging/site/trunk/docs/log4cxx"/>
+<available property="svn-available" file="target/site-deploy/.svn"/>
+
 
 <taskdef resource="cpptasks.tasks"/>
 <typedef resource="cpptasks.types"/>
 
 
-<!-- Velocity's Anakia task is used in the generation of the documentation
-     download from http://jakarta.apache.org   -->
-<property name="velocity.jar" location="${lib.home.dir}/velocity-1.4/velocity-dep-1.4.jar"/>
-<!-- Velocity's Anakia task requires JDOM, 
-  but Velocity 1.4 is not compatible with JDOM 1.0, but beta 8 works okay
-  download for http://www.jdom.org/dist/binary/archive  -->
-<property name="jdom.jar" location="${lib.home.dir}/jdom-b8/build/jdom.jar"/>
-
-<!-- Construct classpath for building the html pages-->
-<path id="site.classpath">
-  <pathelement location="${velocity.jar}"/>
-  <pathelement location="${jdom.jar}"/>
-</path>
-
 
 <target name="usage" description="Describes usage of the build script">
         <echo>
@@ -262,9 +250,9 @@
 
         <available classname="net.sf.antcontrib.cpptasks.ide.ProjectDef"
             property="cctask-project-available"/>
-        <fail unless="cctask-project-available">later version of cpptasks required
+        <!-- fail unless="cctask-project-available">later version of cpptasks required
 
-Required features not present in cpptasks releases prior to Feb 2005</fail>
+Required features not present in cpptasks releases prior to Feb 2005</fail -->
 
         <mkdir dir="${build.dir}"/>
 
@@ -307,9 +295,6 @@
             <isset property="apr.dir"/>
         </condition>
 
-
-
-
         <condition property="aprutil.dir" value="${apr.dir}">
             <isset property="apr.dir"/>
         </condition>
@@ -394,14 +379,8 @@
 
 <target name="clean" depends="init" description="Removes built files">
         <delete dir="${build.dir}"/>
-        <delete dir="${docs.dest}/manual"/>
-        <delete dir="${docs.dest}/css"/>
         <delete>
-            <fileset dir="${tests.dir}/src" includes="shortsocket*" excludes="*.cpp"/>
-            <fileset dir="${tests.dir}" includes="output/*"/>
             <fileset dir="${include.dir}/log4cxx" includes="**/log4cxx.h"/>
-            <fileset dir="${docs.dest}" includes="Doxyfile, *.html"/>
-            <fileset dir="${base.dir}" includes="velocity.log"/>
         </delete>
         
 </target>
@@ -539,7 +518,7 @@
     <property name="apr.include.dir" location="${apr.dir}/include"/>
     <property name="apr.lib.dir" location="${executable.dir}/${apr.lib.type}"/>
 
-    <ant antfile="apr-build.xml" target="build" inheritAll="false">
+    <ant antfile="src/apr/ant/build.xml" target="build" inheritAll="false">
         <property name="version" value="${apr.version}"/>
         <property name="debug" value="${debug}"/>
         <property name="lib-suffix" value="${lib-suffix}"/>
@@ -588,7 +567,7 @@
     <property name="aprutil.include.dir" location="${aprutil.dir}/include"/>
     <property name="aprutil.lib.dir" location="${executable.dir}/${aprutil.lib.type}"/>
 
-    <ant antfile="aprutil-build.xml" target="build" inheritAll="false">
+    <ant antfile="src/apr-util/ant/build.xml" target="build" inheritAll="false">
         <property name="version" value="${aprutil.version}"/>
         <property name="aprutil.dir" value="${aprutil.dir}"/>
         <property name="debug" value="${debug}"/>
@@ -628,7 +607,7 @@
 
     <property name="cppunit.dir" value="${lib.dir}/cppunit-${cppunit.version}"/>
 
-    <ant antfile="cppunit-build.xml" target="build" inheritAll="false">
+    <ant antfile="src/cppunit/ant/build.xml" target="build" inheritAll="false">
         <property name="base.dir" value="${cppunit.dir}"/>
         <property name="cppunit.version" value="${cppunit.version}"/>
         <property name="debug" value="${debug}"/>
@@ -687,8 +666,8 @@
                 <fileset dir="${build.dir}/header-check"
                      includes="**/*.cpp"
                      excludes="log4cxx/private/*.cpp **/aprinitializer.h.cpp"/>
-                <includepath path="mock"/>
-                <includepath path="include"/>
+                <includepath path="src/mock/include"/>
+                <includepath path="${include.dir}"/>
                 <project outfile="${project.dir}/header-check"
                     type="${project.type}" if="project.if"/>
          </cc>
@@ -733,6 +712,7 @@
 <target name="build-example">
     <mkdir dir="${log4cxx.lib.dir}/${example.name}_obj"/>
     <property name="project.compiler" value="${compiler}"/>
+    <property name="example.include.dir" value="${example.src.dir}"/>
     <cc name="${project.compiler}"
                 exceptions="true"
                 outfile="${log4cxx.lib.dir}/${example.name}"
@@ -744,6 +724,7 @@
                 projectsOnly="${projectsOnly}">
         <fileset dir="${example.src.dir}" includes="${example.includes}"/>
         <includepath path="${include.dir}"/>
+        <includepath path="${example.include.dir}"/>
         <includepath path="${apr.include.dir}"/>
 
         <defineset define="WIN32" if="is-windows"/>
@@ -815,7 +796,7 @@
 
 <target name="build-simplesocketserver" depends="build">
     <antcall target="build-example">
-       <param name="example.src.dir" value="${base.dir}/simplesocketserver"/>
+       <param name="example.src.dir" value="${base.dir}/src/simplesocketserver/main"/>
        <param name="example.name" value="simplesocketserver"/>
        <param name="example.includes" value="simplesocketserver.cpp"/>
     </antcall>
@@ -824,7 +805,8 @@
 
 <target name="build-performance" depends="build" description="Builds performance test">
     <antcall target="build-example">
-       <param name="example.src.dir" value="${performance.dir}"/>
+       <param name="example.src.dir" value="${performance.src.dir}"/>
+       <param name="example.include.dir" value="${performance.include.dir}"/>
        <param name="example.name" value="performance"/>
        <param name="example.includes" value="**/*.cpp"/>
     </antcall>
@@ -838,14 +820,14 @@
     <property name="project.compiler" value="${compiler}"/>
     <cc name="${project.compiler}"
                 exceptions="true"
-                outfile="${tests.dir}/src/shortsocketserver"
+                outfile="${build.dir}/shortsocketserver"
                 subsystem="console"
                 multithreaded="true"
                 outtype="executable"
                 objdir="${log4cxx.lib.dir}/shortsocketserver_obj"
                 debug="${debug}"
                 projectsOnly="${projectsOnly}">
-        <fileset dir="${tests.dir}/src">
+        <fileset dir="${tests.cpp.dir}">
            <include name="shortsocketserver.cpp"/>
            <include name="net/socketservertestcase.h"/>
         </fileset>
@@ -874,7 +856,7 @@
                 objdir="${log4cxx.lib.dir}/log4cxx-test_obj"
                 debug="${debug}"
                 projectsOnly="${projectsOnly}">
-        <fileset dir="${tests.dir}/src" includes="**/*.cpp **/*.h">
+        <fileset dir="${tests.cpp.dir}" includes="**/*.cpp **/*.h">
              <exclude name="shortsocketserver.cpp"/>
         </fileset>
         <includepath path="${cppunit.include.dir}" if="cppunit.include.dir"/>
@@ -912,7 +894,7 @@
                 objdir="${log4cxx.lib.dir}/log4cxx-test_obj"
                 debug="${debug}"
                 projectsOnly="${projectsOnly}">
-        <fileset dir="${tests.dir}/src" includes="defaultinit/*.cpp main.cpp">
+        <fileset dir="${tests.cpp.dir}" includes="defaultinit/*.cpp main.cpp">
              <exclude name="shortsocketserver.cpp"/>
         </fileset>
         <includepath path="${cppunit.include.dir}" if="cppunit.include.dir"/>
@@ -952,7 +934,7 @@
                 objdir="${log4cxx.lib.dir}/log4cxx-test_obj"
                 debug="${debug}"
                 projectsOnly="${projectsOnly}">
-        <fileset dir="${tests.dir}/src" includes="${src.pattern}">
+        <fileset dir="${tests.cpp.dir}" includes="${src.pattern}">
              <exclude name="shortsocketserver.cpp"/>
         </fileset>
         <includepath path="${cppunit.include.dir}" if="cppunit.include.dir"/>
@@ -991,7 +973,7 @@
                 projectsOnly="${projectsOnly}">
         <fileset dir="${src.dir}" includes="*.cpp" excludes="**/iconv_module.cpp"/>
         <fileset dir="${include.dir}" includes="**/*.h"/>
-        <fileset dir="${tests.dir}/src" includes="**/*.cpp **/*.h">
+        <fileset dir="${tests.cpp.dir}" includes="**/*.cpp **/*.h">
              <exclude name="shortsocketserver.cpp"/>
         </fileset>
         <includepath path="${cppunit.include.dir}" if="cppunit.include.dir"/>
@@ -1033,18 +1015,17 @@
 <target name="run-defaultinit-unittest" depends="build-defaultinit-unittest"
     description="Runs default init unit tests">
 
-    <mkdir dir="${tests.dir}/output"/>
+    <mkdir dir="${tests.output.dir}"/>
 
     <!--  test use of log4j.configuration -->
     <property name="defaultInit3.properties"
-         location="${tests.dir}/input/defaultInit3.properties"/>
+         location="${tests.resources.dir}/input/defaultInit3.properties"/>
 
     <property name="defaultInit.xml"
-         location="${tests.dir}/input/xml/defaultInit.xml"/>
+         location="${tests.resources.dir}/input/xml/defaultInit.xml"/>
 
 
     <!--  test of log4j.properties -->
-    <mkdir dir="${log4cxx.lib.dir}/output"/>
     <delete file="${log4cxx.lib.dir}/log4*.properties"/>
     <delete file="${log4cxx.lib.dir}/log4*.xml"/>
     <copy tofile="${log4cxx.lib.dir}/log4j.properties"
@@ -1076,7 +1057,7 @@
 
     <copy tofile="${log4cxx.lib.dir}/log4j.xml"
        file="${defaultInit.xml}"/>
-    <copy todir="${log4cxx.lib.dir}" file="${tests.dir}/input/xml/log4j.dtd"/>
+    <copy todir="${log4cxx.lib.dir}" file="${tests.resources.dir}/input/xml/log4j.dtd"/>
     <exec executable="${log4cxx-defaultinit-test.exe}" dir="${log4cxx.lib.dir}"
               failonerror="true">
             <arg value="TestCase4"/>
@@ -1086,8 +1067,12 @@
                    value="${log4cxx.lib.dir}:${apr.lib.dir}:${aprutil.lib.dir}:${cppunit.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
     </exec>
 
+    <mkdir dir="${tests.resources.dir}/output"/>
+    <delete>
+	<fileset dir="${tests.resources.dir}/output"/>
+    </delete>
 
-    <exec executable="${log4cxx-defaultinit-test.exe}" dir="${tests.dir}"
+    <exec executable="${log4cxx-defaultinit-test.exe}" dir="${tests.resources.dir}"
               failonerror="true">
             <arg value="TestCase3"/>
             <env key="LD_LIBRARY_PATH"
@@ -1099,7 +1084,7 @@
     </exec>
 
     <!--  test of LOG4CXX_CONFIGURATION -->
-    <exec executable="${log4cxx-defaultinit-test.exe}" dir="${tests.dir}"
+    <exec executable="${log4cxx-defaultinit-test.exe}" dir="${tests.resources.dir}"
               failonerror="true">
             <arg value="TestCase3"/>
             <env key="LD_LIBRARY_PATH"
@@ -1116,11 +1101,11 @@
 <target name="run-unittest" depends="build-unittest, run-defaultinit-unittest, clean-output"
     description="Runs unit test">
     <property environment="env"/>
-    <mkdir dir="${tests.dir}/output"/>
+    <mkdir dir="${tests.output.dir}"/>
     <delete>
-         <fileset dir="${tests.dir}/output" includes="*"/>
+         <fileset dir="${tests.output.dir}" includes="*"/>
     </delete>
-    <exec executable="${log4cxx-test.exe}" dir="${tests.dir}"
+    <exec executable="${log4cxx-test.exe}" dir="${tests.resources.dir}"
               failonerror="true">
             <arg value="+TestCase1"/>
             <env key="TOTO" value="wonderful"/>
@@ -1140,8 +1125,11 @@
    depends="build-standalone-unittest, clean-output"
    description="Runs standalone unit test">
     <property environment="env"/>
-    <mkdir dir="${tests.dir}/output"/>
-    <exec executable="${log4cxx-standalone-test.exe}" dir="${tests.dir}"
+    <mkdir dir="${tests.output.dir}"/>
+    <delete>
+         <fileset dir="${tests.output.dir}" includes="*"/>
+    </delete>
+    <exec executable="${log4cxx-standalone-test.exe}" dir="${tests.resources.dir}"
               failonerror="true">
             <env key="TOTO" value="wonderful"/>
             <env key="key1" value="value1"/>
@@ -1235,6 +1223,8 @@
     </antcall>
 </target>
 
+<target name="test-compile" depends="build-unittest, build-examples, build-performance"/>
+
 
 <target name="check" depends="run-unittest, build-examples, build-performance"
      description="Runs all diagnostic tests">
@@ -1247,242 +1237,17 @@
 </target>
 
 
-<!-- ============================================== -->
-<!-- Build the site files using Anakia              -->
-<!-- ============================================== -->
-<target name="prepareSite">
-  <available classname="org.apache.velocity.anakia.AnakiaTask"
-             property="AnakiaTask.present">
-    <classpath refid="site.classpath"/>
-  </available>
-</target>
-
-<target name="checkSite" depends="prepareSite" unless="AnakiaTask.present">
-  <fail>
-    AnakiaTask is not present! Please check to make sure that
-    the velocity.jar property is specified and contains the correct path. 
-  </fail>
-</target>
-
-<target name="site" depends="checkSite" if="AnakiaTask.present" description="build log4cxx website">
-  <taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask">
-    <classpath refid="site.classpath"/>
-  </taskdef>
-  
-  <mkdir dir="${docs.dest}/css"/>  
-  <copy file="${xdocs.src}/stylesheets/site.css" tofile="${docs.dest}/css/site.css"/>
-  <copy file="${base.dir}/ChangeLog" tofile="${docs.dest}/ChangeLog"/>
-  
-  <anakia basedir="${xdocs.src}" destdir="${docs.dest}/"
-          extension=".html"
-          style="site.vsl"
-          projectFile="stylesheets/project.xml"
-          excludes="**/stylesheets/**, empty.xml"
-          includes="**/*.xml"
-          lastModifiedCheck="true"
-          templatePath="${xdocs.src}/stylesheets">
-  </anakia>
-</target>
-
-<target name="deploy-site" depends="site" description="Deploy log4cxx website">
-    <fail unless="apache.user">-Dapache.user=USERNAME must be specified.</fail>
-    <tar destfile="${build.dir}/apache-log4cxx-site.tar.gz" compression="gzip">
-         <tarfileset dir="${docs.dest}">
-             <include name="*.html"/>
-             <include name="ChangeLog"/>
-             <include name="css/*.css"/>
-         </tarfileset>
-    </tar>
-    <exec executable="scp" dir="${build.dir}">
-         <arg value="apache-log4cxx-site.tar.gz"/>
-         <arg value="${apache.user}@${apache.host}:"/>
-    </exec>
-    <exec executable="ssh">
-         <arg value="-l"/>
-         <arg value="${apache.user}"/>
-         <arg value="${apache.host}"/>
-         <arg value="tar"/>
-         <arg value="--directory=${apache.doc_dest}"/>
-         <arg value="-xvzf"/>
-         <arg value="apache-log4cxx-site.tar.gz"/>
-    </exec>
-    <exec executable="ssh">
-      <arg value="-l"/>
-      <arg value="${apache.user}"/>
-      <arg value="${apache.host}"/>
-      <arg value="chmod"/>
-      <arg value="-R"/>
-      <arg value="g+w"/>
-      <arg value="${apache.doc_dest}"/>
-    </exec>
-</target>
-
-<target name="manual" depends="init" description="Build log4cxx manual">
-  <copy file="${base.dir}/docs/Doxyfile.in" tofile="${base.dir}/docs/Doxyfile" overwrite="true"/>
-  <replace file="${base.dir}/docs/Doxyfile">
+<target name="apidocs" depends="init" description="Build log4cxx manual">
+  <copy file="src/site/doxy/Doxyfile.in" tofile="${build.dir}/Doxyfile" 
+     overwrite="true"/>
+  <replace file="${build.dir}/Doxyfile">
     <replacefilter token="@VERSION@" value="${version}"/>
-    <replacefilter token="@top_srcdir@" value="${base.dir}"/>
+    <replacefilter token="@base_dir@" value="${base.dir}"/>
     <replacefilter token="@enable_dot@" value="${enable_dot}"/>
-    <replacefilter token="@manual_dest@" value="${manual.dest}"/>
+    <replacefilter token="@manual_dest@" value="${base.dir}/target/site/apidocs"/>
   </replace>
-  <exec executable="${doxygen.exe}" dir="${base.dir}/docs"/>
-</target>
-
-
-<target name="deploy-manual" depends="manual" description="Deploy log4cxx manual to website">
-  <fail unless="apache.user">-Dapache.user=USERNAME must be specified.</fail>
-  <tar destfile="${build.dir}/apache-log4cxx-manual.tar.gz" compression="gzip">
-    <tarfileset dir="${manual.dest}"/>
-  </tar>
-  <exec executable="scp" dir="${build.dir}">
-    <arg value="apache-log4cxx-manual.tar.gz"/>
-    <arg value="${apache.user}@${apache.host}:"/>
-  </exec>
-  <exec executable="ssh">
-    <arg value="-l"/>
-    <arg value="${apache.user}"/>
-    <arg value="${apache.host}"/>
-    <arg value="tar"/>
-    <arg value="--directory=${apache.manual_dest}"/>
-    <arg value="-xvzf"/>
-    <arg value="apache-log4cxx-manual.tar.gz"/>
-  </exec>
-  <exec executable="ssh">
-    <arg value="-l"/>
-    <arg value="${apache.user}"/>
-    <arg value="${apache.host}"/>
-    <arg value="chmod"/>
-    <arg value="-R"/>
-    <arg value="g+w"/>
-    <arg value="${apache.manual_dest}"/>
-  </exec>
-</target>
-
-
-<target name="dist" depends="init, site, build-projects-vc6, manual"
-    description="Builds a source distribution">
-    <tar destfile="${build.dir}/apache-log4cxx-${version}.tar.gz"
-         compression="gzip">
-         <tarfileset dir="${base.dir}" prefix="apache-log4cxx-${version}">
-            <include name="AUTHORS"/>
-            <include name="autogen.sh"/>
-            <include name="ChangeLog"/>
-            <include name="COPYING"/>
-            <include name="INSTALL"/>
-            <include name="NOTICE"/>
-            <include name="LICENSE"/>
-            <include name="NEWS"/>
-            <include name="README"/>
-            <include name="STATUS"/>
-            <include name="*.xml"/>
-            <include name="examples/*.cpp"/>
-            <include name="include/**/*.h"/>
-            <include name="include/**/*.hw"/>
-            <include name="mock/*"/>
-            <include name="performance/*.cpp"/>
-            <include name="performance/*.h"/>
-            <include name="performance/**/*.xml"/>
-            <include name="simplesocketserver/*.cpp"/>
-            <include name="src/*.cpp"/>
-            <include name="msvc/**"/>
-            <include name="tests/performance.xml"/>
-            <include name="tests/**/*.properties"/>
-            <include name="tests/input/**/*.xml"/>
-            <include name="tests/input/**/*.dtd"/>
-            <include name="tests/src/**/*.cpp"/>
-            <include name="tests/src/**/*.h"/>
-            <include name="tests/witness/*"/>
-            <include name="tests/witness/ndc/*"/>
-            <include name="tests/witness/encoding/*"/>
-            <include name="tests/witness/rolling/*"/>
-            <include name="tests/log4j.dtd"/>
-            <include name="lib/apr-${apr.version}/**"/>
-            <include name="lib/apr-util-${aprutil.version}/**"/>
-            <include name="include/log4cxx/nt/EventLogCategories.mc"/>
-            <include name="*.patch"/>
-            <include name="docs/**"/>
-            <include name="xdocs/**"/>
-            <exclude name="include/log4cxx/log4cxx.h"/>
-            <exclude name="include/log4cxx/private/log4cxx_private.h"/>
-            <exclude name="docs/Doxyfile"/>
-            <exclude name="lib/apr-${apr.version}/include/apr.h"/>
-            <exclude name="lib/apr-util-${aprutil.version}/include/aprldap.h"/>
-            <exclude name="lib/apr-util-${aprutil.version}/include/apu.h"/>
-            <exclude name="lib/apr-util-${aprutil.version}/include/apuwant.h"/>
-            <exclude name="lib/apr-util-${aprutil.version}/include/private/*.h"/>
-            <exclude name="**/.svn"/>
-            <exclude name="**/*.m4"/>
-            <exclude name="**/*.am"/>
-            <exclude name="**/*.in"/>
-        </tarfileset>
-        <tarfileset dir="${base.dir}" prefix="apache-log4cxx-${version}">
-          <include name="**/*.m4"/>
-          <include name="**/*.am"/>
-          <include name="**/*.in"/>
-          <exclude name="lib/**"/>
-        </tarfileset>
-    </tar>
-
-    <zip destfile="${build.dir}/apache-log4cxx-${version}.zip">
-      <zipfileset dir="${base.dir}" prefix="apache-log4cxx-${version}">
-        <include name="AUTHORS"/>
-        <include name="autogen.sh"/>
-        <include name="ChangeLog"/>
-        <include name="COPYING"/>
-        <include name="INSTALL"/>
-        <include name="NOTICE"/>
-        <include name="LICENSE"/>
-        <include name="NEWS"/>
-        <include name="README"/>
-        <include name="STATUS"/>
-        <include name="*.xml"/>
-        <include name="examples/*.cpp"/>
-        <include name="include/**/*.h"/>
-        <include name="include/**/*.hw"/>
-        <include name="mock/*"/>
-        <include name="performance/*.cpp"/>
-        <include name="performance/*.h"/>
-        <include name="performance/**/*.xml"/>
-        <include name="simplesocketserver/*.cpp"/>
-        <include name="src/*.cpp"/>
-        <include name="msvc/**"/>
-        <include name="tests/performance.xml"/>
-        <include name="tests/**/*.properties"/>
-        <include name="tests/input/**/*.xml"/>
-        <include name="tests/input/**/*.dtd"/>
-        <include name="tests/src/**/*.cpp"/>
-        <include name="tests/src/**/*.h"/>
-        <include name="tests/witness/*"/>
-        <include name="tests/witness/ndc/*"/>
-        <include name="tests/witness/encoding/*"/>
-        <include name="tests/witness/rolling/*"/>
-        <include name="tests/log4j.dtd"/>
-        <include name="lib/apr-${apr.version}/**"/>
-        <include name="lib/apr-util-${aprutil.version}/**"/>
-        <include name="include/log4cxx/nt/EventLogCategories.mc"/>
-        <include name="*.patch"/>
-        <include name="docs/**"/>
-        <include name="xdocs/**"/>
-        <exclude name="include/log4cxx/log4cxx.h"/>
-        <exclude name="include/log4cxx/private/log4cxx_private.h"/>
-        <exclude name="docs/Doxyfile"/>
-        <exclude name="lib/apr-${apr.version}/include/apr.h"/>
-        <exclude name="lib/apr-util-${aprutil.version}/include/aprldap.h"/>
-        <exclude name="lib/apr-util-${aprutil.version}/include/apu.h"/>
-        <exclude name="lib/apr-util-${aprutil.version}/include/apuwant.h"/>
-        <exclude name="lib/apr-util-${aprutil.version}/include/private/*.h"/>
-        <exclude name="**/.svn"/>
-        <exclude name="**/*.m4"/>
-        <exclude name="**/*.am"/>
-        <exclude name="**/*.in"/>
-      </zipfileset>
-      <zipfileset dir="${base.dir}" prefix="apache-log4cxx-${version}">
-        <include name="**/*.m4"/>
-        <include name="**/*.am"/>
-        <include name="**/*.in"/>
-        <exclude name="lib/**"/>
-      </zipfileset>
-    </zip>
+  <mkdir dir="target/site/apidocs"/>
+  <exec executable="${doxygen.exe}" dir="${build.dir}"/>
 </target>
 
 <target name="gump" depends="check, header-check"/>
@@ -1491,5 +1256,70 @@
    <fixcrlf srcDir="${base.dir}" tab="remove" tablength="3"
        eof="remove" fixlast="true" eol="unix" includes="*.xml **/*.cpp **/*.h" excludes="lib/**/*"/>
 </target>
+
+        <target name="prepare-changes" description="Prepares changes.xml from a JIRA issues list">
+            <xslt style="src/changes/changes.xslt" 
+                  in="issues.xml" 
+                  out="src/changes/changes.xml"/>
+        </target>
+
+	<target name="checkout-site" unless="svn-available">
+		<exec executable="svn">
+			<arg value="co"/>
+			<arg value="${svnsite.url}"/>
+			<arg value="target/site-deploy"/>
+		</exec>
+	</target>
+
+	<target name="update-site" if="svn-available">
+		<exec executable="svn" dir="target/site-deploy" failonerror="true">
+			<arg value="update"/>
+		</exec>
+	</target>
+
+	<target name="post-site" depends="checkout-site, update-site"/>
+	
+
+        <target name="mime=html">
+            <exec executable="svn">
+		<arg value="propset"/>
+                <arg value="svn:mime-type"/>
+                <arg value="text/html"/>
+                <arg value="${src.html}"/>
+            </exec>
+        </target>
+
+        <target name="mime=css">
+            <exec executable="svn">
+		<arg value="propset"/>
+                <arg value="svn:mime-type"/>
+                <arg value="text/css"/>
+                <arg value="${src.css}"/>
+            </exec>
+        </target>
+	
+
+	<target name="site-deploy">
+		<!-- Add any new files (and generate innocuous warnings for the existing content)  -->
+                <delete file="target/site-deploy/svn-commit.tmp~"/>
+		<exec executable="bash" dir="target/site-deploy" failonerror="true">
+			<arg line='-c "svn add --force *"'/>
+		</exec>
+                <taskdef name="foreach" classname="net.sf.antcontrib.logic.ForEach" />
+                <foreach target="mime=html" param="src.html">
+                        <path>
+                                <fileset dir="target/site-deploy" includes="**/*.html"/>
+                        </path>
+                </foreach>
+                <foreach target="mime=css" param="src.css">
+                        <path>
+                                <fileset dir="target/site-deploy" includes="**/*.css"/>
+                        </path>
+                </foreach>
+		<!--  requires that SVN_EDITOR, VISUAL or EDITOR being set to edit commit description -->
+		<exec executable="svn" dir="target/site-deploy" failonerror="true">
+		    <arg value="commit"/>
+		</exec>
+	</target>
 
 </project>

Copied: logging/log4cxx/trunk/pom.xml (from r558239, incubator/log4php/trunk/pom.xml)
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/pom.xml?view=diff&rev=559190&p1=incubator/log4php/trunk/pom.xml&r1=558239&p2=logging/log4cxx/trunk/pom.xml&r2=559190
==============================================================================
--- incubator/log4php/trunk/pom.xml (original)
+++ logging/log4cxx/trunk/pom.xml Tue Jul 24 13:18:15 2007
@@ -17,32 +17,40 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>log4j</groupId>
-  <artifactId>apache-log4php</artifactId>
-  <packaging>jar</packaging>
-  <version>2.0-SNAPSHOT</version>
-  <name>Apache log4php.</name>
-  <description>Logging framework for PHP.</description>
-  <url>http://incubator.apache.org:80/log4php</url>
+  <groupId>log4cxx</groupId>
+  <artifactId>apache-log4cxx</artifactId>
+  <packaging>pom</packaging>
+  <version>0.10.0-SNAPSHOT</version>
+  <name>Apache log4cxx</name>
+  <description>Logging framework for C++.</description>
+  <url>http://logging.apache.org:80/log4cxx</url>
   <issueManagement>
     <system>JIRA</system>
     <url>http://issues.apache.org/jira/</url>
   </issueManagement>
 <mailingLists>
-        <mailingList>
-                <name>log4php-user</name>
-                <subscribe>log4php-user-subscribe@logging.apache.org</subscribe>
-                <unsubscribe>log4php-user-unsubscribe@logging.apache.org</unsubscribe>
-                <post>log4php-user@logging.apache.org</post>
-                <archive>http://mail-archives.apache.org/mod_mbox/logging-log4php-user/</archive>
-        </mailingList>
-        <mailingList>
-                <name>log4php-dev</name>
-                <subscribe>log4php-dev-subscribe@logging.apache.org</subscribe>
-                <unsubscribe>log4php-dev-unsubscribe@logging.apache.org</unsubscribe>
-                <post>log4php-dev@logging.apache.org</post>
-                <archive>http://mail-archives.apache.org/mod_mbox/logging-log4php-dev/</archive>
-        </mailingList>
+	<mailingList>
+		<name>log4cxx-user : log4cxx usage</name>
+		<subscribe>log4cxx-user-subscribe@logging.apache.org</subscribe>
+		<unsubscribe>log4cxx-user-unsubscribe@logging.apache.org</unsubscribe>
+		<post>log4cxx-user@logging.apache.org</post>
+		<archive>http://mail-archives.apache.org/mod_mbox/logging-log4cxx-user/</archive>
+		<otherArchives>
+			<otherArchive>http://marc.info/?l=log4cxx-user</otherArchive>
+		    <otherArchive>http://dir.gmane.org/gmane.comp.apache.logging.log4cxx.user</otherArchive>
+		</otherArchives>
+	</mailingList>
+	<mailingList>
+		<name>log4cxx-dev : log4cxx development</name>
+		<subscribe>log4cxx-dev-subscribe@logging.apache.org</subscribe>
+		<unsubscribe>log4cxx-dev-unsubscribe@logging.apache.org</unsubscribe>
+		<post>log4cxx-dev@logging.apache.org</post>
+		<archive>http://mail-archives.apache.org/mod_mbox/logging-log4cxx-dev/</archive>
+		<otherArchives>
+		    <otherArchive>http://marc.info/?l=log4cxx-dev</otherArchive>
+		    <otherArchive>http://dir.gmane.org/gmane.comp.jakarta.log4j.devel</otherArchive>
+		</otherArchives>
+	</mailingList>
 </mailingLists>
 <licenses>
         <license>
@@ -52,9 +60,9 @@
         </license>
 </licenses>
 <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/log4php</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/log4php</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/incubator/log4php</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4cxx/trunk</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4cxx/trunk</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/logging/log4cxx/trunk</url>
 </scm>
 <organization>
     <name>Apache Software Foundation</name>
@@ -63,12 +71,6 @@
 <build>
     <plugins>
       <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <workingDirectory>target</workingDirectory>
-        </configuration>
-      </plugin>
-      <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
@@ -76,7 +78,7 @@
             <id>compile</id>
             <configuration>
                 <tasks>
-                                        <ant target="compile"/>
+                   <ant target="build"/>
                 </tasks>
             </configuration>
             <goals>
@@ -88,7 +90,7 @@
             <id>test-compile</id>
             <configuration>
                 <tasks>
-                                        <ant target="test-compile"/>
+                   <ant target="test-compile"/>
                 </tasks>
             </configuration>
             <goals>
@@ -100,7 +102,7 @@
             <id>test</id>
             <configuration>
                 <tasks>
-                                        <ant target="test"/>
+                    <ant target="check"/>
                 </tasks>
             </configuration>
             <goals>
@@ -112,13 +114,12 @@
             <id>site</id>
             <configuration>
                 <tasks>
-                                        <ant target="apidocs"/>
+                    <ant target="apidocs"/>
                     <taskdef name="replaceregexp" classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp" />                
                    <replaceregexp file="target/site/source-repository.html" match="/tags/[^ ]*" replace="/trunk" flags="g" />
-                <replaceregexp match="Documentation generated on .* by " replace="Documentation generated by " flags="g">
-					<fileset dir="target/site/apidocs" includes="**/*.html"/>
-				</replaceregexp>
-
+                <replaceregexp match="Generated on .* for " replace="Generated for " flags="g">
+                    <fileset dir="target/site/apidocs" includes="**/*.html"/>
+		</replaceregexp>
                 </tasks>
             </configuration>
             <goals>
@@ -160,6 +161,11 @@
             <groupId>ant-contrib</groupId>
             <artifactId>ant-contrib</artifactId>
             <version>1.0b2</version>
+          </dependency>
+          <dependency>
+            <groupId>ant-contrib</groupId>
+            <artifactId>cpptasks</artifactId>
+            <version>1.0b3</version>
           </dependency>
         </dependencies>
       </plugin>  

Modified: logging/log4cxx/trunk/src/Makefile.am
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/Makefile.am?view=diff&rev=559190&r1=559189&r2=559190
==============================================================================
--- logging/log4cxx/trunk/src/Makefile.am (original)
+++ logging/log4cxx/trunk/src/Makefile.am Tue Jul 24 13:18:15 2007
@@ -13,157 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-lib_LTLIBRARIES = liblog4cxx.la
-
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
-
-
-liblog4cxx_la_SOURCES = \
-        action.cpp \
-        appenderattachableimpl.cpp \
-        appenderskeleton.cpp \
-        aprinitializer.cpp \
-        asyncappender.cpp \
-        basicconfigurator.cpp \
-        bufferedwriter.cpp \
-        bytearrayinputstream.cpp \
-        bytebuffer.cpp \
-        cacheddateformat.cpp \
-        charsetdecoder.cpp \
-        charsetencoder.cpp \
-        class.cpp \
-        classnamepatternconverter.cpp \
-        classregistration.cpp \
-        condition.cpp \
-        configurator.cpp \
-        consoleappender.cpp \
-        cyclicbuffer.cpp \
-        dailyrollingfileappender.cpp \
-        datagrampacket.cpp \
-        datagramsocket.cpp \
-        date.cpp \
-        dateformat.cpp \
-        datelayout.cpp \
-        datepatternconverter.cpp \
-        defaultcategoryfactory.cpp \
-        defaultconfigurator.cpp \
-        domconfigurator.cpp \
-        exception.cpp \
-        fallbackerrorhandler.cpp \
-        file.cpp \
-        fileappender.cpp \
-        filedatepatternconverter.cpp \
-        fileinputstream.cpp \
-        filelocationpatternconverter.cpp \
-        fileoutputstream.cpp \
-        filerenameaction.cpp \
-        filewatchdog.cpp \
-        filterbasedtriggeringpolicy.cpp \
-        fixedwindowrollingpolicy.cpp \
-        formattinginfo.cpp \
-        fulllocationpatternconverter.cpp \
-        hierarchy.cpp \
-        htmllayout.cpp \
-        inetaddress.cpp \
-        inputstream.cpp \
-        inputstreamreader.cpp \
-        integer.cpp \
-        integerpatternconverter.cpp \
-        layout.cpp\
-        level.cpp \
-        levelmatchfilter.cpp \
-        levelrangefilter.cpp \
-        levelpatternconverter.cpp \
-        linelocationpatternconverter.cpp \
-        lineseparatorpatternconverter.cpp \
-        literalpatternconverter.cpp \
-        loggerpatternconverter.cpp \
-        loggingeventpatternconverter.cpp \
-        loader.cpp\
-        locale.cpp\
-        locationinfo.cpp\
-        logger.cpp \
-        loggingevent.cpp \
-        loglog.cpp \
-        logmanager.cpp \
-        logstream.cpp \
-        manualtriggeringpolicy.cpp \
-        messagepatternconverter.cpp \
-        methodlocationpatternconverter.cpp \
-        mdc.cpp \
-        mutex.cpp \
-        nameabbreviator.cpp \
-        namepatternconverter.cpp \
-        ndcpatternconverter.cpp \
-        ndc.cpp \
-        nteventlogappender.cpp \
-        objectimpl.cpp \
-        objectptr.cpp \
-        obsoleterollingfileappender.cpp \
-        odbcappender.cpp \
-        onlyonceerrorhandler.cpp \
-        optionconverter.cpp \
-        outputdebugstringappender.cpp \
-        outputstream.cpp \
-        outputstreamwriter.cpp \
-        patternconverter.cpp \
-        patternlayout.cpp \
-        patternparser.cpp \
-        pool.cpp \
-        properties.cpp \
-        propertiespatternconverter.cpp \
-        propertyconfigurator.cpp \
-        propertyresourcebundle.cpp \
-        propertysetter.cpp \
-        reader.cpp \
-        relativetimedateformat.cpp \
-        relativetimepatternconverter.cpp \
-        resourcebundle.cpp \
-        rollingfileappender.cpp \
-        rollingpolicy.cpp \
-        rollingpolicybase.cpp \
-        rolloverdescription.cpp \
-        rootcategory.cpp \
-        serversocket.cpp \
-        simpledateformat.cpp \
-        simplelayout.cpp \
-        sizebasedtriggeringpolicy.cpp \
-        smtpappender.cpp \
-        socket.cpp \
-        socketappender.cpp \
-        socketappenderskeleton.cpp \
-        sockethubappender.cpp \
-        socketimpl.cpp \
-        socketinputstream.cpp \
-        socketnode.cpp \
-        socketoutputstream.cpp \
-        strftimedateformat.cpp \
-        stringhelper.cpp \
-        stringmatchfilter.cpp \
-        stringtokenizer.cpp \
-        synchronized.cpp \
-        syslogappender.cpp \
-        syslogwriter.cpp \
-        system.cpp \
-        systemerrwriter.cpp \
-        systemoutwriter.cpp \
-        telnetappender.cpp \
-        thread.cpp \
-        threadspecificdata.cpp \
-        threadpatternconverter.cpp \
-        throwableinformationpatternconverter.cpp \
-        timezone.cpp \
-        timebasedrollingpolicy.cpp \
-        transform.cpp \
-        triggeringpolicy.cpp \
-        transcoder.cpp \
-        ttcclayout.cpp \
-        unicodehelper.cpp \
-        writer.cpp \
-        writerappender.cpp \
-        xmllayout.cpp\
-        xmlsocketappender.cpp
-
-AM_CPPFLAGS = @CPPFLAGS_ODBC@
-liblog4cxx_la_LDFLAGS = -version-info @LT_VERSION@ @LIBS_ODBC@ -@APR_LIBS@
-
+SUBDIRS = main test