svn commit: r345121 - in /logging/log4cxx/trunk: ./ docs/ include/log4cxx/ include/log4cxx/private/ tests/witness/ tests/witness/encoding/ tests/witness/ndc/ tests/witness/rolling/

[afester]

Author: afester
Date: Wed Nov 16 13:02:17 2005
New Revision: 345121

URL: http://svn.apache.org/viewcvs?rev=345121&view=rev
Log:
LOGCXX-43: adjustments to create proper dist-tarball with GNU autotools

Modified:
logging/log4cxx/trunk/Makefile.am
logging/log4cxx/trunk/docs/Makefile.am
logging/log4cxx/trunk/include/log4cxx/Makefile.am
logging/log4cxx/trunk/include/log4cxx/private/Makefile.am
logging/log4cxx/trunk/tests/witness/Makefile.am
logging/log4cxx/trunk/tests/witness/encoding/Makefile.am
logging/log4cxx/trunk/tests/witness/ndc/Makefile.am
logging/log4cxx/trunk/tests/witness/rolling/Makefile.am

Modified: logging/log4cxx/trunk/Makefile.am
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/Makefile.am?rev=345121&r1=345120&r2=345121&view=diff
==
--- logging/log4cxx/trunk/Makefile.am (original)
+++ logging/log4cxx/trunk/Makefile.am Wed Nov 16 13:02:17 2005
@@ -1,5 +1,2 @@
 SUBDIRS = docs src include simplesocketserver tests performance examples
-EXTRA_DIST = autogen.sh license.apl find_apr.m4
-
-
-
+EXTRA_DIST = autogen.sh aclocal.m4 license.apl find_apr.m4 find_apu.m4 
build.xml apr-build.xml aprutil-build.xml apr-1.2.2.patch apr-util-1.2.2.patch 
cppunit-build.xml

Modified: logging/log4cxx/trunk/docs/Makefile.am
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/docs/Makefile.am?rev=345121&r1=345120&r2=345121&view=diff
==
--- logging/log4cxx/trunk/docs/Makefile.am (original)
+++ logging/log4cxx/trunk/docs/Makefile.am Wed Nov 16 13:02:17 2005
@@ -67,3 +67,6 @@
$(RM) -r latex
$(RM) -r html man @[EMAIL PROTECTED] @[EMAIL PROTECTED]
 
+dist-hook:
+   -rm -f $(distdir)/Doxyfile
+

Modified: logging/log4cxx/trunk/include/log4cxx/Makefile.am
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/include/log4cxx/Makefile.am?rev=345121&r1=345120&r2=345121&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/Makefile.am (original)
+++ logging/log4cxx/trunk/include/log4cxx/Makefile.am Wed Nov 16 13:02:17 2005
@@ -2,3 +2,8 @@
 log4cxxincdir = $(includedir)/log4cxx
 log4cxxinc_HEADERS= $(top_srcdir)/include/log4cxx/*.h log4cxx.h
 DISTCLEANFILES = log4cxx.h
+EXTRA_DIST = log4cxx.hw
+
+dist-hook:
+   -rm -f $(distdir)/log4cxx.h
+

Modified: logging/log4cxx/trunk/include/log4cxx/private/Makefile.am
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/include/log4cxx/private/Makefile.am?rev=345121&r1=345120&r2=345121&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/private/Makefile.am (original)
+++ logging/log4cxx/trunk/include/log4cxx/private/Makefile.am Wed Nov 16 
13:02:17 2005
@@ -1,3 +1,4 @@
 privateincdir = $(includedir)/log4cxx/private
-privateinc_HEADERS= $(top_srcdir)/include/log4cxx/private/*.h log4cxx_private.h
+privateinc_HEADERS= $(top_builddir)/include/log4cxx/private/*.h 
log4cxx_private.h
 DISTCLEANFILES = log4cxx_private.h
+EXTRA_DIST = log4cxx_private.hw

Modified: logging/log4cxx/trunk/tests/witness/Makefile.am
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/witness/Makefile.am?rev=345121&r1=345120&r2=345121&view=diff
==
--- logging/log4cxx/trunk/tests/witness/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/witness/Makefile.am Wed Nov 16 13:02:17 2005
@@ -1,2 +1,14 @@
 SUBDIRS = encoding ndc rolling
-EXTRA_DIST = *
+EXTRA_DIST = LevelMatchFilter* \
+ LevelRangeFilter* \
+ NDCMatchFilter* \
+ custom* \
+ dom.* \
+ hierarchyThreshold.* \
+ l7d.* \
+ patternLayout.* \
+ socketServer.* \
+ xmlLayout.* \
+ fallback \
+ simple \
+ ttcc

Modified: logging/log4cxx/trunk/tests/witness/encoding/Makefile.am
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/witness/encoding/Makefile.am?rev=345121&r1=345120&r2=345121&view=diff
==
--- logging/log4cxx/trunk/tests/witness/encoding/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/witness/encoding/Makefile.am Wed Nov 16 
13:02:17 2005
@@ -1 +1,3 @@
-EXTRA_DIST = *
\ No newline at end of file
+EXTRA_DIST = UTF-* \
+ ascii.log \
+ latin1.log

Modified: logging/log4cxx/trunk/tests/witness/ndc/Makefile.am
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/witness/ndc/Makefile.am?rev=345121&r1=345120&r2=345121&view=diff
==
--- logging/log4cxx/trunk/tests/wi

svn commit: r345118 - /logging/log4cxx/trunk/tests/src/Makefile.am

[afester]

Author: afester
Date: Wed Nov 16 12:58:56 2005
New Revision: 345118

URL: http://svn.apache.org/viewcvs?rev=345118&view=rev
Log:
LOGCXX-119: added missing file ndctestcase.cpp

Modified:
logging/log4cxx/trunk/tests/src/Makefile.am

Modified: logging/log4cxx/trunk/tests/src/Makefile.am
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/src/Makefile.am?rev=345118&r1=345117&r2=345118&view=diff
==
--- logging/log4cxx/trunk/tests/src/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/src/Makefile.am Wed Nov 16 12:58:56 2005
@@ -23,7 +23,8 @@
 consoleappendertestcase.cpp\
 fileappendertestcase.cpp\
 rollingfileappendertestcase.cpp\
-writerappendertestcase.cpp
+writerappendertestcase.cpp \
+ndctestcase.cpp
 
 
 testsuite_LDADD = \

svn commit: r347984 - in /logging/log4cxx/trunk: build.xml configure.in include/log4cxx/log4cxx.h.in

[afester]

Author: afester
Date: Mon Nov 21 13:17:18 2005
New Revision: 347984

URL: http://svn.apache.org/viewcvs?rev=347984&view=rev
Log:
LOGCXX-43: enhance logchar type configuration

Modified:
logging/log4cxx/trunk/build.xml
logging/log4cxx/trunk/configure.in
logging/log4cxx/trunk/include/log4cxx/log4cxx.h.in

Modified: logging/log4cxx/trunk/build.xml
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/build.xml?rev=347984&r1=347983&r2=347984&view=diff
==
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Mon Nov 21 13:17:18 2005
@@ -52,8 +52,7 @@
 
 
 
-
-
+
 http://apache.mirrors.pair.com"/>
 http://unc.dl.sourceforge.net/sourceforge"/>
 
@@ -109,6 +108,10 @@
 -Doptimize=[speed|size|none]
 -Dversion=n.n.n
 -Dlib.type=[shared|static]
+-Dapr.dir=PATH
+-Daprutil.dir=PATH
+-Dhas.wchar_t=[0|1] (default=1)
+-Dlogchar=[utf-8|wchar_t|cfstring] (default=wchar_t)
 
 
 
@@ -153,6 +156,10 @@
 
 
 
+
+
+
+
 
 

@@ -169,6 +176,9 @@
 
 
 
+
+
+
 
 
 
@@ -193,6 +203,10 @@
 
 
 
+
+
+
+
 
  
 
@@ -239,11 +253,12 @@
 
 
 
-
-
-   
-   
-
+
+
+
+
+
+
 
 
 
@@ -370,23 +385,42 @@
 
 
 
-
-
+
+
+
 
-
+   
 
 
 
+
+   
+
+
+
+
+   
+
+
+
 
+   match="@LOGCHAR_IS_CFSTRING@"
+   replace="${logchar_is_cfstring}"/>
 
 
+   match="@LOGCHAR_IS_UTF8@"
+   replace="${logchar_is_utf8}"/>
 
+
 
+
 
 
 

Modified: logging/log4cxx/trunk/configure.in
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/configure.in?rev=347984&r1=347983&r2=347984&view=diff
==
--- logging/log4cxx/trunk/configure.in (original)
+++ logging/log4cxx/trunk/configure.in Mon Nov 21 13:17:18 2005
@@ -271,14 +271,6 @@
 AC_SUBST(LIBS_XML)
 AC_SUBST(CPPFLAGS_XML)
 
-#for UNICODE
-AC_MSG_CHECKING(for UTF-16 Unicode support)
-AC_ARG_ENABLE(unicode,
-AC_HELP_STRING(--enable-unicode, [UTF-16 Unicode support 
(default=no)]),
-AC_DEFINE(UNICODE, 1, UTF-16 Unicode support.)
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
-
 #for ODBCAppender
 AC_MSG_CHECKING(for ODBC support)
 AC_ARG_WITH(ODBC,
@@ -368,6 +360,54 @@
 esac
 
 CPPFLAGS="-DLOG4CXX $CPPFLAGS"
+
+#for wchar_t
+AC_MSG_CHECKING([for wchar_t])
+AC_COMPILE_IFELSE(AC_LANG_SOURCE(wchar_t* w;), [have_wchar_t=yes], 
[have_wchar_t=no])
+AC_MSG_RESULT($have_wchar_t)
+
+if test "$have_wchar_t" = "yes"
+then
+AC_SUBST(HAS_WCHAR_T, 1)
+else
+AC_SUBST(HAS_WCHAR_T, 0)
+fi
+
+#determine logchar type
+AC_MSG_CHECKING([logchar type])
+AC_ARG_WITH(logchar,
+AC_HELP_STRING(--with-logchar=TYPE, [type for logchar.
+Accepted TYPE variants: utf-8, wchar_t, cfstring 
(default=utf-8)]),
+[ac_with_logchar=$withval],
+[ac_with_logchar=utf-8])
+
+case "$ac_with_logchar" in
+utf-8)
+AC_MSG_RESULT(utf-8)
+AC_SUBST(LOGCHAR_IS_UTF8, 1)
+AC_SUBST(LOGCHAR_IS_WCHAR, 0)
+AC_SUBST(LOGCHAR_IS_CFSTRING, 0)
+;;
+
+wchar_t)
+AC_MSG_RESULT(wchar_t)
+AC_SUBST(LOGCHAR_IS_UTF8, 0)
+AC_SUBST(LOGCHAR_IS_WCHAR, 1)
+AC_SUBST(LOGCHAR_IS_CFSTRING, 0)
+;;
+
+cfstring)
+AC_MSG_RESULT(cfstring)
+AC_SUBST(LOGCHAR_IS_UTF8, 0)
+AC_SUBST(LOGCHAR_IS_WCHAR, 0)
+AC_SUBST(LOGCHAR_IS_CFSTRING, 1)
+;;
+
+*)
+AC_MSG_RESULT(???)
+AC_MSG_ERROR(Invalid logchar type: $ac_with_logchar)
+;;
+esac
 
 # Create files
 # 

Modified: logging/log4cxx/trunk/include/log4cxx/log4cxx.h.in
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/include/log4cxx/log4cxx.h.in?rev=347984&r1=347983&r2=347984&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/log4cxx.h.in (original)
+++ logging/log4cxx/trunk/include/log4cxx/log4cxx.h.in Mon Nov 21 13:17:18 2005
@@ -24,12 +24,9 @@
  */
 
 
+#define LOG4CXX_LOGCHAR_IS_CFSTRING @LOGCHAR_IS_CFSTRING@
 #define LOG4CXX_LOGCHAR_IS_UTF8 @LOGCHAR_IS_UTF8@
-#if LOG4CXX_LOGCHAR_IS_UTF8
-#define LOG4CXX_LOGCHAR_IS_WCHAR 0
-#else
-#define LOG4CXX_LOGCHAR_IS_WCHAR 1
-#endif
+#define LOG4CXX_LOGCHAR_IS_WCHAR @LOGCHAR_IS_WCHAR@
 
 #define LOG4CXX_HAS_WCHAR_T @HAS_WCHAR_T@
 

svn commit: r349245 - /logging/log4cxx/trunk/include/log4cxx/patternlayout.h

[afester]

Author: afester
Date: Sun Nov 27 07:13:47 2005
New Revision: 349245

URL: http://svn.apache.org/viewcvs?rev=349245&view=rev
Log:
LOGCXX-120: fix documentation for PatternLayout

Modified:
logging/log4cxx/trunk/include/log4cxx/patternlayout.h

Modified: logging/log4cxx/trunk/include/log4cxx/patternlayout.h
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/include/log4cxx/patternlayout.h?rev=349245&r1=349244&r2=349245&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/patternlayout.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/patternlayout.h Sun Nov 27 07:13:47 
2005
@@ -101,40 +101,39 @@
  d Used to output the date of
 the logging event. The date conversion specifier may be
 followed by a date format specifier enclosed between
-braces. For example, \%d{\%H:\%M:\%S} or
-\%d{\%d \%b \%Y \%H:\%M:\%S}.  If no
+braces. For example, \%d{HH:mm:ss,SSS} or
+\%d{dd MMM  HH:mm:ss,SSS}.  If no
 date format specifier is given then [EMAIL PROTECTED] 
helpers::ISO8601DateFormat
 ISO8601 format} is assumed.
 
-The Following format options are possible:
-- \%a -- Abbreviated weekday name
-- \%A -- Full weekday name
-- \%b -- Abbreviated month name
-- \%B -- Full month name
-- \%c -- Standard date and time string
-- \%d -- Day of month as a decimal(1-31)
-- \%H -- Hour(0-23)
-- \%I -- Hour(1-12)
-- \%j -- Day of year as a decimal(1-366)
-- \%m -- Month as decimal(1-12)
-- \%M -- Minute as decimal(00-59)
-- \%p -- Locale's equivalent of AM or PM
-- \%Q -- Millisecond as decimal (000-999)
-- \%S -- Second as decimal(00-59)
-- \%U -- Week of year, Sunday being first day(0-53)
-- \%w -- Weekday as a decimal(0-6, Sunday being 0)
-- \%W -- Week of year, Monday being first day(0-53)
-- \%x -- Standard date string
-- \%X -- Standard time string
-- \%y -- Year in decimal without century(0-99)
-- \%Y -- Year including century as decimal
-- \%Z -- Time zone name
-- \%\% -- The percent sign
+The following format options are possible:
+- G -- Era designator (AD)
+- y -- Year (e.g. 2005 or 05)
+- M -- Month in year (e.g. July or Jul or 07)
+- w -- Week in year (e.g. 29)
+- W -- Week in month (e.g. 4)
+- D -- Day in year (e.g. 199)
+- d -- Day in month (e.g. 18)
+- F -- Day of week in month (e.g. 2)
+- E -- Day in week (e.g. Tuesday or Tue)
+- a -- Am/pm marker (e.g. PM)
+- H -- Hour in day (0-23)
+- k -- Hour in day (1-24)
+- K -- Hour in am/pm (0-11)
+- h -- Hour in am/pm (1-12)
+- m -- Minute in hour (0-59)
+- s -- Second in minute (0-59)
+- S -- Millisecond (0-999)
+- z -- Time zone (e.g. "Pacific Standard Time" or "PST" or "GMT-08:00")
+- Z -- RFC 822 Time zone (e.g. "-0800")
 
-Lookup the documentation for the strftime() function
-found in the <ctime> header for more information.
+Note that each format option can be repeated one or more times to 
get 
+different renderings of the value. For example, "M" results in values 
+"1" to "12", while "MM" results in values "00" to "12", "MMM" 
+results in the abbreviated month name and "" results in the full 
+month name.
 
-You can alos use the log4cxx predefined date
+You can also use the log4cxx predefined date
 formatters. These can be specified using one of the strings
 "ABSOLUTE", "DATE" and "ISO8601" for specifying [EMAIL PROTECTED]
 helpers::AbsoluteTimeDateFormat

svn commit: r349247 - in /logging/log4cxx/trunk: include/log4cxx/stream.h src/Makefile.am src/logstream.cpp

[afester]

Author: afester
Date: Sun Nov 27 07:23:13 2005
New Revision: 349247

URL: http://svn.apache.org/viewcvs?rev=349247&view=rev
Log:
LOGCXX-82: move logstream operators to separate implementation file

Added:
logging/log4cxx/trunk/src/logstream.cpp
Modified:
logging/log4cxx/trunk/include/log4cxx/stream.h
logging/log4cxx/trunk/src/Makefile.am

Modified: logging/log4cxx/trunk/include/log4cxx/stream.h
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/include/log4cxx/stream.h?rev=349247&r1=349246&r2=349247&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/stream.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/stream.h Sun Nov 27 07:23:13 2005
@@ -20,7 +20,6 @@
 #include 
 #include 
 #include 
-#include 
 
 namespace log4cxx
 {
@@ -147,58 +146,30 @@
 
 }  // namespace log4cxx
 
-#if LOG4CXX_HAS_WCHAR_T
-log4cxx::logstream& operator<<(
-  ::log4cxx::logstream& lhs,
-  const char* rhs) {
-  LOG4CXX_DECODE_CHAR(tmp, rhs);
-  LOG4CXX_ENCODE_WCHAR(msg, tmp);
-  lhs.getStream() << msg;
-  return lhs;
-}
-#else
-log4cxx::logstream& operator<<(
+
+LOG4CXX_EXPORT ::log4cxx::logstream& operator<<(
   ::log4cxx::logstream& lhs,
-  const char* rhs) {
-  LOG4CXX_DECODE_CHAR(tmp, rhs);
-  LOG4CXX_ENCODE_CHAR(msg, tmp);
-  lhs.getStream() << msg;
-  return lhs;
-}
-#endif
+  const char* rhs);
 
 
-::log4cxx::logstream& operator<<(
+LOG4CXX_EXPORT ::log4cxx::logstream& operator<<(
::log4cxx::logstream& lhs,
-   const ::log4cxx::spi::LocationInfo& rhs) {
-   lhs.setLocation(rhs);
-   return lhs;
-}
+   const ::log4cxx::spi::LocationInfo& rhs);
 
 
-::log4cxx::logstream& operator<<(
+LOG4CXX_EXPORT ::log4cxx::logstream& operator<<(
::log4cxx::logstream& lhs,
-   const ::log4cxx::spi::LocationFlush& rhs) {
-   lhs.flush(rhs);
-   return lhs;
-}
-
-::log4cxx::logstream& operator<<(
-   ::log4cxx::logstream& lhs,
-   const ::log4cxx::LevelPtr& rhs) {
-   lhs.setLevel(rhs);
-   return lhs;
-}
+   const ::log4cxx::spi::LocationFlush& rhs);
 
 
-::log4cxx::logstream& operator<<(
+LOG4CXX_EXPORT ::log4cxx::logstream& operator<<(
::log4cxx::logstream& lhs,
-   ::std::ios_base& (*manip)(::std::ios_base&)) {
- (*manip)(lhs);
-   return lhs;
-}
+   const ::log4cxx::LevelPtr& rhs);
 
 
+LOG4CXX_EXPORT ::log4cxx::logstream& operator<<(
+   ::log4cxx::logstream& lhs,
+   ::std::ios_base& (*manip)(::std::ios_base&));
 
 
 //
@@ -213,6 +184,7 @@
}
return lhs;
 }
+
 
 #if !defined(LOG4CXX_ENDMSG)
 #define LOG4CXX_ENDMSG LOG4CXX_LOCATION_FLUSH

Modified: logging/log4cxx/trunk/src/Makefile.am
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/src/Makefile.am?rev=349247&r1=349246&r2=349247&view=diff
==
--- logging/log4cxx/trunk/src/Makefile.am (original)
+++ logging/log4cxx/trunk/src/Makefile.am Sun Nov 27 07:23:13 2005
@@ -68,6 +68,7 @@
 loggingevent.cpp \
 loglog.cpp \
 logmanager.cpp \
+logstream.cpp \
 manualtriggeringpolicy.cpp \
 messagepatternconverter.cpp \
 methodlocationpatternconverter.cpp \

Added: logging/log4cxx/trunk/src/logstream.cpp
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/src/logstream.cpp?rev=349247&view=auto
==
--- logging/log4cxx/trunk/src/logstream.cpp (added)
+++ logging/log4cxx/trunk/src/logstream.cpp Sun Nov 27 07:23:13 2005
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2003,2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include 
+
+#if LOG4CXX_HAS_WCHAR_T
+log4cxx::logstream& operator<<(
+  ::log4cxx::logstream& lhs,
+  const char* rhs) {
+  LOG4CXX_DECODE_CHAR(tmp, rhs);
+  LOG4CXX_ENCODE_WCHAR(msg, tmp);
+  lhs.getStream() << msg;
+  return lhs;
+}
+#else
+log4cxx::logstream& operator<<(
+  ::log4cxx::logstream& lhs,
+  const char* rhs) {
+  LOG4CXX_DECODE_CHAR(tmp, rhs);
+  LOG4CXX_ENCODE_CHAR(msg, tmp);
+  lhs.getStream() << msg;
+  return lhs;
+}
+#endif
+
+::log4cxx::logstream& operator<<(
+   ::log4cxx::logstr

svn commit: r351786 - in /logging/log4cxx/trunk/tests: ./ input/ input/ndc/ input/performance/ input/rolling/ input/xml/ src/ src/customlogger/ src/db/ src/defaultinit/ src/helpers/ src/net/ src/nt/ s

[afester]

Author: afester
Date: Fri Dec  2 10:09:05 2005
New Revision: 351786

URL: http://svn.apache.org/viewcvs?rev=351786&view=rev
Log:
LOGCXX-43: add missing source files, fix test execution in separate build tree

Modified:
logging/log4cxx/trunk/tests/Makefile.am
logging/log4cxx/trunk/tests/input/Makefile.am
logging/log4cxx/trunk/tests/input/ndc/Makefile.am
logging/log4cxx/trunk/tests/input/performance/Makefile.am
logging/log4cxx/trunk/tests/input/rolling/Makefile.am
logging/log4cxx/trunk/tests/input/xml/Makefile.am
logging/log4cxx/trunk/tests/src/Makefile.am
logging/log4cxx/trunk/tests/src/customlogger/Makefile.am
logging/log4cxx/trunk/tests/src/db/Makefile.am
logging/log4cxx/trunk/tests/src/defaultinit/Makefile.am
logging/log4cxx/trunk/tests/src/helpers/Makefile.am
logging/log4cxx/trunk/tests/src/net/Makefile.am
logging/log4cxx/trunk/tests/src/nt/Makefile.am
logging/log4cxx/trunk/tests/src/pattern/Makefile.am
logging/log4cxx/trunk/tests/src/rolling/Makefile.am
logging/log4cxx/trunk/tests/src/util/Makefile.am
logging/log4cxx/trunk/tests/src/varia/Makefile.am
logging/log4cxx/trunk/tests/src/xml/Makefile.am
logging/log4cxx/trunk/tests/witness/Makefile.am
logging/log4cxx/trunk/tests/witness/encoding/Makefile.am
logging/log4cxx/trunk/tests/witness/ndc/Makefile.am
logging/log4cxx/trunk/tests/witness/rolling/Makefile.am

Modified: logging/log4cxx/trunk/tests/Makefile.am
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==
--- logging/log4cxx/trunk/tests/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/Makefile.am Fri Dec  2 10:09:05 2005
@@ -3,6 +3,15 @@
 
 if TESTS
 
+# if we are building in a separate build tree, then copy all necessary files
+all-local:
+   @if test "$(top_srcdir)" != "$(top_builddir)"; then \
+ echo "Copying test suite data files ..." ; \
+ list='$(EXTRA_DIST)'; for file in $$list; do \
+   find $(srcdir) -name "$$file" -exec cp {} . ';' ; \
+ done \
+   fi
+
 prepare:
@if test ! -d "output"; then \
mkdir output; \
@@ -15,7 +24,13 @@
 cleanOutputDir:
@rm -f output/*

-check: regression longUnit
+check: prepare run-unittest
+
+run-unittest: cleanOutputDir
+   @export TOTO=wonderful; \
+   export key1=value1; \
+   export key2=value2; \
+   src/testsuite +TestCase1
 
 regression: Minimum Logger DOM CustomLevel \
CustomLogger PatternLayout \

Modified: logging/log4cxx/trunk/tests/input/Makefile.am
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/input/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==
--- logging/log4cxx/trunk/tests/input/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/input/Makefile.am Fri Dec  2 10:09:05 2005
@@ -1,2 +1,11 @@
 SUBDIRS = ndc performance xml rolling
 EXTRA_DIST = *.properties
+
+# if we are building in a separate build tree, then copy all necessary files
+all-local:
+   @if test "$(top_srcdir)" != "$(top_builddir)"; then \
+ echo "Copying test suite data files ..." ; \
+ list='$(EXTRA_DIST)'; for file in $$list; do \
+   find $(srcdir) -name "$$file" -exec cp {} . ';' ; \
+ done \
+   fi

Modified: logging/log4cxx/trunk/tests/input/ndc/Makefile.am
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/input/ndc/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==
--- logging/log4cxx/trunk/tests/input/ndc/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/input/ndc/Makefile.am Fri Dec  2 10:09:05 2005
@@ -1 +1,10 @@
 EXTRA_DIST = *.properties
+
+# if we are building in a separate build tree, then copy all necessary files
+all-local:
+   @if test "$(top_srcdir)" != "$(top_builddir)"; then \
+ echo "Copying test suite data files ..." ; \
+ list='$(EXTRA_DIST)'; for file in $$list; do \
+   find $(srcdir) -name "$$file" -exec cp {} . ';' ; \
+ done \
+   fi

Modified: logging/log4cxx/trunk/tests/input/performance/Makefile.am
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/input/performance/Makefile.am?rev=351786&r1=351785&r2=351786&view=diff
==
--- logging/log4cxx/trunk/tests/input/performance/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/input/performance/Makefile.am Fri Dec  2 
10:09:05 2005
@@ -1 +1,10 @@
 EXTRA_DIST = *

svn commit: r351783 - /logging/log4cxx/trunk/configure.in

[afester]

Author: afester
Date: Fri Dec  2 10:00:13 2005
New Revision: 351783

URL: http://svn.apache.org/viewcvs?rev=351783&view=rev
Log:
LOGCXX-54: additional build tweak to remove obsolete boost-regex library 
dependency

Modified:
logging/log4cxx/trunk/configure.in

Modified: logging/log4cxx/trunk/configure.in
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/configure.in?rev=351783&r1=351782&r2=351783&view=diff
==
--- logging/log4cxx/trunk/configure.in (original)
+++ logging/log4cxx/trunk/configure.in Fri Dec  2 10:00:13 2005
@@ -122,12 +122,6 @@
 enable_tests=no)
 fi
 
-AC_HAVE_LIBRARY([boost_regex],,
-enable_tests=no)
-
-AC_CHECK_HEADERS([boost/regex.hpp],,
-enable_tests=no)
-
 AM_CONDITIONAL(TESTS, test x$enable_tests = xyes)
 
 

svn commit: r351788 - /logging/log4cxx/trunk/src/Makefile.am

[afester]

Author: afester
Date: Fri Dec  2 10:16:16 2005
New Revision: 351788

URL: http://svn.apache.org/viewcvs?rev=351788&view=rev
Log:
LOGCXX-43: add missing file outputdebugstringappender.cpp

Modified:
logging/log4cxx/trunk/src/Makefile.am

Modified: logging/log4cxx/trunk/src/Makefile.am
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/src/Makefile.am?rev=351788&r1=351787&r2=351788&view=diff
==
--- logging/log4cxx/trunk/src/Makefile.am (original)
+++ logging/log4cxx/trunk/src/Makefile.am Fri Dec  2 10:16:16 2005
@@ -86,6 +86,7 @@
 odbcappender.cpp \
 onlyonceerrorhandler.cpp \
 optionconverter.cpp \
+outputdebugstringappender.cpp \
 outputstream.cpp \
 outputstreamwriter.cpp \
 patternconverter.cpp \

svn commit: r351789 - /logging/log4cxx/trunk/src/class.cpp

[afester]

Author: afester
Date: Fri Dec  2 10:17:34 2005
New Revision: 351789

URL: http://svn.apache.org/viewcvs?rev=351789&view=rev
Log:
LOGCXX-43: fix build on MS-Windows if LOG4CXX_HAVE_SMTP is set to 0

Modified:
logging/log4cxx/trunk/src/class.cpp

Modified: logging/log4cxx/trunk/src/class.cpp
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/src/class.cpp?rev=351789&r1=351788&r2=351789&view=diff
==
--- logging/log4cxx/trunk/src/class.cpp (original)
+++ logging/log4cxx/trunk/src/class.cpp Fri Dec  2 10:17:34 2005
@@ -34,7 +34,7 @@
 #include 
 #endif
 #include 
-#ifdef LOG4CXX_HAVE_SMTP
+#if LOG4CXX_HAVE_SMTP
 #include 
 #endif
 #include 
@@ -142,7 +142,7 @@
 OutputDebugStringAppender::registerClass();
 #endif
 RollingFileAppender::registerClass();
-#ifdef LOG4CXX_HAVE_SMTP
+#if LOG4CXX_HAVE_SMTP
 //  TODO:
 //SMTPAppender::registerClass();
 #endif

svn commit: r351787 - /logging/log4cxx/trunk/include/log4cxx/private/Makefile.am

[afester]

Author: afester
Date: Fri Dec  2 10:15:11 2005
New Revision: 351787

URL: http://svn.apache.org/viewcvs?rev=351787&view=rev
Log:
LOGCXX-43: dist-hook to remove log4cxx_private.h from dist-tarball

Modified:
logging/log4cxx/trunk/include/log4cxx/private/Makefile.am

Modified: logging/log4cxx/trunk/include/log4cxx/private/Makefile.am
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/include/log4cxx/private/Makefile.am?rev=351787&r1=351786&r2=351787&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/private/Makefile.am (original)
+++ logging/log4cxx/trunk/include/log4cxx/private/Makefile.am Fri Dec  2 
10:15:11 2005
@@ -2,3 +2,7 @@
 privateinc_HEADERS= $(top_builddir)/include/log4cxx/private/*.h 
log4cxx_private.h
 DISTCLEANFILES = log4cxx_private.h
 EXTRA_DIST = log4cxx_private.hw
+
+dist-hook:
+   -rm -f $(distdir)/log4cxx_private.h
+

svn commit: r357344 - /logging/log4cxx/trunk/src/formattinginfo.cpp

[afester]

Author: afester
Date: Sat Dec 17 08:33:13 2005
New Revision: 357344

URL: http://svn.apache.org/viewcvs?rev=357344&view=rev
Log:
LOGCXX-92: synchronized parameter list between header file and implementation 
file

Modified:
logging/log4cxx/trunk/src/formattinginfo.cpp

Modified: logging/log4cxx/trunk/src/formattinginfo.cpp
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/src/formattinginfo.cpp?rev=357344&r1=357343&r2=357344&view=diff
==
--- logging/log4cxx/trunk/src/formattinginfo.cpp (original)
+++ logging/log4cxx/trunk/src/formattinginfo.cpp Sat Dec 17 08:33:13 2005
@@ -29,7 +29,7 @@
* @param maxLength maximum length.
*/
 FormattingInfo::FormattingInfo(
-bool leftAlign, int minLength, int maxLength) :
+const bool leftAlign, const int minLength, const int maxLength) :
 leftAlign(leftAlign),
 minLength(minLength),
 maxLength(maxLength) {
@@ -50,7 +50,7 @@
* @param fieldStart start of field in buffer.
* @param buffer buffer to be modified.
*/
-void FormattingInfo::format(int fieldStart, LogString& buffer) const {
+void FormattingInfo::format(const int fieldStart, LogString& buffer) const {
 int rawLength = buffer.length() - fieldStart;
 
 if (rawLength > maxLength) {

svn commit: r357347 - in /logging/log4cxx/trunk/tests/src/util: compare.cpp compare.h

[afester]

Author: afester
Date: Sat Dec 17 08:37:21 2005
New Revision: 357347

URL: http://svn.apache.org/viewcvs?rev=357347&view=rev
Log:
LOGCXX-92: hide method with wstring parameter if LOG4CXX_HAS_WCHAR_T is not set

Modified:
logging/log4cxx/trunk/tests/src/util/compare.cpp
logging/log4cxx/trunk/tests/src/util/compare.h

Modified: logging/log4cxx/trunk/tests/src/util/compare.cpp
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/src/util/compare.cpp?rev=357347&r1=357346&r2=357347&view=diff
==
--- logging/log4cxx/trunk/tests/src/util/compare.cpp (original)
+++ logging/log4cxx/trunk/tests/src/util/compare.cpp Sat Dec 17 08:37:21 2005
@@ -137,7 +137,9 @@
   std::cout << s1;
 }
 
+#if LOG4CXX_HAS_WCHAR_T
 void Compare::emit(const std::wstring& s1) {
   std::wcout << s1;
 }
+#endif
 

Modified: logging/log4cxx/trunk/tests/src/util/compare.h
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/src/util/compare.h?rev=357347&r1=357346&r2=357347&view=diff
==
--- logging/log4cxx/trunk/tests/src/util/compare.h (original)
+++ logging/log4cxx/trunk/tests/src/util/compare.h Sat Dec 17 08:37:21 2005
@@ -37,7 +37,11 @@
 static void outputFile(const File& file,
   const LogString& contents,
   log4cxx::helpers::Pool& pool);
+
 static void emit(const std::string &line);
+
+#if LOG4CXX_HAS_WCHAR_T
 static void emit(const std::wstring &line);
+#endif
 };
 }

svn commit: r357349 - /logging/log4cxx/trunk/configure.in

[afester]

Author: afester
Date: Sat Dec 17 08:52:40 2005
New Revision: 357349

URL: http://svn.apache.org/viewcvs?rev=357349&view=rev
Log:
LOGCXX-92: check for std::wstring instead of wchar_t (std::wstring is necessary 
and includes wchar_t)

Modified:
logging/log4cxx/trunk/configure.in

Modified: logging/log4cxx/trunk/configure.in
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/configure.in?rev=357349&r1=357348&r2=357349&view=diff
==
--- logging/log4cxx/trunk/configure.in (original)
+++ logging/log4cxx/trunk/configure.in Sat Dec 17 08:52:40 2005
@@ -357,7 +357,9 @@
 
 #for wchar_t
 AC_MSG_CHECKING([for wchar_t])
-AC_COMPILE_IFELSE(AC_LANG_SOURCE(wchar_t* w;), [have_wchar_t=yes], 
[have_wchar_t=no])
+AC_COMPILE_IFELSE(AC_LANG_SOURCE([[
+   #include 
+   std::wstring w;]]), [have_wchar_t=yes], [have_wchar_t=no])
 AC_MSG_RESULT($have_wchar_t)
 
 if test "$have_wchar_t" = "yes"

svn commit: r358314 - in /logging/log4cxx/trunk: ./ tests/src/ tests/src/customlogger/ tests/src/db/ tests/src/defaultinit/ tests/src/helpers/ tests/src/net/ tests/src/nt/ tests/src/pattern/ tests/src

[afester]

Author: afester
Date: Wed Dec 21 08:36:07 2005
New Revision: 358314

URL: http://svn.apache.org/viewcvs?rev=358314&view=rev
Log:
LOGCXX-92: remove non-portable linker flags --whole-archive from test suite

Removed:
logging/log4cxx/trunk/tests/src/customlogger/Makefile.am
logging/log4cxx/trunk/tests/src/db/Makefile.am
logging/log4cxx/trunk/tests/src/defaultinit/Makefile.am
logging/log4cxx/trunk/tests/src/helpers/Makefile.am
logging/log4cxx/trunk/tests/src/net/Makefile.am
logging/log4cxx/trunk/tests/src/nt/Makefile.am
logging/log4cxx/trunk/tests/src/pattern/Makefile.am
logging/log4cxx/trunk/tests/src/rolling/Makefile.am
logging/log4cxx/trunk/tests/src/util/Makefile.am
logging/log4cxx/trunk/tests/src/varia/Makefile.am
logging/log4cxx/trunk/tests/src/xml/Makefile.am
Modified:
logging/log4cxx/trunk/configure.in
logging/log4cxx/trunk/tests/src/Makefile.am

Modified: logging/log4cxx/trunk/configure.in
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/configure.in?rev=358314&r1=358313&r2=358314&view=diff
==
--- logging/log4cxx/trunk/configure.in (original)
+++ logging/log4cxx/trunk/configure.in Wed Dec 21 08:36:07 2005
@@ -438,17 +438,6 @@
 tests/input/rolling/Makefile
 tests/input/xml/Makefile
 tests/src/Makefile
-tests/src/customlogger/Makefile
-tests/src/db/Makefile
-tests/src/defaultinit/Makefile
-tests/src/helpers/Makefile
-tests/src/net/Makefile
-tests/src/nt/Makefile
-tests/src/pattern/Makefile
-tests/src/rolling/Makefile
-tests/src/util/Makefile
-tests/src/xml/Makefile
-tests/src/varia/Makefile
 tests/witness/Makefile
 tests/witness/encoding/Makefile
 tests/witness/ndc/Makefile

Modified: logging/log4cxx/trunk/tests/src/Makefile.am
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/src/Makefile.am?rev=358314&r1=358313&r2=358314&view=diff
==
--- logging/log4cxx/trunk/tests/src/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/src/Makefile.am Wed Dec 21 08:36:07 2005
@@ -1,7 +1,11 @@
-SUBDIRS = customlogger defaultinit helpers net pattern rolling util varia db 
xml nt
-
-EXTRA_DIST = $(top_srcdir)/tests/src/*.cpp
-noinst_HEADERS= $(top_srcdir)/tests/src/*.h
+noinst_HEADERS = \
+   $(top_srcdir)/tests/src/customlogger/*.h \
+   $(top_srcdir)/tests/src/helpers/*.h \
+   $(top_srcdir)/tests/src/net/*.h \
+   $(top_srcdir)/tests/src/pattern/*.h \
+   $(top_srcdir)/tests/src/util/*.h \
+   $(top_srcdir)/tests/src/xml/*.h \
+   $(top_srcdir)/tests/src/*.h
 
 if TESTS
 
@@ -9,7 +13,103 @@
 
 noinst_PROGRAMS = testsuite shortsocketserver
 
+customlogger_tests = \
+   customlogger/xlogger.cpp\
+   customlogger/xloggertestcase.cpp
+
+defaultinit_tests = \
+   defaultinit/testcase1.cpp\
+   defaultinit/testcase2.cpp\
+   defaultinit/testcase3.cpp\
+   defaultinit/testcase4.cpp
+
+helpers = \
+helpers/absolutetimedateformattestcase.cpp \
+helpers/cacheddateformattestcase.cpp \
+helpers/charsetdecodertestcase.cpp \
+helpers/charsetencodertestcase.cpp \
+helpers/cyclicbuffertestcase.cpp\
+helpers/datetimedateformattestcase.cpp \
+helpers/iso8601dateformattestcase.cpp \
+helpers/localechanger.cpp\
+helpers/optionconvertertestcase.cpp   \
+helpers/propertiestestcase.cpp \
+helpers/relativetimedateformattestcase.cpp \
+helpers/stringtokenizertestcase.cpp \
+helpers/stringhelpertestcase.cpp \
+helpers/timezonetestcase.cpp \
+helpers/transcodertestcase.cpp \
+helpers/unicodehelpertestcase.cpp 
+
+net_tests = \
+   net/smtpappendertestcase.cpp \
+   net/socketappendertestcase.cpp \
+   net/sockethubappendertestcase.cpp \
+   net/socketservertestcase.cpp \
+   net/syslogappendertestcase.cpp \
+   net/telnetappendertestcase.cpp \
+   net/xmlsocketappendertestcase.cpp
+
+pattern_tests = \
+   pattern/num343patternconverter.cpp \
+   pattern/patternparsertestcase.cpp
+
+rolling_tests = \
+rolling/filenamepatterntestcase.cpp \
+rolling/filterbasedrollingtest.cpp \
+rolling/manualrollingtest.cpp \
+rolling/obsoletedailyrollingfileappendertest.cpp \
+rolling/obsoleterollingfileappendertest.cpp \
+rolling/sizebasedrollingtest.cpp \
+rolling/timebasedrollingtest.cpp
+
+util = \
+   util/absolutetimefilter.cpp\
+   util/absolutedateandtimefilter.cpp\
+   util/binarycompare.cpp\
+   util/compare.cpp\
+   util/controlfilter.cpp\
+   util/filenamefilter.cpp \
+   util/filter.cpp\
+   util/iso8601filter.cpp\
+   util/linenumberfilter.cpp\
+   util/relativetimefilter.cpp\
+   util/threadfilter.cpp\
+   util/transformer.cpp\
+   util/xmlfilen

svn commit: r358603 - in /logging/log4cxx/trunk: include/log4cxx/helpers/simpledateformat.h include/log4cxx/stream.h src/logstream.cpp src/simpledateformat.cpp

[afester]

Author: afester
Date: Thu Dec 22 11:05:10 2005
New Revision: 358603

URL: http://svn.apache.org/viewcvs?rev=358603&view=rev
Log:
LOGCXX-123: fixed build failure on UNIX for the logchar=UTF8 build

Modified:
logging/log4cxx/trunk/include/log4cxx/helpers/simpledateformat.h
logging/log4cxx/trunk/include/log4cxx/stream.h
logging/log4cxx/trunk/src/logstream.cpp
logging/log4cxx/trunk/src/simpledateformat.cpp

Modified: logging/log4cxx/trunk/include/log4cxx/helpers/simpledateformat.h
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/include/log4cxx/helpers/simpledateformat.h?rev=358603&r1=358602&r2=358603&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/helpers/simpledateformat.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/helpers/simpledateformat.h Thu Dec 22 
11:05:10 2005
@@ -27,21 +27,21 @@
 {
 namespace helpers
 {
+  class PatternToken;
 
   /**
-  Concrete class for formatting and parsing dates in a
-  locale-sensitive manner.
-
-  */
+   * Concrete class for formatting and parsing dates in a
+   * locale-sensitive manner.
+   */
   class LOG4CXX_EXPORT SimpleDateFormat : public DateFormat
   {
   public:
   /**
-  Constructs a DateFormat using the given pattern and the 
default
-  time zone.
-
-  @param pattern the pattern describing the date and time 
format
-  */
+   * Constructs a DateFormat using the given pattern and the 
default
+   * time zone.
+   *
+   * @param pattern the pattern describing the date and time 
format
+   */
   SimpleDateFormat(const LogString& pattern);
   SimpleDateFormat(const LogString& pattern, const 
std::locale* locale);
   ~SimpleDateFormat();
@@ -51,67 +51,22 @@
   log4cxx::helpers::Pool& p) const;
 
   /**
-  *Set time zone.
-  * @param zone new time zone.
-  */
+   * Set time zone.
+   * @param zone new time zone.
+   */
   void setTimeZone(const TimeZonePtr& zone);
 
-
-  /**
-  * Abstract inner class representing one format token
-  * (one or more instances of a character).
-  */
-  class PatternToken {
-  public:
-   /**
-*   Constructor.
-*/
-   PatternToken();
-   /**
-   * Destructor.
-   */
-   virtual ~PatternToken();
-
-   /**
-   * Sets the time zone.
-   * @param zone new time zone.
-   */
-   virtual void setTimeZone(const TimeZonePtr& zone);
-
-  /**
-  * Appends the formatted content to the string.
-  * @param s string to which format contribution is 
appended.
-  * @param date exploded date/time.
-  * @param p memory pool.
-  */
-   virtual void format(LogString& s,
-   const apr_time_exp_t& date,
-   log4cxx::helpers::Pool& p) const = 
0;
-
-
-
-  private:
-  /**
-  *Private copy constructor.
-  */
-   PatternToken(const PatternToken&);
-   /**
-   * Private assignment operator.
-   */
-   PatternToken& operator=(const PatternToken&);
-  };
-
-
-
   private:
   /**
-  *Time zone.
-  */
+   * Time zone.
+   */
   TimeZonePtr timeZone;
+
   /**
-  * List of tokens.
-  */
+   * List of tokens.
+   */
   typedef std::vector PatternTokenList;
+
   PatternTokenList pattern;
   };
 

Modified: logging/log4cxx/trunk/include/log4cxx/stream.h
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/include/log4cxx/stream.h?rev=358603&r1=358602&r2=358603&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/stream.h (original)
+++ logging/l

svn commit: r358606 - in /logging/log4cxx/trunk: include/log4cxx/ndc.h src/ndc.cpp

[afester]

Author: afester
Date: Thu Dec 22 11:13:00 2005
New Revision: 358606

URL: http://svn.apache.org/viewcvs?rev=358606&view=rev
Log:
LOGCXX-124: Added missing std::wstring& constructor to NDC class

Modified:
logging/log4cxx/trunk/include/log4cxx/ndc.h
logging/log4cxx/trunk/src/ndc.cpp

Modified: logging/log4cxx/trunk/include/log4cxx/ndc.h
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/include/log4cxx/ndc.h?rev=358606&r1=358605&r2=358606&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/ndc.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/ndc.h Thu Dec 22 11:13:00 2005
@@ -112,7 +112,28 @@
 public:
 typedef std::stack Stack;
 
-NDC(const LogString& message);
+/**
+ Creates a nested diagnostic context.
+ Since java performs no automatic cleanup of objects when a
+ scope is left, in log4j push() and pop() must be used
+ to manage the NDC. For convenience, log4cxx provides 
+ an NDC constructor and destructor which simply call the 
push() and
+ pop() methods, allowing for automatic cleanup when the current
+ scope ends.
+
+ @param message The new diagnostic context information.
+ @see The #push method.
+ */
+#if LOG4CXX_HAS_WCHAR_T
+NDC(const std::wstring& message);
+#endif
+NDC(const std::string& message);
+
+/**
+Removes the topmost element from the NDC stack.
+
+@see The #pop method.
+*/
 ~NDC();
 
 /**

Modified: logging/log4cxx/trunk/src/ndc.cpp
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/src/ndc.cpp?rev=358606&r1=358605&r2=358606&view=diff
==
--- logging/log4cxx/trunk/src/ndc.cpp (original)
+++ logging/log4cxx/trunk/src/ndc.cpp Thu Dec 22 11:13:00 2005
@@ -47,7 +47,14 @@
 return *this;
 }
 
-NDC::NDC(const LogString& message)
+#if LOG4CXX_HAS_WCHAR_T
+NDC::NDC(const std::wstring& message)
+{
+push(message);
+}
+#endif
+
+NDC::NDC(const std::string& message)
 {
 push(message);
 }

svn commit: r384272 - in /logging/log4cxx/trunk/include/log4cxx: helpers/unicodehelper.h xml/domconfigurator.h

[afester]

Author: afester
Date: Wed Mar  8 09:14:28 2006
New Revision: 384272

URL: http://svn.apache.org/viewcvs?rev=384272&view=rev
Log:
LOGCXX-130: removed extra class qualifications

Modified:
logging/log4cxx/trunk/include/log4cxx/helpers/unicodehelper.h
logging/log4cxx/trunk/include/log4cxx/xml/domconfigurator.h

Modified: logging/log4cxx/trunk/include/log4cxx/helpers/unicodehelper.h
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/include/log4cxx/helpers/unicodehelper.h?rev=384272&r1=384271&r2=384272&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/helpers/unicodehelper.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/helpers/unicodehelper.h Wed Mar  8 
09:14:28 2006
@@ -95,7 +95,7 @@
 *   @param ch wchar_t value
 *   @return number of bytes required.
 */
-  static int UnicodeHelper::lengthUTF8(wchar_t ch);
+  static int lengthUTF8(wchar_t ch);
 
 #endif
 

Modified: logging/log4cxx/trunk/include/log4cxx/xml/domconfigurator.h
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/include/log4cxx/xml/domconfigurator.h?rev=384272&r1=384271&r2=384272&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/xml/domconfigurator.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/xml/domconfigurator.h Wed Mar  8 
09:14:28 2006
@@ -245,8 +245,9 @@
 
 protected:
 static LogString getAttribute(apr_xml_elem*, 
-const std::string& attrName); 
-LogString DOMConfigurator::subst(const LogString& 
value);
+const std::string& attrName);
+
+LogString subst(const LogString& value);
 
 protected:
 helpers::Properties props;

svn commit: r385062 - in /logging/log4cxx/trunk: include/log4cxx/ include/log4cxx/helpers/ src/ tests/src/ tests/src/helpers/ tests/src/util/

[afester]

Author: afester
Date: Sat Mar 11 03:27:21 2006
New Revision: 385062

URL: http://svn.apache.org/viewcvs?rev=385062&view=rev
Log:
LOGCXX-125: Re-added implementation for localized logging and enabled 
L7dTestCase. Separated out the read() method from the File class. Created 
InputStream and Reader hierarchy. Adjusted necessary calls to the former 
File::read() method to use the new stream and reader classes instead.

Added:
logging/log4cxx/trunk/include/log4cxx/helpers/fileinputstream.h
logging/log4cxx/trunk/include/log4cxx/helpers/inputstream.h
logging/log4cxx/trunk/include/log4cxx/helpers/inputstreamreader.h
logging/log4cxx/trunk/include/log4cxx/helpers/reader.h
logging/log4cxx/trunk/src/fileinputstream.cpp
logging/log4cxx/trunk/src/inputstream.cpp
logging/log4cxx/trunk/src/inputstreamreader.cpp
logging/log4cxx/trunk/src/reader.cpp
Modified:
logging/log4cxx/trunk/include/log4cxx/file.h
logging/log4cxx/trunk/include/log4cxx/helpers/fileoutputstream.h
logging/log4cxx/trunk/include/log4cxx/helpers/loader.h
logging/log4cxx/trunk/include/log4cxx/helpers/properties.h
logging/log4cxx/trunk/include/log4cxx/helpers/propertyresourcebundle.h
logging/log4cxx/trunk/include/log4cxx/helpers/stringhelper.h
logging/log4cxx/trunk/include/log4cxx/logger.h
logging/log4cxx/trunk/src/Makefile.am
logging/log4cxx/trunk/src/file.cpp
logging/log4cxx/trunk/src/loader.cpp
logging/log4cxx/trunk/src/logger.cpp
logging/log4cxx/trunk/src/properties.cpp
logging/log4cxx/trunk/src/propertyconfigurator.cpp
logging/log4cxx/trunk/src/propertyresourcebundle.cpp
logging/log4cxx/trunk/src/resourcebundle.cpp
logging/log4cxx/trunk/src/stringhelper.cpp
logging/log4cxx/trunk/tests/src/filetestcase.cpp
logging/log4cxx/trunk/tests/src/helpers/propertiestestcase.cpp
logging/log4cxx/trunk/tests/src/l7dtestcase.cpp
logging/log4cxx/trunk/tests/src/util/compare.cpp

Modified: logging/log4cxx/trunk/include/log4cxx/file.h
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/include/log4cxx/file.h?rev=385062&r1=385061&r2=385062&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/file.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/file.h Sat Mar 11 03:27:21 2006
@@ -57,8 +57,7 @@
return osName;
 }
 
-LogString read(log4cxx::helpers::Pool& pool) const;
-
+// @deprecated Use FileOutputStream instead
 log4cxx_status_t write(const LogString& src, 
log4cxx::helpers::Pool& p) const;
 
 log4cxx_status_t open(apr_file_t** file, int flags,

Added: logging/log4cxx/trunk/include/log4cxx/helpers/fileinputstream.h
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/include/log4cxx/helpers/fileinputstream.h?rev=385062&view=auto
==
--- logging/log4cxx/trunk/include/log4cxx/helpers/fileinputstream.h (added)
+++ logging/log4cxx/trunk/include/log4cxx/helpers/fileinputstream.h Sat Mar 11 
03:27:21 2006
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2003,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _LOG4CXX_HELPERS_FILEINPUTSTREAM_H
+#define _LOG4CXX_HELPERS_FILEINPUTSTREAM_H
+
+#include 
+#include 
+#include 
+
+
+namespace log4cxx
+{
+
+namespace helpers {
+
+  /**
+   * InputStream implemented on top of APR file IO.
+   * @since 0.9.8
+   */
+  class LOG4CXX_EXPORT FileInputStream : public InputStream
+  {
+  private:
+  Pool pool;
+  void* fileptr;
+
+  public:
+  DECLARE_ABSTRACT_LOG4CXX_OBJECT(FileInputStream)
+  BEGIN_LOG4CXX_CAST_MAP()
+  LOG4CXX_CAST_ENTRY(FileInputStream)
+  LOG4CXX_CAST_ENTRY_CHAIN(InputStream)
+  END_LOG4CXX_CAST_MAP()
+
+  /**
+   * Creates a FileInputStream by opening a connection to an 
actual
+   * file, the file named by the path name name in the file 
system.
+   *
+   * @param filename The system-dependent file name.
+   */
+   

svn commit: r386151 - /logging/log4cxx/trunk/include/log4cxx/rolling/timebasedrollingpolicy.h

[afester]

Author: afester
Date: Wed Mar 15 11:41:45 2006
New Revision: 386151

URL: http://svn.apache.org/viewcvs?rev=386151&view=rev
Log:
LOGCXX-131: Use DECLARE_LOG4CXX_OBJECT instead of 
DECLARE_ABSTRACT_LOG4CXX_OBJECT to make the class dynamically creatable.

Modified:
logging/log4cxx/trunk/include/log4cxx/rolling/timebasedrollingpolicy.h

Modified: logging/log4cxx/trunk/include/log4cxx/rolling/timebasedrollingpolicy.h
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/include/log4cxx/rolling/timebasedrollingpolicy.h?rev=386151&r1=386150&r2=386151&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/rolling/timebasedrollingpolicy.h 
(original)
+++ logging/log4cxx/trunk/include/log4cxx/rolling/timebasedrollingpolicy.h Wed 
Mar 15 11:41:45 2006
@@ -137,7 +137,7 @@
  */
 class LOG4CXX_EXPORT TimeBasedRollingPolicy : public RollingPolicyBase,
  public TriggeringPolicy {
-  DECLARE_ABSTRACT_LOG4CXX_OBJECT(TimeBasedRollingPolicy)
+  DECLARE_LOG4CXX_OBJECT(TimeBasedRollingPolicy)
   BEGIN_LOG4CXX_CAST_MAP()
   LOG4CXX_CAST_ENTRY(TimeBasedRollingPolicy)
   LOG4CXX_CAST_ENTRY_CHAIN(RollingPolicyBase)

svn commit: r386387 - in /logging/log4cxx/trunk/src: systemerrwriter.cpp systemoutwriter.cpp

[afester]

Author: afester
Date: Thu Mar 16 09:18:26 2006
New Revision: 386387

URL: http://svn.apache.org/viewcvs?rev=386387&view=rev
Log:
LOGCXX-126: replaced iostream include with stdio.h

Modified:
logging/log4cxx/trunk/src/systemerrwriter.cpp
logging/log4cxx/trunk/src/systemoutwriter.cpp

Modified: logging/log4cxx/trunk/src/systemerrwriter.cpp
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/src/systemerrwriter.cpp?rev=386387&r1=386386&r2=386387&view=diff
==
--- logging/log4cxx/trunk/src/systemerrwriter.cpp (original)
+++ logging/log4cxx/trunk/src/systemerrwriter.cpp Thu Mar 16 09:18:26 2006
@@ -16,7 +16,7 @@
 
 #include 
 #include 
-#include 
+#include 
 
 using namespace log4cxx;
 using namespace log4cxx::helpers;

Modified: logging/log4cxx/trunk/src/systemoutwriter.cpp
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/src/systemoutwriter.cpp?rev=386387&r1=386386&r2=386387&view=diff
==
--- logging/log4cxx/trunk/src/systemoutwriter.cpp (original)
+++ logging/log4cxx/trunk/src/systemoutwriter.cpp Thu Mar 16 09:18:26 2006
@@ -16,7 +16,7 @@
 
 #include 
 #include 
-#include 
+#include 
 
 using namespace log4cxx;
 using namespace log4cxx::helpers;

svn commit: r392748 - in /logging/log4cxx/trunk: ./ docs/ include/log4cxx/ include/log4cxx/private/ simplesocketserver/ src/ xdocs/src/manual/

[afester]

Author: afester
Date: Sun Apr  9 08:06:30 2006
New Revision: 392748

URL: http://svn.apache.org/viewcvs?rev=392748&view=rev
Log:
LOGCXX-35: Cleaned up the configurations scripts to eliminate detection of 
libxml2, removed setting of the various HAVE_XML defines.

Modified:
logging/log4cxx/trunk/INSTALL
logging/log4cxx/trunk/configure.in
logging/log4cxx/trunk/docs/Doxyfile.in
logging/log4cxx/trunk/include/log4cxx/config_msvc.h.in
logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.h.in
logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.hw
logging/log4cxx/trunk/simplesocketserver/Makefile.am
logging/log4cxx/trunk/src/Makefile.am
logging/log4cxx/trunk/xdocs/src/manual/Doxyfile.in

Modified: logging/log4cxx/trunk/INSTALL
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/INSTALL?rev=392748&r1=392747&r2=392748&view=diff
==
--- logging/log4cxx/trunk/INSTALL (original)
+++ logging/log4cxx/trunk/INSTALL Sun Apr  9 08:06:30 2006
@@ -224,9 +224,6 @@
 With --enable-unicode, the library will be compiled with UTF16 Unicode support
 (2 bytes wide characters instead of 1 byte wide characters)
 
-If the libXML2 library (http://xmlsoft.org) is detected, the DOMConfigurator
-class will be compiled.
-
 Threading support can be added through option -with-thread
 * "pthread" (default): pthread library
 * "Microsoft" : native microsoft library
@@ -242,11 +239,6 @@
 * "libsmtp" : libsmtp library (http://libsmtp.berlios.de)
 * "CDO" : Microsoft CDO library (no yet implemented !)
 * "no" (default) : no SMTP support
-
-XML support (DOMConfigurator) can be added through option -with-XML
-* "libxm2" (default) : gnome xml library (http://xmlsoft.org)
-* "Microsoft" : MSXML library
-* "no" : no XML support
 
 
 Specifying the System Type

Modified: logging/log4cxx/trunk/configure.in
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/configure.in?rev=392748&r1=392747&r2=392748&view=diff
==
--- logging/log4cxx/trunk/configure.in (original)
+++ logging/log4cxx/trunk/configure.in Sun Apr  9 08:06:30 2006
@@ -227,44 +227,6 @@
 [AC_CHECK_LIB(socket,gethostbyname)])])
 AC_CHECK_FUNCS(setsockopt,,[AC_CHECK_LIB(socket,setsockopt)])
 
-# for DOMConfigurator
-AC_MSG_CHECKING(for XML support)
-AC_ARG_WITH(XML,
-AC_HELP_STRING(--with-XML, [XML support. Accepted arguments :
-libxml2, Microsoft, no (default=libxml2)]),
-[ac_with_xml=$withval],
-[ac_with_xml=libxml2]
-)
-case "$ac_with_xml" in
-Microsoft)
-AC_DEFINE(HAVE_MS_XML, 1, ODBC support through Microsoft XML.)
-AC_DEFINE(HAVE_XML, 1, XML support)
-AC_MSG_RESULT(Microsoft)
-;;
-libxml2)
-AC_MSG_RESULT(libxml2)
-AC_CHECK_PROG(XML2_CONFIG, xml2-config, yes, no)
-if test "x$XML2_CONFIG" = "xyes"
-then
-AC_DEFINE(HAVE_LIBXML2, 1, XML support through libxml2.)
-AC_DEFINE(HAVE_XML, 1, XML support)
-LIBS_XML="`xml2-config --libs`"
-CPPFLAGS_XML="`xml2-config --cflags`"
-else
-AC_MSG_WARN(libxml2 not found !)
-fi
-;;
-no)
-AC_MSG_RESULT(no)
-;;
-*)
-AC_MSG_RESULT(???)
-AC_MSG_ERROR(Unknown option : $ac_with_xml)
-;;
-esac
-AC_SUBST(LIBS_XML)
-AC_SUBST(CPPFLAGS_XML)
-
 #for ODBCAppender
 AC_MSG_CHECKING(for ODBC support)
 AC_ARG_WITH(ODBC,

Modified: logging/log4cxx/trunk/docs/Doxyfile.in
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/docs/Doxyfile.in?rev=392748&r1=392747&r2=392748&view=diff
==
--- logging/log4cxx/trunk/docs/Doxyfile.in (original)
+++ logging/log4cxx/trunk/docs/Doxyfile.in Sun Apr  9 08:06:30 2006
@@ -797,7 +797,7 @@
 # or name=definition (no spaces). If the definition and the = are 
 # omitted =1 is assumed.
 
-PREDEFINED = HAVE_SMTP HAVE_ODBC HAVE_XML
+PREDEFINED = HAVE_SMTP HAVE_ODBC
 
 # If the MACRO_EXPANSION and EXPAND_PREDEF_ONLY tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be 
expanded. 

Modified: logging/log4cxx/trunk/include/log4cxx/config_msvc.h.in
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/include/log4cxx/config_msvc.h.in?rev=392748&r1=392747&r2=392748&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/config_msvc.h.in (original)
+++ logging/log4cxx/trunk/include/log4cxx/con

svn commit: r392753 - /logging/log4cxx/trunk/STATUS

[afester]

Author: afester
Date: Sun Apr  9 08:13:44 2006
New Revision: 392753

URL: http://svn.apache.org/viewcvs?rev=392753&view=rev
Log:
fixed file type

Modified:
logging/log4cxx/trunk/STATUS   (contents, props changed)

Modified: logging/log4cxx/trunk/STATUS
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/STATUS?rev=392753&r1=392752&r2=392753&view=diff
==
Binary files - no diff available.

Propchange: logging/log4cxx/trunk/STATUS
--
svn:eol-style = native

Propchange: logging/log4cxx/trunk/STATUS
--
svn:keywords = Author Date Id Revision

Propchange: logging/log4cxx/trunk/STATUS
('svn:mime-type' removed)

svn commit: r392754 - /logging/log4cxx/trunk/STATUS

[afester]

Author: afester
Date: Sun Apr  9 08:15:37 2006
New Revision: 392754

URL: http://svn.apache.org/viewcvs?rev=392754&view=rev
Log:
LOGCXX-35: log4cxx does not 
depend on libxml2 (LGPL) or MSXML for XML configuration anymore.

Modified:
logging/log4cxx/trunk/STATUS

Modified: logging/log4cxx/trunk/STATUS
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/STATUS?rev=392754&r1=392753&r2=392754&view=diff
==
--- logging/log4cxx/trunk/STATUS (original)
+++ logging/log4cxx/trunk/STATUS Sun Apr  9 08:15:37 2006
@@ -25,8 +25,7 @@
 
   o No non ASL or ASL compatable dependencies in the code base
   
-carnold: log4cxx currently depends on libxml2 (LGPL) or MSXML for XML 
configuration.
-Migration to Apache Portable Runtime in progress.
+carnold: Migration to Apache Portable Runtime in progress.
   
   o License grant complete  
   o CLAs on file.
@@ -38,7 +37,7 @@
   (there's at least 3 legally independent committers and there 
   is no single company or entity that is vital to the success of the 
project)
 
-carnold: 3 current committers, carnold, mcatan, cdevienne.  I'm independent of 
the other committers.
+carnold: 4 current committers, carnold, mcatan, cdevienne, afester.  I'm 
independent of the other committers.
 
   o The above implies that new committers are admitted according to 
ASF practices
   o ASF style voting has been adopted and is standard practice

svn commit: r398175 - /logging/log4cxx/trunk/simplesocketserver/simplesocketserver.cpp

[afester]

Author: afester
Date: Sat Apr 29 08:11:05 2006
New Revision: 398175

URL: http://svn.apache.org/viewcvs?rev=398175&view=rev
Log:
LOGCXX-132: adjusted to new Thread constructor without pool

Modified:
logging/log4cxx/trunk/simplesocketserver/simplesocketserver.cpp

Modified: logging/log4cxx/trunk/simplesocketserver/simplesocketserver.cpp
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/simplesocketserver/simplesocketserver.cpp?rev=398175&r1=398174&r2=398175&view=diff
==
--- logging/log4cxx/trunk/simplesocketserver/simplesocketserver.cpp (original)
+++ logging/log4cxx/trunk/simplesocketserver/simplesocketserver.cpp Sat Apr 29 
08:11:05 2006
@@ -21,7 +21,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -84,7 +83,6 @@
 
 try
 {
-Pool pool;
 LoggerPtr logger = Logger::getLogger("SimpleSocketServer");
 log4cxx::logstream logstream(logger, Level::INFO);
 
@@ -105,7 +103,7 @@
 Thread * thread = new Thread();
 SocketNode* node = new SocketNode(socket,
 LogManager::getLoggerRepository());
-thread->run(pool, runSocket, node);
+thread->run(runSocket, node);
 }
 }
 catch(SocketException& e)

svn commit: r398568 - /logging/log4cxx/trunk/configure.in

[afester]

Author: afester
Date: Mon May  1 03:21:58 2006
New Revision: 398568

URL: http://svn.apache.org/viewcvs?rev=398568&view=rev
Log:
LOGCXX-43: FreeBSD build fix

Modified:
logging/log4cxx/trunk/configure.in

Modified: logging/log4cxx/trunk/configure.in
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/configure.in?rev=398568&r1=398567&r2=398568&view=diff
==
--- logging/log4cxx/trunk/configure.in (original)
+++ logging/log4cxx/trunk/configure.in Mon May  1 03:21:58 2006
@@ -184,7 +184,7 @@
 
 case "$host" in
 *freebsd*)
-CPPFLAGS="$CPPLAGS -D_THREAD_SAFE"
+CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
 LIBS="-pthread $LIBS"
 ;;
 *solaris*)

svn commit: r399014 - in /logging/log4cxx/trunk: build.xml configure.in include/log4cxx/private/log4cxx_private.h.in src/syslogappender.cpp src/syslogwriter.cpp

[afester]

Author: afester
Date: Tue May  2 11:58:16 2006
New Revision: 399014

URL: http://svn.apache.org/viewcvs?rev=399014&view=rev
Log:
LOGCXX-66: re-added syslogappender

Modified:
logging/log4cxx/trunk/build.xml
logging/log4cxx/trunk/configure.in
logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.h.in
logging/log4cxx/trunk/src/syslogappender.cpp
logging/log4cxx/trunk/src/syslogwriter.cpp

Modified: logging/log4cxx/trunk/build.xml
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/build.xml?rev=399014&r1=399013&r2=399014&view=diff
==
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Tue May  2 11:58:16 2006
@@ -420,8 +420,15 @@
replace="${logchar_is_wchar}"/>
 
 
+   match="@HAS_WCHAR_T@"
+   replace="${has.wchar_t}"/>
+
+
+
 
 
 

Modified: logging/log4cxx/trunk/configure.in
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/configure.in?rev=399014&r1=399013&r2=399014&view=diff
==
--- logging/log4cxx/trunk/configure.in (original)
+++ logging/log4cxx/trunk/configure.in Tue May  2 11:58:16 2006
@@ -154,9 +154,15 @@
 
 AC_CHECK_FUNCS(swprintf)
 
-# for SysLogAppender
-
-AC_CHECK_FUNCS(syslog)
+# for local syslog() function for SyslogAppender
+AC_CHECK_FUNCS(syslog, [have_syslog=yes], [have_syslog=no])
+if test "$have_syslog" = "yes"
+then
+ AC_SUBST(HAS_SYSLOG, 1)
+else
+ AC_SUBST(HAS_SYSLOG, 0)
+fi
+  
 
 # Checks for libraries
 # 

Modified: logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.h.in
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.h.in?rev=399014&r1=399013&r2=399014&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.h.in 
(original)
+++ logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.h.in Tue May  
2 11:58:16 2006
@@ -54,6 +54,6 @@
 //   attempting creation of the corresponding appender.
 //
 #define LOG4CXX_HAVE_SMTP 0
-#define LOG4CXX_HAVE_SYSLOG 1
+#define LOG4CXX_HAVE_SYSLOG @HAS_SYSLOG@
 
 #endif

Modified: logging/log4cxx/trunk/src/syslogappender.cpp
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/src/syslogappender.cpp?rev=399014&r1=399013&r2=399014&view=diff
==
--- logging/log4cxx/trunk/src/syslogappender.cpp (original)
+++ logging/log4cxx/trunk/src/syslogappender.cpp Tue May  2 11:58:16 2006
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #ifdef LOG4CXX_HAVE_SYSLOG
 #include 

Modified: logging/log4cxx/trunk/src/syslogwriter.cpp
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/src/syslogwriter.cpp?rev=399014&r1=399013&r2=399014&view=diff
==
--- logging/log4cxx/trunk/src/syslogwriter.cpp (original)
+++ logging/log4cxx/trunk/src/syslogwriter.cpp Tue May  2 11:58:16 2006
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define SYSLOG_PORT 514
 
@@ -50,18 +51,14 @@
}
 }
 
-void SyslogWriter::write(const LogString&)
-{
-#if 0
-//  TODO
-   USES_CONVERSION;
-   const char * bytes = T2A(string.c_str());
-   DatagramPacketPtr packet = new DatagramPacket((void *)bytes, 
string.length() + 1,
-  address, SYSLOG_PORT);
+void SyslogWriter::write(const LogString& source) {
+   LOG4CXX_ENCODE_CHAR(data, source);
 
-   if(this->ds != 0)
-   {
+   DatagramPacketPtr packet = 
+  new DatagramPacket((void*) data.c_str(), data.length() + 1,
+ address, SYSLOG_PORT);
+
+   if(this->ds != 0) {
   ds->send(packet);
}
-#endif
 }

svn commit: r399015 - in /logging/log4cxx/trunk: include/log4cxx/helpers/datagramsocket.h src/datagramsocket.cpp

[afester]

Author: afester
Date: Tue May  2 11:59:46 2006
New Revision: 399015

URL: http://svn.apache.org/viewcvs?rev=399015&view=rev
Log:
LOGCXX-64: ported datagramsocket to APR network IO

Modified:
logging/log4cxx/trunk/include/log4cxx/helpers/datagramsocket.h
logging/log4cxx/trunk/src/datagramsocket.cpp

Modified: logging/log4cxx/trunk/include/log4cxx/helpers/datagramsocket.h
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/include/log4cxx/helpers/datagramsocket.h?rev=399015&r1=399014&r2=399015&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/helpers/datagramsocket.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/helpers/datagramsocket.h Tue May  2 
11:59:46 2006
@@ -20,6 +20,10 @@
 #include 
 #include 
 #include 
+#include 
+
+
+extern "C" { struct apr_socket_t; }
 
 namespace log4cxx
 {
@@ -91,7 +95,7 @@
 
 /** Returns wether the socket is closed or not. */
 inline bool isClosed() const
-{ return fd != 0; }
+{ return socket != 0; }
 
 /** Returns the connection state of the socket. */
 inline bool isConnected() const
@@ -103,12 +107,17 @@
 /** Sends a datagram packet from this socket. */
 void  send(DatagramPacketPtr& p);
 
-protected:
-/** The file descriptor object for this socket. */
-int fd;
+private:
+/** The APR socket */
+apr_socket_t *socket;
+
+/** The memory pool for the socket */
+Pool socketPool;
 
 InetAddress address;
+
 InetAddress localAddress;
+
 int port;
 
 /** The local port number to which this socket is 
connected. */

Modified: logging/log4cxx/trunk/src/datagramsocket.cpp
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/src/datagramsocket.cpp?rev=399015&r1=399014&r2=399015&view=diff
==
--- logging/log4cxx/trunk/src/datagramsocket.cpp (original)
+++ logging/log4cxx/trunk/src/datagramsocket.cpp Tue May  2 11:59:46 2006
@@ -14,38 +14,27 @@
  * limitations under the License.
  */
 
-
-#if defined(_WIN32)
-#include 
-#include 
-#else
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#endif
-
 #include 
 #include 
 #include 
+#include 
 #include 
 
+#include "apr_network_io.h"
+#include "apr_lib.h"
+
 using namespace log4cxx::helpers;
 
 IMPLEMENT_LOG4CXX_OBJECT(DatagramSocket);
 
 DatagramSocket::DatagramSocket()
- : fd(0), address(), localAddress(), port(0), localPort(0)
+ : socket(0), address(), localAddress(), port(0), localPort(0)
 {
create();
 }
 
 DatagramSocket::DatagramSocket(int localPort)
- : fd(0), address(), localAddress(), port(0), localPort(0)
+ : socket(0), address(), localAddress(), port(0), localPort(0)
 {
InetAddress bindAddr;
bindAddr.address = INADDR_ANY;
@@ -55,7 +44,7 @@
 }
 
 DatagramSocket::DatagramSocket(int localPort, InetAddress localAddress)
- : fd(0), address(), localAddress(), port(0), localPort(0)
+ : socket(0), address(), localAddress(), port(0), localPort(0)
 {
create();
bind(localPort, localAddress);
@@ -75,16 +64,22 @@
 /**  Binds a datagram socket to a local port and address.*/
 void DatagramSocket::bind(int localPort, InetAddress localAddress)
 {
-   struct sockaddr_in server_addr;
-   int server_len = sizeof(server_addr);
+   Pool addrPool;
 
-   server_addr.sin_family = AF_INET;
-   server_addr.sin_addr.s_addr = htonl(localAddress.address);
-   server_addr.sin_port = htons(localPort);
-
-   if (::bind(fd, (sockaddr *)&server_addr, server_len) == -1)
-   {
-  throw BindException();
+   // Create server socket address
+   LOG4CXX_ENCODE_CHAR(hostAddr, localAddress.getHostAddress());
+   apr_sockaddr_t *server_addr;
+   apr_status_t status = 
+   apr_sockaddr_info_get(&server_addr, hostAddr.c_str(), APR_INET,
+ localPort, 0, (apr_pool_t*) 
addrPool.getAPRPool());
+   if (status != APR_SUCCESS) {
+ throw BindException(status);
+   }
+
+   // bind the socket to the address
+   status = apr_socket_bind(socket, server_addr);
+   if (status != APR_SUCCESS) {
+ throw BindException(status);
}
 
this->localPort = localPort;
@@ -94,97 +89,100 @@
 /** Close the socket.*/
 void DatagramSocket::close()
 {
-   if (fd != 0)
-   {
+   if (socket != 0) {
   LOGLOG_DEBUG(LOG4CXX_STR("closing socket"));
-#if defined(WIN32) || defined(_WIN32)
-  if (::closesocket(fd) == -1)
-#else
-  if (::close(fd) ==

svn commit: r399843 - /logging/log4cxx/trunk/tests/src/xml/xmllayouttestcase.cpp

[afester]

Author: afester
Date: Thu May  4 12:56:47 2006
New Revision: 399843

URL: http://svn.apache.org/viewcvs?rev=399843&view=rev
Log:
LOGCXX-138: Use a different file name for the output of each test method

Modified:
logging/log4cxx/trunk/tests/src/xml/xmllayouttestcase.cpp

Modified: logging/log4cxx/trunk/tests/src/xml/xmllayouttestcase.cpp
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/src/xml/xmllayouttestcase.cpp?rev=399843&r1=399842&r2=399843&view=diff
==
--- logging/log4cxx/trunk/tests/src/xml/xmllayouttestcase.cpp (original)
+++ logging/log4cxx/trunk/tests/src/xml/xmllayouttestcase.cpp Thu May  4 
12:56:47 2006
@@ -83,8 +83,11 @@
 
 void basic()
 {
+const LogString 
tempFileName(LOG4CXX_STR("output/temp.xmlLayout.1"));
+const File filteredFile("output/filtered.xmlLayout.1");
+
 XMLLayoutPtr xmlLayout = new XMLLayout();
-AppenderPtr appender(new FileAppender(xmlLayout, TEMP, false));
+AppenderPtr appender(new FileAppender(xmlLayout, tempFileName, 
false));
 root->addAppender(appender);
 common();
 
@@ -97,7 +100,7 @@
 
 try
 {
-Transformer::transform(TEMP, FILTERED, filters);
+Transformer::transform(tempFileName, filteredFile, 
filters);
 }
 catch(UnexpectedFormatException& e)
 {
@@ -105,14 +108,17 @@
 throw;
 }
 
-CPPUNIT_ASSERT(Compare::compare(FILTERED, 
LOG4CXX_FILE("witness/xmlLayout.1")));
+CPPUNIT_ASSERT(Compare::compare(filteredFile, 
LOG4CXX_FILE("witness/xmlLayout.1")));
 }
 
 void locationInfo()
 {
+const LogString 
tempFileName(LOG4CXX_STR("output/temp.xmlLayout.2"));
+const File filteredFile("output/filtered.xmlLayout.2");
+
 XMLLayoutPtr xmlLayout = new XMLLayout();
 xmlLayout->setLocationInfo(true);
-root->addAppender(new FileAppender(xmlLayout, TEMP, false));
+root->addAppender(new FileAppender(xmlLayout, tempFileName, 
false));
 common();
 
 XMLTimestampFilter xmlTimestampFilter;
@@ -131,7 +137,7 @@
 
 try
 {
-Transformer::transform(TEMP, FILTERED, filters);
+Transformer::transform(tempFileName, filteredFile, 
filters);
 }
 catch(UnexpectedFormatException& e)
 {
@@ -139,7 +145,7 @@
 throw;
 }
 
-CPPUNIT_ASSERT(Compare::compare(FILTERED, 
LOG4CXX_FILE("witness/xmlLayout.2")));
+CPPUNIT_ASSERT(Compare::compare(filteredFile, 
LOG4CXX_FILE("witness/xmlLayout.2")));
 }
 
 #if _MSC_VER < 1300
@@ -149,9 +155,12 @@
 
 void testCDATA()
 {
+const LogString 
tempFileName(LOG4CXX_STR("output/temp.xmlLayout.3"));
+const File filteredFile("output/filtered.xmlLayout.3");
+
 XMLLayoutPtr xmlLayout = new XMLLayout();
 xmlLayout->setLocationInfo(true);
-FileAppenderPtr appender(new FileAppender(xmlLayout, TEMP, 
false));
+FileAppenderPtr appender(new FileAppender(xmlLayout, 
tempFileName, false));
 root->addAppender(appender);
 
 LOG4CXX_DEBUG(logger,
@@ -170,7 +179,7 @@
 
 try
 {
-Transformer::transform(TEMP, FILTERED, filters);
+Transformer::transform(tempFileName, filteredFile, 
filters);
 }
 catch(UnexpectedFormatException& e)
 {
@@ -178,13 +187,16 @@
 throw;
 }
 
-CPPUNIT_ASSERT(Compare::compare(FILTERED, 
LOG4CXX_FILE("witness/xmlLayout.3")));
+CPPUNIT_ASSERT(Compare::compare(filteredFile, 
LOG4CXX_FILE("witness/xmlLayout.3")));
 }
 
 void testNULL()
 {
+const LogString 
tempFileName(LOG4CXX_STR("output/temp.xmlLayout.null"));
+const File filteredFile("output/filtered.xmlLayout.null");
+
 XMLLayoutPtr xmlLayout = new XMLLayout();
-FileAppenderPtr appender(new FileAppender(xmlLayout, TEMP, 
false));
+FileAppenderPtr appender(new FileAppender(xmlLayout, 
tempFileName, false));
 root->addAppender(appender);
 
 LOG4CXX_DEBUG(logger, LOG4CXX_TEST_STR("hi&quo

svn commit: r400324 - /logging/log4cxx/trunk/tests/src/xml/xmllayouttestcase.cpp

[afester]

Author: afester
Date: Sat May  6 08:34:49 2006
New Revision: 400324

URL: http://svn.apache.org/viewcvs?rev=400324&view=rev
Log:
LOGCXX-139: Switched order of XMLThreadFilter and XMLTimestampFilter to avoid 
the timestamp pattern matching part of the thread pattern on 64 bit platforms.

Modified:
logging/log4cxx/trunk/tests/src/xml/xmllayouttestcase.cpp

Modified: logging/log4cxx/trunk/tests/src/xml/xmllayouttestcase.cpp
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/src/xml/xmllayouttestcase.cpp?rev=400324&r1=400323&r2=400324&view=diff
==
--- logging/log4cxx/trunk/tests/src/xml/xmllayouttestcase.cpp (original)
+++ logging/log4cxx/trunk/tests/src/xml/xmllayouttestcase.cpp Sat May  6 
08:34:49 2006
@@ -95,8 +95,8 @@
 XMLThreadFilter xmlThreadFilter;
 
 std::vector filters;
-filters.push_back(&xmlTimestampFilter);
 filters.push_back(&xmlThreadFilter);
+filters.push_back(&xmlTimestampFilter);
 
 try
 {
@@ -129,9 +129,8 @@
 
 std::vector filters;
 filters.push_back(&xmlFilenameFilter);
-filters.push_back(&xmlTimestampFilter);
-
 filters.push_back(&xmlThreadFilter);
+filters.push_back(&xmlTimestampFilter);
 filters.push_back(&line2XX);
 filters.push_back(&line5X);
 
@@ -173,8 +172,8 @@
 
 std::vector filters;
 filters.push_back(&xmlFilenameFilter);
-filters.push_back(&xmlTimestampFilter);
 filters.push_back(&xmlThreadFilter);
+filters.push_back(&xmlTimestampFilter);
 filters.push_back(&line1xx);
 
 try
@@ -206,8 +205,8 @@
 XMLThreadFilter xmlThreadFilter;
 
 std::vector filters;
-filters.push_back(&xmlTimestampFilter);
 filters.push_back(&xmlThreadFilter);
+filters.push_back(&xmlTimestampFilter);
 
 try
 {
@@ -243,8 +242,8 @@
 XMLThreadFilter xmlThreadFilter;
 
 std::vector filters;
-filters.push_back(&xmlTimestampFilter);
 filters.push_back(&xmlThreadFilter);
+filters.push_back(&xmlTimestampFilter);
 
 try
 {
@@ -281,8 +280,8 @@
 XMLThreadFilter xmlThreadFilter;
 
 std::vector filters;
-filters.push_back(&xmlTimestampFilter);
 filters.push_back(&xmlThreadFilter);
+filters.push_back(&xmlTimestampFilter);
 
 try
 {

svn commit: r400330 - in /logging/log4cxx/trunk/tests: ./ input/ input/ndc/ input/performance/ input/rolling/ input/xml/ witness/ witness/encoding/ witness/ndc/ witness/rolling/

[afester]

Author: afester
Date: Sat May  6 09:12:14 2006
New Revision: 400330

URL: http://svn.apache.org/viewcvs?rev=400330&view=rev
Log:
LOGCXX-43: avoid messages while copying the test data files when building in a 
separate build tree directly from an SVN workspace.

Modified:
logging/log4cxx/trunk/tests/Makefile.am
logging/log4cxx/trunk/tests/input/Makefile.am
logging/log4cxx/trunk/tests/input/ndc/Makefile.am
logging/log4cxx/trunk/tests/input/performance/Makefile.am
logging/log4cxx/trunk/tests/input/rolling/Makefile.am
logging/log4cxx/trunk/tests/input/xml/Makefile.am
logging/log4cxx/trunk/tests/witness/Makefile.am
logging/log4cxx/trunk/tests/witness/encoding/Makefile.am
logging/log4cxx/trunk/tests/witness/ndc/Makefile.am
logging/log4cxx/trunk/tests/witness/rolling/Makefile.am

Modified: logging/log4cxx/trunk/tests/Makefile.am
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/Makefile.am?rev=400330&r1=400329&r2=400330&view=diff
==
--- logging/log4cxx/trunk/tests/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/Makefile.am Sat May  6 09:12:14 2006
@@ -1,4 +1,4 @@
-SUBDIRS = input src witness
+SUBDIRS = input witness src
 EXTRA_DIST = log4j.dtd L7D_en_US.properties L7D_fr_CH.properties 
L7D_fr.properties
 
 if TESTS
@@ -8,7 +8,7 @@
@if test "$(top_srcdir)" != "$(top_builddir)"; then \
  echo "Copying test suite data files ..." ; \
  list='$(EXTRA_DIST)'; for file in $$list; do \
-   find $(srcdir) -name "$$file" -exec cp {} . ';' ; \
+   cp -p $(srcdir)/$$file . ; \
  done \
fi
 

Modified: logging/log4cxx/trunk/tests/input/Makefile.am
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/input/Makefile.am?rev=400330&r1=400329&r2=400330&view=diff
==
--- logging/log4cxx/trunk/tests/input/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/input/Makefile.am Sat May  6 09:12:14 2006
@@ -6,6 +6,6 @@
@if test "$(top_srcdir)" != "$(top_builddir)"; then \
  echo "Copying test suite data files ..." ; \
  list='$(EXTRA_DIST)'; for file in $$list; do \
-   find $(srcdir) -name "$$file" -exec cp {} . ';' ; \
+   cp -p $(srcdir)/$$file . ; \
  done \
fi

Modified: logging/log4cxx/trunk/tests/input/ndc/Makefile.am
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/input/ndc/Makefile.am?rev=400330&r1=400329&r2=400330&view=diff
==
--- logging/log4cxx/trunk/tests/input/ndc/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/input/ndc/Makefile.am Sat May  6 09:12:14 2006
@@ -5,6 +5,6 @@
@if test "$(top_srcdir)" != "$(top_builddir)"; then \
  echo "Copying test suite data files ..." ; \
  list='$(EXTRA_DIST)'; for file in $$list; do \
-   find $(srcdir) -name "$$file" -exec cp {} . ';' ; \
+   cp -p $(srcdir)/$$file . ; \
  done \
fi

Modified: logging/log4cxx/trunk/tests/input/performance/Makefile.am
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/input/performance/Makefile.am?rev=400330&r1=400329&r2=400330&view=diff
==
--- logging/log4cxx/trunk/tests/input/performance/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/input/performance/Makefile.am Sat May  6 
09:12:14 2006
@@ -5,6 +5,6 @@
@if test "$(top_srcdir)" != "$(top_builddir)"; then \
  echo "Copying test suite data files ..." ; \
  list='$(EXTRA_DIST)'; for file in $$list; do \
-   find $(srcdir) -name "$$file" -exec cp {} . ';' ; \
+   cp -p $(srcdir)/$$file . ; \
  done \
fi

Modified: logging/log4cxx/trunk/tests/input/rolling/Makefile.am
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/input/rolling/Makefile.am?rev=400330&r1=400329&r2=400330&view=diff
==
--- logging/log4cxx/trunk/tests/input/rolling/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/input/rolling/Makefile.am Sat May  6 09:12:14 
2006
@@ -5,6 +5,6 @@
@if test "$(top_srcdir)" != "$(top_builddir)"; then \
  echo "Copying test suite data files ..." ; \
  list='$(EXTRA_DIST)'; for file in $$list; do \
-   find $(srcdir) -name "$$file" -exec cp {} . ';' ; \
+   cp -p $(srcdir)/$$file 

svn commit: r406123 - in /logging/log4cxx/trunk: include/log4cxx/helpers/ include/log4cxx/net/ simplesocketserver/ src/ tests/src/ tests/src/helpers/

[afester]

Author: afester
Date: Sat May 13 09:05:49 2006
New Revision: 406123

URL: http://svn.apache.org/viewcvs?rev=406123&view=rev
Log:
LOGCXX-64: ported InetAddress to the APR

Added:
logging/log4cxx/trunk/tests/src/helpers/inetaddresstestcase.cpp
Modified:
logging/log4cxx/trunk/include/log4cxx/helpers/datagrampacket.h
logging/log4cxx/trunk/include/log4cxx/helpers/datagramsocket.h
logging/log4cxx/trunk/include/log4cxx/helpers/inetaddress.h
logging/log4cxx/trunk/include/log4cxx/helpers/serversocket.h
logging/log4cxx/trunk/include/log4cxx/helpers/socket.h
logging/log4cxx/trunk/include/log4cxx/helpers/socketimpl.h
logging/log4cxx/trunk/include/log4cxx/helpers/syslogwriter.h
logging/log4cxx/trunk/include/log4cxx/net/socketappender.h
logging/log4cxx/trunk/include/log4cxx/net/socketappenderskeleton.h
logging/log4cxx/trunk/include/log4cxx/net/xmlsocketappender.h
logging/log4cxx/trunk/simplesocketserver/simplesocketserver.cpp
logging/log4cxx/trunk/src/datagrampacket.cpp
logging/log4cxx/trunk/src/datagramsocket.cpp
logging/log4cxx/trunk/src/inetaddress.cpp
logging/log4cxx/trunk/src/serversocket.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/xmlsocketappender.cpp
logging/log4cxx/trunk/tests/src/Makefile.am
logging/log4cxx/trunk/tests/src/shortsocketserver.cpp

Modified: logging/log4cxx/trunk/include/log4cxx/helpers/datagrampacket.h
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/include/log4cxx/helpers/datagrampacket.h?rev=406123&r1=406122&r2=406123&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/helpers/datagrampacket.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/helpers/datagrampacket.h Sat May 13 
09:05:49 2006
@@ -48,7 +48,7 @@
 int length;
 
 /** The IP address for this packet. */
-InetAddress address;
+InetAddressPtr address;
 
 /** The UDP port number of the remote host. */
 int port;
@@ -66,7 +66,7 @@
 /** Constructs a datagram packet for sending packets 
of length
 length to the specified port number on 
the specified
 host. */
-DatagramPacket(void * buf, int length, InetAddress 
address, int port);
+DatagramPacket(void * buf, int length, InetAddressPtr 
address, int port);
 
 /** Constructs a DatagramPacket for receiving packets 
of length
 length, specifying an offset into the 
buffer. */
@@ -75,14 +75,14 @@
 /** Constructs a datagram packet for sending packets 
of length
 length with offset offset to 
the
 specified port number on the specified host. */
-DatagramPacket(void * buf, int offset, int length, 
InetAddress address,
+DatagramPacket(void * buf, int offset, int length, 
InetAddressPtr address,
 int port);
 
 ~DatagramPacket();
 
 /** Returns the IP address of the machine to which 
this datagram
 is being sent or from which the datagram was received. 
*/
-inline InetAddress getAddress() const
+inline InetAddressPtr getAddress() const
 { return address; }
 
 /** Returns the data received or the data to be sent. 
*/
@@ -104,7 +104,7 @@
 inline int getPort() const
 { return port; }
 
-inline void setAddress(InetAddress address)
+inline void setAddress(InetAddressPtr address)
 { this->address = address; }
 
 /** Set the data buffer for this packet. */

Modified: logging/log4cxx/trunk/include/log4cxx/helpers/datagramsocket.h
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/include/log4cxx/helpers/datagramsocket.h?rev=406123&r1=406122&r2=406123&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/helpers/datagramsocket.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/helpers/datagramsocket.h Sat May 13 
09:05:49 2006
@@ -55,13 +55,13 @@
 
 /**  Creates a datagram socket, bound to the specified 
local
 address. */
-DatagramSoc

svn commit: r406730 - /logging/log4cxx/trunk/tests/src/Makefile.am

[afester]

Author: afester
Date: Mon May 15 13:06:50 2006
New Revision: 406730

URL: http://svn.apache.org/viewcvs?rev=406730&view=rev
Log:
LOGCXX-132: build tweak to reflect removed threadtest.cpp

Modified:
logging/log4cxx/trunk/tests/src/Makefile.am

Modified: logging/log4cxx/trunk/tests/src/Makefile.am
URL: 
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/src/Makefile.am?rev=406730&r1=406729&r2=406730&view=diff
==
--- logging/log4cxx/trunk/tests/src/Makefile.am (original)
+++ logging/log4cxx/trunk/tests/src/Makefile.am Mon May 15 13:06:50 2006
@@ -129,8 +129,7 @@
 rollingfileappendertestcase.cpp\
 streamtestcase.cpp\
 writerappendertestcase.cpp \
-ndctestcase.cpp \
-threadtest.cpp
+ndctestcase.cpp
 
 testsuite_LDADD = \
 $(top_builddir)/src/liblog4cxx.la

svn commit: r408999 - /logging/log4cxx/trunk/tests/src/helpers/inetaddresstestcase.cpp

[afester]

Author: afester
Date: Tue May 23 13:17:53 2006
New Revision: 408999

URL: http://svn.apache.org/viewvc?rev=408999&view=rev
Log:
LOGCXX-64: InetAddress::getLocalHost()->getHostName() returns a host name 
depending on the underlying OS, like "localhost", "localhost.localdomain" or 
even the real host name. Can therefore only check very simple assumptions in 
the test case.

Modified:
logging/log4cxx/trunk/tests/src/helpers/inetaddresstestcase.cpp

Modified: logging/log4cxx/trunk/tests/src/helpers/inetaddresstestcase.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/helpers/inetaddresstestcase.cpp?rev=408999&r1=408998&r2=408999&view=diff
==
--- logging/log4cxx/trunk/tests/src/helpers/inetaddresstestcase.cpp (original)
+++ logging/log4cxx/trunk/tests/src/helpers/inetaddresstestcase.cpp Tue May 23 
13:17:53 2006
@@ -39,7 +39,7 @@
InetAddressPtr addr = InetAddress::getLocalHost();
 
CPPUNIT_ASSERT(addr->getHostAddress() == LOG4CXX_STR("127.0.0.1"));
-  CPPUNIT_ASSERT(addr->getHostName().find(LOG4CXX_STR("localhost")) == 
0);
+   CPPUNIT_ASSERT(!addr->getHostName().empty());
 }
 
 /**
@@ -50,7 +50,7 @@
InetAddressPtr addr = 
InetAddress::getByName(LOG4CXX_STR("localhost"));
 
CPPUNIT_ASSERT(addr->getHostAddress() == LOG4CXX_STR("127.0.0.1"));
-  CPPUNIT_ASSERT(addr->getHostName().find(LOG4CXX_STR("localhost")) == 
0);
+   CPPUNIT_ASSERT(!addr->getHostName().empty());
 }
 
 /**

svn commit: r411602 - in /logging/log4cxx/trunk: include/log4cxx/helpers/ performance/ src/

[afester]

Author: afester
Date: Sun Jun  4 14:54:43 2006
New Revision: 411602

URL: http://svn.apache.org/viewvc?rev=411602&view=rev
Log:
LOGCXX-14: fix "extra ‘;’" errors when compiling with g++ --pedantic

Modified:
logging/log4cxx/trunk/include/log4cxx/helpers/date.h
logging/log4cxx/trunk/include/log4cxx/helpers/integer.h
logging/log4cxx/trunk/include/log4cxx/helpers/transcoder.h
logging/log4cxx/trunk/performance/nullappender.h
logging/log4cxx/trunk/src/configurator.cpp
logging/log4cxx/trunk/src/datagrampacket.cpp
logging/log4cxx/trunk/src/datagramsocket.cpp
logging/log4cxx/trunk/src/manualtriggeringpolicy.cpp
logging/log4cxx/trunk/src/sizebasedtriggeringpolicy.cpp

Modified: logging/log4cxx/trunk/include/log4cxx/helpers/date.h
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/helpers/date.h?rev=411602&r1=411601&r2=411602&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/helpers/date.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/helpers/date.h Sun Jun  4 14:54:43 
2006
@@ -60,7 +60,7 @@
   typedef log4cxx::helpers::ObjectPtrT DatePtr;
 
}
-};
+}
 
 
 #endif

Modified: logging/log4cxx/trunk/include/log4cxx/helpers/integer.h
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/helpers/integer.h?rev=411602&r1=411601&r2=411602&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/helpers/integer.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/helpers/integer.h Sun Jun  4 14:54:43 
2006
@@ -43,7 +43,7 @@
   typedef log4cxx::helpers::ObjectPtrT IntegerPtr;
 
}
-};
+}
 
 
 #endif

Modified: logging/log4cxx/trunk/include/log4cxx/helpers/transcoder.h
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/helpers/transcoder.h?rev=411602&r1=411601&r2=411602&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/helpers/transcoder.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/helpers/transcoder.h Sun Jun  4 
14:54:43 2006
@@ -97,7 +97,7 @@
 
   };
}
-};
+}
 
 #define LOG4CXX_ENCODE_CHAR(var, src) \
 std::string var;  \

Modified: logging/log4cxx/trunk/performance/nullappender.h
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/performance/nullappender.h?rev=411602&r1=411601&r2=411602&view=diff
==
--- logging/log4cxx/trunk/performance/nullappender.h (original)
+++ logging/log4cxx/trunk/performance/nullappender.h Sun Jun  4 14:54:43 2006
@@ -61,6 +61,6 @@
 bool requiresLayout() const;
 }; // NullAppender
 }  // namespace performance
-}; // namespace log4cxx
+} // namespace log4cxx
 
 #endif //_LOG4CXX_PERFORMANCE_NULL_APPENDER_H

Modified: logging/log4cxx/trunk/src/configurator.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/configurator.cpp?rev=411602&r1=411601&r2=411602&view=diff
==
--- logging/log4cxx/trunk/src/configurator.cpp (original)
+++ logging/log4cxx/trunk/src/configurator.cpp Sun Jun  4 14:54:43 2006
@@ -20,7 +20,7 @@
 using namespace log4cxx;
 using namespace log4cxx::spi;
 
-IMPLEMENT_LOG4CXX_OBJECT(Configurator);
+IMPLEMENT_LOG4CXX_OBJECT(Configurator)
 
 
 

Modified: logging/log4cxx/trunk/src/datagrampacket.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/datagrampacket.cpp?rev=411602&r1=411601&r2=411602&view=diff
==
--- logging/log4cxx/trunk/src/datagrampacket.cpp (original)
+++ logging/log4cxx/trunk/src/datagrampacket.cpp Sun Jun  4 14:54:43 2006
@@ -18,7 +18,7 @@
 
 using namespace log4cxx::helpers;
 
-IMPLEMENT_LOG4CXX_OBJECT(DatagramPacket);
+IMPLEMENT_LOG4CXX_OBJECT(DatagramPacket)
 
 /** Constructs a DatagramPacket for receiving packets of length
 length. */

Modified: logging/log4cxx/trunk/src/datagramsocket.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/datagramsocket.cpp?rev=411602&r1=411601&r2=411602&view=diff
==
--- logging/log4cxx/trunk/src/datagramsocket.cpp (original)
+++ logging/log4cxx/trunk/src/datagramsocket.cpp Sun Jun  4 14:54:43 2006
@@ -25,7 +25,7 @@
 
 using namespace log4cxx::helpers;
 
-IMPLEMENT_LOG4CXX_OBJECT(DatagramSocket);
+IMPLEMENT_LOG4CXX_OBJECT(DatagramSocket)
 
 DatagramSocket::DatagramSocket()
  : socket(0), address(), localAddress(), port(0), localPort(0)

Modified: logging/log4cxx/trunk/src/manualtriggeringpolicy.cpp
URL: 
http://svn.apache.org/vi

svn commit: r411761 - in /logging/log4cxx/trunk/tests/src: ./ customlogger/ helpers/ net/ rolling/ xml/

[afester]

Author: afester
Date: Mon Jun  5 05:08:15 2006
New Revision: 411761

URL: http://svn.apache.org/viewvc?rev=411761&view=rev
Log:
LOGCXX-14: first part for fix of "declaration of ‘local’ shadows a member of 
'this'" when compiling with g++ -Wshadow

Modified:
logging/log4cxx/trunk/tests/src/customlogger/xlogger.h
logging/log4cxx/trunk/tests/src/helpers/optionconvertertestcase.cpp
logging/log4cxx/trunk/tests/src/loggertestcase.cpp
logging/log4cxx/trunk/tests/src/net/socketservertestcase.cpp
logging/log4cxx/trunk/tests/src/rolling/manualrollingtest.cpp
logging/log4cxx/trunk/tests/src/rolling/sizebasedrollingtest.cpp
logging/log4cxx/trunk/tests/src/shortsocketserver.cpp
logging/log4cxx/trunk/tests/src/xml/customleveltestcase.cpp
logging/log4cxx/trunk/tests/src/xml/xlevel.cpp

Modified: logging/log4cxx/trunk/tests/src/customlogger/xlogger.h
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/customlogger/xlogger.h?rev=411761&r1=411760&r2=411761&view=diff
==
--- logging/log4cxx/trunk/tests/src/customlogger/xlogger.h (original)
+++ logging/log4cxx/trunk/tests/src/customlogger/xlogger.h Mon Jun  5 05:08:15 
2006
@@ -67,7 +67,7 @@
 /**
 Just calls the parent constuctor.
 */
-XLogger(const LogString& name) : Logger(name) {}
+XLogger(const LogString& name1) : Logger(name1) {}
 
 /**
 Nothing to activate.
@@ -92,8 +92,8 @@
 LogString getSuffix() const
 { return suffix; }
 
-void setSuffix(const LogString& suffix)
-{ this->suffix = suffix; }
+void setSuffix(const LogString& suffix1)
+{ this->suffix = suffix1; }
 
 /**
 We introduce a new printing method that takes the 
TRACE level.

Modified: logging/log4cxx/trunk/tests/src/helpers/optionconvertertestcase.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/helpers/optionconvertertestcase.cpp?rev=411761&r1=411760&r2=411761&view=diff
==
--- logging/log4cxx/trunk/tests/src/helpers/optionconvertertestcase.cpp 
(original)
+++ logging/log4cxx/trunk/tests/src/helpers/optionconvertertestcase.cpp Mon Jun 
 5 05:08:15 2006
@@ -127,10 +127,10 @@
 
void varSubstTest5()
{
-  Properties props;
-  props.setProperty(LOG4CXX_STR("p1"), LOG4CXX_STR("x1"));
-  props.setProperty(LOG4CXX_STR("p2"), LOG4CXX_STR("${p1}"));
-  LogString res = OptionConverter::substVars(LOG4CXX_STR("${p2}"), props);
+  Properties props1;
+  props1.setProperty(LOG4CXX_STR("p1"), LOG4CXX_STR("x1"));
+  props1.setProperty(LOG4CXX_STR("p2"), LOG4CXX_STR("${p1}"));
+  LogString res = OptionConverter::substVars(LOG4CXX_STR("${p2}"), props1);
   CPPUNIT_ASSERT_EQUAL((LogString) LOG4CXX_STR("x1"), res);
}
 

Modified: logging/log4cxx/trunk/tests/src/loggertestcase.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/loggertestcase.cpp?rev=411761&r1=411760&r2=411761&view=diff
==
--- logging/log4cxx/trunk/tests/src/loggertestcase.cpp (original)
+++ logging/log4cxx/trunk/tests/src/loggertestcase.cpp Mon Jun  5 05:08:15 2006
@@ -392,8 +392,8 @@
 CPPUNIT_ASSERT(a0->getLevel() == 0);
 CPPUNIT_ASSERT(Level::ERROR == a0->getEffectiveLevel());
 
-LoggerPtr a1 = h->getLogger(LOG4CXX_STR("a"));
-CPPUNIT_ASSERT_EQUAL(a0, a1);
+LoggerPtr a11 = h->getLogger(LOG4CXX_STR("a"));
+CPPUNIT_ASSERT_EQUAL(a0, a11);
 }
 
 protected:

Modified: logging/log4cxx/trunk/tests/src/net/socketservertestcase.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/net/socketservertestcase.cpp?rev=411761&r1=411760&r2=411761&view=diff
==
--- logging/log4cxx/trunk/tests/src/net/socketservertestcase.cpp (original)
+++ logging/log4cxx/trunk/tests/src/net/socketservertestcase.cpp Mon Jun  5 
05:08:15 2006
@@ -176,9 +176,9 @@
 */
 void test1()
 {
-SocketAppenderPtr socketAppender =
+SocketAppenderPtr socketAppender1 =
 new SocketAppender(LOG4CXX_STR("localhost"), PORT);
-root->addAppender(socketAppender);
+root->addAppender(socketAppender1);
 common(LO

svn commit: r420595 - in /logging/log4cxx/trunk/performance: main.cpp nullappender.cpp

[afester]

Author: afester
Date: Mon Jul 10 11:01:38 2006
New Revision: 420595

URL: http://svn.apache.org/viewvc?rev=420595&view=rev
Log:
LOGCXX-14: next part for fix of "declaration of ‘local’ shadows a member of 
'this'" when compiling with g++ -Wshadow

Modified:
logging/log4cxx/trunk/performance/main.cpp
logging/log4cxx/trunk/performance/nullappender.cpp

Modified: logging/log4cxx/trunk/performance/main.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/performance/main.cpp?rev=420595&r1=420594&r2=420595&view=diff
==
--- logging/log4cxx/trunk/performance/main.cpp (original)
+++ logging/log4cxx/trunk/performance/main.cpp Mon Jul 10 11:01:38 2006
@@ -117,30 +117,30 @@
 }
   }
 
-  static long loopChar(long len, LoggerPtr& logger) {
+  static long loopChar(long len, LoggerPtr& logger1) {
 const char* msg = "Some fix message of medium length.";
 apr_time_t before = apr_time_now();
 for (int i = 0; i < len; i++) {
-  LOG4CXX_DEBUG(logger, msg);
+  LOG4CXX_DEBUG(logger1, msg);
 }
 return (apr_time_now() - before) / 1000;
   }
 
- #if LOG4CXX_HAS_WCHAR_T
-  static long loopWide(long len, LoggerPtr& logger) {
+#if LOG4CXX_HAS_WCHAR_T
+  static long loopWide(long len, LoggerPtr& logger1) {
 const wchar_t* msg = L"Some fix message of medium length.";
 apr_time_t before = apr_time_now();
 for (int i = 0; i < len; i++) {
-  LOG4CXX_DEBUG(logger, msg);
+  LOG4CXX_DEBUG(logger1, msg);
 }
 return (apr_time_now() - before) / 1000;
   }
 #endif
 
-  static long loopStream(long len, LoggerPtr& logger) {
+  static long loopStream(long len, LoggerPtr& logger1) {
 const char* msg = "Some fix message of medium length.";
 apr_time_t before = apr_time_now();
-logstream ls(logger, Level::DEBUG);
+logstream ls(logger1, Level::DEBUG);
 for (int i = 0; i < len; i++) {
   ls << msg << LOG4CXX_ENDMSG;
 }
@@ -148,10 +148,10 @@
   }
 
 #if LOG4CXX_HAS_WCHAR_T
-   static long loopWideStream(long len, LoggerPtr& logger) {
+   static long loopWideStream(long len, LoggerPtr& logger1) {
 const wchar_t* msg = L"Some fix message of medium length.";
 apr_time_t before = apr_time_now();
-logstream ls(logger, Level::DEBUG);
+logstream ls(logger1, Level::DEBUG);
 for (int i = 0; i < len; i++) {
   ls << msg << LOG4CXX_ENDMSG;
 }
@@ -159,22 +159,22 @@
   }
 #endif
 
-  static long loopBadStream(long len, LoggerPtr& logger) {
+  static long loopBadStream(long len, LoggerPtr& logger1) {
 const char* msg = "Some fix message of medium length.";
 apr_time_t before = apr_time_now();
 for (int i = 0; i < len; i++) {
-  logstream ls(logger, Level::DEBUG);
+  logstream ls(logger1, Level::DEBUG);
   ls << msg << LOG4CXX_ENDMSG;
 }
 return (apr_time_now() - before) / 1000;
   }
 
 #if LOG4CXX_HAS_WCHAR_T
-   static long loopBadWideStream(long len, LoggerPtr& logger) {
+   static long loopBadWideStream(long len, LoggerPtr& logger1) {
 const wchar_t* msg = L"Some fix message of medium length.";
 apr_time_t before = apr_time_now();
 for (int i = 0; i < len; i++) {
-  logstream ls(logger, Level::DEBUG);
+  logstream ls(logger1, Level::DEBUG);
   ls << msg << LOG4CXX_ENDMSG;
 }
 return (apr_time_now() - before) / 1000;

Modified: logging/log4cxx/trunk/performance/nullappender.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/performance/nullappender.cpp?rev=420595&r1=420594&r2=420595&view=diff
==
--- logging/log4cxx/trunk/performance/nullappender.cpp (original)
+++ logging/log4cxx/trunk/performance/nullappender.cpp Mon Jul 10 11:01:38 2006
@@ -28,9 +28,9 @@
 {
 }
 
-NullAppender::NullAppender(const LayoutPtr& layout)
+NullAppender::NullAppender(const LayoutPtr& layout1)
 {
-this->layout = layout;
+this->layout = layout1;
 }
 
 void NullAppender::close()

svn commit: r420609 - in /logging/log4cxx/trunk/include/log4cxx: ./ filter/ helpers/ net/ spi/ spi/location/ xml/

[afester]

Author: afester
Date: Mon Jul 10 11:42:38 2006
New Revision: 420609

URL: http://svn.apache.org/viewvc?rev=420609&view=rev
Log:
LOGCXX-14: next part for fix of "declaration of ‘local’ shadows a member of 
'this'" when compiling with g++ -Wshadow

Modified:
logging/log4cxx/trunk/include/log4cxx/appenderskeleton.h
logging/log4cxx/trunk/include/log4cxx/fileappender.h
logging/log4cxx/trunk/include/log4cxx/filter/levelmatchfilter.h
logging/log4cxx/trunk/include/log4cxx/filter/levelrangefilter.h
logging/log4cxx/trunk/include/log4cxx/filter/stringmatchfilter.h
logging/log4cxx/trunk/include/log4cxx/helpers/datagrampacket.h
logging/log4cxx/trunk/include/log4cxx/helpers/datelayout.h
logging/log4cxx/trunk/include/log4cxx/helpers/filewatchdog.h
logging/log4cxx/trunk/include/log4cxx/helpers/objectptr.h
logging/log4cxx/trunk/include/log4cxx/helpers/resourcebundle.h
logging/log4cxx/trunk/include/log4cxx/htmllayout.h
logging/log4cxx/trunk/include/log4cxx/level.h
logging/log4cxx/trunk/include/log4cxx/net/socketappenderskeleton.h
logging/log4cxx/trunk/include/log4cxx/net/sockethubappender.h
logging/log4cxx/trunk/include/log4cxx/net/syslogappender.h
logging/log4cxx/trunk/include/log4cxx/net/telnetappender.h
logging/log4cxx/trunk/include/log4cxx/spi/defaultrepositoryselector.h
logging/log4cxx/trunk/include/log4cxx/spi/location/locationinfo.h
logging/log4cxx/trunk/include/log4cxx/ttcclayout.h
logging/log4cxx/trunk/include/log4cxx/xml/xmllayout.h

Modified: logging/log4cxx/trunk/include/log4cxx/appenderskeleton.h
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/appenderskeleton.h?rev=420609&r1=420608&r2=420609&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/appenderskeleton.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/appenderskeleton.h Mon Jul 10 
11:42:38 2006
@@ -172,12 +172,12 @@
 [EMAIL PROTECTED] net::SocketAppender SocketAppender} ignores 
the layout set
 here.
 */
-void setLayout(const LayoutPtr& layout) { this->layout = 
layout; }
+void setLayout(const LayoutPtr& layout1) { this->layout = 
layout1; }
 
 /**
 Set the name of this Appender.
 */
-void setName(const LogString& name) { this->name.assign(name); 
}
+void setName(const LogString& name1) { 
this->name.assign(name1); }
 
 
 /**

Modified: logging/log4cxx/trunk/include/log4cxx/fileappender.h
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/fileappender.h?rev=420609&r1=420608&r2=420609&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/fileappender.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/fileappender.h Mon Jul 10 11:42:38 
2006
@@ -185,13 +185,8 @@
 Note: Actual opening of the file is made when
 #activateOptions is called, not when the options are set.
 */
-inline void setAppend(bool fileAppend)
-{ this->fileAppend = fileAppend; }
-
-
-inline void getAppend(bool append)  {
-  fileAppend = append;
-}
+inline void setAppend(bool fileAppend1)
+{ this->fileAppend = fileAppend1; }
 
 /**
 The BufferedIO option takes a boolean value. It is set 
to
@@ -207,7 +202,7 @@
 /**
 Set the size of the IO buffer.
 */
-void setBufferSize(int bufferSize) { this->bufferSize = 
bufferSize; }
+void setBufferSize(int bufferSize1) { this->bufferSize = 
bufferSize1; }
 
 /**
  *   Replaces double backslashes with single backslashes

Modified: logging/log4cxx/trunk/include/log4cxx/filter/levelmatchfilter.h
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/filter/levelmatchfilter.h?rev=420609&r1=420608&r2=420609&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/filter/levelmatchfilter.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/filter/levelmatchfilter.h Mon Jul 10 
11:42:38 2006
@@ -67,8 +67,8 @@
 
 const LogString& getLevelToMatch() const;
 
-inline void setAcceptOnMatch(bool acceptOnMatch)
-{ this->acceptOnMatch = acceptOnMatch; }
+inline void setAcceptOnMatch(bool acceptOnMatch1)
+{ this->acceptOnMatch = acceptOnMatch

svn commit: r420619 - /logging/log4cxx/trunk/src/

[afester]

Author: afester
Date: Mon Jul 10 12:32:10 2006
New Revision: 420619

URL: http://svn.apache.org/viewvc?rev=420619&view=rev
Log:
LOGCXX-14: next part for fix of "declaration of ‘local’ shadows a member of 
'this'" when compiling with g++ -Wshadow

Modified:
logging/log4cxx/trunk/src/appenderskeleton.cpp
logging/log4cxx/trunk/src/asyncappender.cpp
logging/log4cxx/trunk/src/bufferedwriter.cpp
logging/log4cxx/trunk/src/bytebuffer.cpp
logging/log4cxx/trunk/src/cacheddateformat.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/datelayout.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/filerenameaction.cpp
logging/log4cxx/trunk/src/filewatchdog.cpp
logging/log4cxx/trunk/src/fixedwindowrollingpolicy.cpp
logging/log4cxx/trunk/src/formattinginfo.cpp
logging/log4cxx/trunk/src/inetaddress.cpp
logging/log4cxx/trunk/src/inputstreamreader.cpp
logging/log4cxx/trunk/src/integer.cpp
logging/log4cxx/trunk/src/level.cpp
logging/log4cxx/trunk/src/levelmatchfilter.cpp
logging/log4cxx/trunk/src/literalpatternconverter.cpp

Modified: logging/log4cxx/trunk/src/appenderskeleton.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/appenderskeleton.cpp?rev=420619&r1=420618&r2=420619&view=diff
==
--- logging/log4cxx/trunk/src/appenderskeleton.cpp (original)
+++ logging/log4cxx/trunk/src/appenderskeleton.cpp Mon Jul 10 12:32:10 2006
@@ -41,8 +41,8 @@
 {
 }
 
-AppenderSkeleton::AppenderSkeleton(const LayoutPtr& layout)
-: layout(layout),
+AppenderSkeleton::AppenderSkeleton(const LayoutPtr& layout1)
+: layout(layout1),
   name(),
   threshold(Level::getAll()),
   errorHandler(new OnlyOnceErrorHandler()),
@@ -125,11 +125,11 @@
 append(event, pool);
 }
 
-void AppenderSkeleton::setErrorHandler(const spi::ErrorHandlerPtr& 
errorHandler)
+void AppenderSkeleton::setErrorHandler(const spi::ErrorHandlerPtr& 
errorHandler1)
 {
 synchronized sync(mutex);
 
-if(errorHandler == 0)
+if(errorHandler1 == 0)
 {
 // We do not throw exception here since the cause is probably a
 // bad config file.
@@ -137,13 +137,13 @@
 }
 else
 {
-this->errorHandler = errorHandler;
+this->errorHandler = errorHandler1;
 }
 }
 
-void AppenderSkeleton::setThreshold(const LevelPtr& threshold)
+void AppenderSkeleton::setThreshold(const LevelPtr& threshold1)
 {
-this->threshold = threshold;
+this->threshold = threshold1;
 }
 
 void AppenderSkeleton::setOption(const LogString& option,

Modified: logging/log4cxx/trunk/src/asyncappender.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/asyncappender.cpp?rev=420619&r1=420618&r2=420619&view=diff
==
--- logging/log4cxx/trunk/src/asyncappender.cpp (original)
+++ logging/log4cxx/trunk/src/asyncappender.cpp Mon Jul 10 12:32:10 2006
@@ -125,10 +125,10 @@
 return aai->getAllAppenders();
 }
 
-AppenderPtr AsyncAppender::getAppender(const LogString& name) const
+AppenderPtr AsyncAppender::getAppender(const LogString& name1) const
 {
 synchronized sync(aai->getMutex());
-return aai->getAppender(name);
+return aai->getAppender(name1);
 }
 
 bool AsyncAppender::isAttached(const AppenderPtr& appender) const
@@ -137,12 +137,12 @@
 return aai->isAttached(appender);
 }
 
-void AsyncAppender::setBufferSize(int size)
+void AsyncAppender::setBufferSize(int size1)
 {
-if (size < 0) {
+if (size1 < 0) {
   throw IllegalArgumentException("size argument must be non-negative");
 }
-this->size = size;
+this->size = size1;
 }
 
 int AsyncAppender::getBufferSize() const

Modified: logging/log4cxx/trunk/src/bufferedwriter.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/bufferedwriter.cpp?rev=420619&r1=420618&r2=420619&view=diff
==
--- logging/log4cxx/trunk/src/bufferedwriter.cpp (original)
+++ logging/log4cxx/trunk/src/bufferedwriter.cpp Mon Jul 10 12:32:10 2006
@@ -22,12 +22,12 @@
 
 IMPLEMENT_LOG4CXX_OBJECT(BufferedWriter)
 
-BufferedWriter::BufferedWriter(WriterPtr& out)
-: out(out), sz(1024) {
+BufferedWr

svn commit: r422771 - /logging/log4cxx/trunk/src/

[afester]

Author: afester
Date: Mon Jul 17 10:54:21 2006
New Revision: 422771

URL: http://svn.apache.org/viewvc?rev=422771&view=rev
Log:
LOGCXX-14: last part for fix of "declaration of ‘local’ shadows a member of 
'this'" when compiling with g++ -Wshadow

Modified:
logging/log4cxx/trunk/src/locale.cpp
logging/log4cxx/trunk/src/locationinfo.cpp
logging/log4cxx/trunk/src/logger.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/mdc.cpp
logging/log4cxx/trunk/src/nameabbreviator.cpp
logging/log4cxx/trunk/src/namepatternconverter.cpp
logging/log4cxx/trunk/src/ndc.cpp
logging/log4cxx/trunk/src/obsoleterollingfileappender.cpp
logging/log4cxx/trunk/src/outputstreamwriter.cpp
logging/log4cxx/trunk/src/patternconverter.cpp
logging/log4cxx/trunk/src/pool.cpp
logging/log4cxx/trunk/src/propertiespatternconverter.cpp
logging/log4cxx/trunk/src/propertysetter.cpp
logging/log4cxx/trunk/src/rollingfileappender.cpp
logging/log4cxx/trunk/src/rolloverdescription.cpp
logging/log4cxx/trunk/src/rootcategory.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/stringtokenizer.cpp
logging/log4cxx/trunk/src/synchronized.cpp
logging/log4cxx/trunk/src/syslogappender.cpp
logging/log4cxx/trunk/src/syslogwriter.cpp
logging/log4cxx/trunk/src/throwableinformationpatternconverter.cpp
logging/log4cxx/trunk/src/timezone.cpp
logging/log4cxx/trunk/src/writerappender.cpp
logging/log4cxx/trunk/src/xmlsocketappender.cpp

Modified: logging/log4cxx/trunk/src/locale.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/locale.cpp?rev=422771&r1=422770&r2=422771&view=diff
==
--- logging/log4cxx/trunk/src/locale.cpp (original)
+++ logging/log4cxx/trunk/src/locale.cpp Mon Jul 17 10:54:21 2006
@@ -20,19 +20,19 @@
 using namespace log4cxx::helpers;
 
 
-Locale::Locale(const LogString& language)
- : language(language)
+Locale::Locale(const LogString& language1)
+ : language(language1)
 {
 }
 
-Locale::Locale(const LogString& language, const LogString& country)
- : language(language), country(country)
+Locale::Locale(const LogString& language1, const LogString& country1)
+ : language(language1), country(country1)
 {
 }
 
-Locale::Locale(const LogString& language, const LogString& country,
-   const LogString& variant)
-: language(language), country(country), variant(variant)
+Locale::Locale(const LogString& language1, const LogString& country1,
+   const LogString& variant1)
+: language(language1), country(country1), variant(variant1)
 {
 }
 

Modified: logging/log4cxx/trunk/src/locationinfo.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/locationinfo.cpp?rev=422771&r1=422770&r2=422771&view=diff
==
--- logging/log4cxx/trunk/src/locationinfo.cpp (original)
+++ logging/log4cxx/trunk/src/locationinfo.cpp Mon Jul 17 10:54:21 2006
@@ -17,7 +17,8 @@
 #include 
 #include 
 
- using namespace ::log4cxx::spi;
+using namespace ::log4cxx::spi;
+
/**
  When location information is not available the constant
  NA is returned. Current value of this string
@@ -35,12 +36,12 @@
 *   @remarks Used by LOG4CXX_LOCATION to generate
 *   location info for current code site
 */
- LocationInfo::LocationInfo( const char * const fileName,
-  const char * const methodName,
-  int lineNumber )
- :  lineNumber( lineNumber ),
-fileName( fileName ),
-methodName( methodName ) {
+ LocationInfo::LocationInfo( const char * const fileName1,
+  const char * const methodName1,
+  int lineNumber1 )
+ :  lineNumber( lineNumber1 ),
+fileName( fileName1 ),
+methodName( methodName1 ) {
 }
 
 /**

Modified: logging/log4cxx/trunk/src/logger.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/logger.cpp?rev=422771&r1=422770&r2=422771&view=diff
==
--- logging/log4cxx/trunk/src/logger.cpp (original)
+++ logging/log4cxx/trunk/src/logger.cpp Mon Jul 17 10:54:21 2006
@@ -37,8 +37,8 @@
 
 IMPLEMENT_LOG4CXX_OBJECT(Logger)
 
-Logger::Logger(const LogString& name)
-: name(name), level(), parent(), resourceBundle(),
+Logger::Logger(const LogS

svn commit: r422785 - /logging/log4cxx/trunk/tests/src/helpers/localechanger.cpp

[afester]

Author: afester
Date: Mon Jul 17 11:37:56 2006
New Revision: 422785

URL: http://svn.apache.org/viewvc?rev=422785&view=rev
Log:
LOGCXX-14: Added missing line feed at EOF (fails on gcc with -Werror)

Modified:
logging/log4cxx/trunk/tests/src/helpers/localechanger.cpp

Modified: logging/log4cxx/trunk/tests/src/helpers/localechanger.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/helpers/localechanger.cpp?rev=422785&r1=422784&r2=422785&view=diff
==
--- logging/log4cxx/trunk/tests/src/helpers/localechanger.cpp (original)
+++ logging/log4cxx/trunk/tests/src/helpers/localechanger.cpp Mon Jul 17 
11:37:56 2006
@@ -46,4 +46,4 @@
   }
   }
 
-#endif
\ No newline at end of file
+#endif

svn commit: r422791 - in /logging/log4cxx/trunk/src: asyncappender.cpp exception.cpp hierarchy.cpp rollingpolicybase.cpp simpledateformat.cpp socketappender.cpp xmlsocketappender.cpp

[afester]

Author: afester
Date: Mon Jul 17 11:43:26 2006
New Revision: 422791

URL: http://svn.apache.org/viewvc?rev=422791&view=rev
Log:
LOGCXX-14: Some additional overlooked fixes of "declaration of ‘local’ shadows 
a member of 'this'" when compiling with g++ -Wshadow

Modified:
logging/log4cxx/trunk/src/asyncappender.cpp
logging/log4cxx/trunk/src/exception.cpp
logging/log4cxx/trunk/src/hierarchy.cpp
logging/log4cxx/trunk/src/rollingpolicybase.cpp
logging/log4cxx/trunk/src/simpledateformat.cpp
logging/log4cxx/trunk/src/socketappender.cpp
logging/log4cxx/trunk/src/xmlsocketappender.cpp

Modified: logging/log4cxx/trunk/src/asyncappender.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/asyncappender.cpp?rev=422791&r1=422790&r2=422791&view=diff
==
--- logging/log4cxx/trunk/src/asyncappender.cpp (original)
+++ logging/log4cxx/trunk/src/asyncappender.cpp Mon Jul 17 11:43:26 2006
@@ -162,10 +162,10 @@
 aai->removeAppender(appender);
 }
 
-void AsyncAppender::removeAppender(const LogString& name)
+void AsyncAppender::removeAppender(const LogString& name1)
 {
 synchronized sync(aai->getMutex());
-aai->removeAppender(name);
+aai->removeAppender(name1);
 }
 
 void* LOG4CXX_THREAD_FUNC AsyncAppender::dispatch(log4cxx_thread_t* thread, 
void* data) {

Modified: logging/log4cxx/trunk/src/exception.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/exception.cpp?rev=422791&r1=422790&r2=422791&view=diff
==
--- logging/log4cxx/trunk/src/exception.cpp (original)
+++ logging/log4cxx/trunk/src/exception.cpp Mon Jul 17 11:43:26 2006
@@ -25,10 +25,10 @@
 using namespace log4cxx;
 using namespace log4cxx::helpers;
 
-Exception::Exception(const std::string& msg) {
-  size_t msgLen = msg.length();
+Exception::Exception(const std::string& msg1) {
+  size_t msgLen = msg1.length();
   if (msgLen > MSG_SIZE) msgLen = MSG_SIZE;
-  memcpy(this->msg, (char*) msg.data(), msgLen);
+  memcpy(this->msg, (char*) msg1.data(), msgLen);
   this->msg[msgLen] = 0;
 }
 

Modified: logging/log4cxx/trunk/src/hierarchy.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/hierarchy.cpp?rev=422791&r1=422790&r2=422791&view=diff
==
--- logging/log4cxx/trunk/src/hierarchy.cpp (original)
+++ logging/log4cxx/trunk/src/hierarchy.cpp Mon Jul 17 11:43:26 2006
@@ -39,7 +39,7 @@
 
 IMPLEMENT_LOG4CXX_OBJECT(Hierarchy)
 
-Hierarchy::Hierarchy(const LoggerPtr& root) : root(root),
+Hierarchy::Hierarchy(const LoggerPtr& root1) : root(root1),
 emittedNoAppenderWarning(false), emittedNoResourceBundleWarning(false),
 mutex(), configured(false), thresholdInt(Level::ALL_INT), 
threshold(Level::getAll())
 {
@@ -235,10 +235,10 @@
 
 shutdown(); // nested locks are OK
 
-LoggerList loggers = getCurrentLoggers();
-LoggerList::iterator it, itEnd = loggers.end();
+LoggerList loggers1 = getCurrentLoggers();
+LoggerList::iterator it, itEnd = loggers1.end();
 
-for (it = loggers.begin(); it != itEnd; it++)
+for (it = loggers1.begin(); it != itEnd; it++)
 {
 LoggerPtr& logger = *it;
 logger->setLevel(0);
@@ -255,23 +255,23 @@
 
   setConfigured(false);
 
-LoggerPtr root = getRootLogger();
+LoggerPtr root1 = getRootLogger();
 
 // begin by closing nested appenders
-root->closeNestedAppenders();
+root1->closeNestedAppenders();
 
-LoggerList loggers = getCurrentLoggers();
-LoggerList::iterator it, itEnd = loggers.end();
+LoggerList loggers1 = getCurrentLoggers();
+LoggerList::iterator it, itEnd = loggers1.end();
 
-for (it = loggers.begin(); it != itEnd; it++)
+for (it = loggers1.begin(); it != itEnd; it++)
 {
 LoggerPtr& logger = *it;
 logger->closeNestedAppenders();
 }
 
 // then, remove all appenders
-root->removeAllAppenders();
-for (it = loggers.begin(); it != itEnd; it++)
+root1->removeAllAppenders();
+for (it = loggers1.begin(); it != itEnd; it++)
 {
 LoggerPtr& logger = *it;
 logger->removeAllAppenders();

Modified: logging/log4cxx/trunk/src/rollingpolicybase.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/rollingpolicybase.cpp?rev=422791&r1=422790&r2=422791&view=diff
==
--- logging/log4cxx/trunk/src/rollingpolicybase.cpp (original)
+++ logging/log4cxx/trunk/src/rollingpolicybase.cpp Mon Jul 17 11:4

svn commit: r422815 - in /logging/log4cxx/trunk: include/log4cxx/ include/log4cxx/filter/ include/log4cxx/spi/ include/log4cxx/varia/ include/log4cxx/xml/ simplesocketserver/ src/ tests/src/ tests/src

[afester]

Author: afester
Date: Mon Jul 17 12:45:12 2006
New Revision: 422815

URL: http://svn.apache.org/viewvc?rev=422815&view=rev
Log:
LOGCXX-14: Fix "unused parameters" and "unused local variables" when compiling 
with gcc with -Wunused

Modified:
logging/log4cxx/trunk/include/log4cxx/appenderskeleton.h
logging/log4cxx/trunk/include/log4cxx/filter/denyallfilter.h
logging/log4cxx/trunk/include/log4cxx/htmllayout.h
logging/log4cxx/trunk/include/log4cxx/layout.h
logging/log4cxx/trunk/include/log4cxx/spi/filter.h
logging/log4cxx/trunk/include/log4cxx/varia/fallbackerrorhandler.h
logging/log4cxx/trunk/include/log4cxx/xml/xmllayout.h
logging/log4cxx/trunk/simplesocketserver/simplesocketserver.cpp
logging/log4cxx/trunk/src/action.cpp
logging/log4cxx/trunk/src/asyncappender.cpp
logging/log4cxx/trunk/src/charsetencoder.cpp
logging/log4cxx/trunk/src/classnamepatternconverter.cpp
logging/log4cxx/trunk/src/file.cpp
logging/log4cxx/trunk/src/filelocationpatternconverter.cpp
logging/log4cxx/trunk/src/fileoutputstream.cpp
logging/log4cxx/trunk/src/filewatchdog.cpp
logging/log4cxx/trunk/src/filterbasedtriggeringpolicy.cpp
logging/log4cxx/trunk/src/fulllocationpatternconverter.cpp
logging/log4cxx/trunk/src/htmllayout.cpp
logging/log4cxx/trunk/src/integerpatternconverter.cpp
logging/log4cxx/trunk/src/levelpatternconverter.cpp
logging/log4cxx/trunk/src/linelocationpatternconverter.cpp
logging/log4cxx/trunk/src/lineseparatorpatternconverter.cpp
logging/log4cxx/trunk/src/loggerpatternconverter.cpp
logging/log4cxx/trunk/src/loggingevent.cpp
logging/log4cxx/trunk/src/manualtriggeringpolicy.cpp
logging/log4cxx/trunk/src/messagepatternconverter.cpp
logging/log4cxx/trunk/src/methodlocationpatternconverter.cpp
logging/log4cxx/trunk/src/nameabbreviator.cpp
logging/log4cxx/trunk/src/ndcpatternconverter.cpp
logging/log4cxx/trunk/src/patternconverter.cpp
logging/log4cxx/trunk/src/propertiespatternconverter.cpp
logging/log4cxx/trunk/src/propertyconfigurator.cpp
logging/log4cxx/trunk/src/relativetimepatternconverter.cpp
logging/log4cxx/trunk/src/rollingpolicybase.cpp
logging/log4cxx/trunk/src/simpledateformat.cpp
logging/log4cxx/trunk/src/sizebasedtriggeringpolicy.cpp
logging/log4cxx/trunk/src/socketappender.cpp
logging/log4cxx/trunk/src/socketappenderskeleton.cpp
logging/log4cxx/trunk/src/sockethubappender.cpp
logging/log4cxx/trunk/src/socketinputstream.cpp
logging/log4cxx/trunk/src/strftimedateformat.cpp
logging/log4cxx/trunk/src/systemerrwriter.cpp
logging/log4cxx/trunk/src/systemoutwriter.cpp
logging/log4cxx/trunk/src/telnetappender.cpp
logging/log4cxx/trunk/src/threadpatternconverter.cpp
logging/log4cxx/trunk/src/throwableinformationpatternconverter.cpp
logging/log4cxx/trunk/src/timebasedrollingpolicy.cpp
logging/log4cxx/trunk/src/unicodehelper.cpp
logging/log4cxx/trunk/src/xmlsocketappender.cpp
logging/log4cxx/trunk/tests/src/filetestcase.cpp
logging/log4cxx/trunk/tests/src/loggertestcase.cpp
logging/log4cxx/trunk/tests/src/rolling/filenamepatterntestcase.cpp
logging/log4cxx/trunk/tests/src/util/compare.cpp
logging/log4cxx/trunk/tests/src/util/xmlfilenamefilter.cpp
logging/log4cxx/trunk/tests/src/vectorappender.cpp

Modified: logging/log4cxx/trunk/include/log4cxx/appenderskeleton.h
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/appenderskeleton.h?rev=422815&r1=422814&r2=422815&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/appenderskeleton.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/appenderskeleton.h Mon Jul 17 
12:45:12 2006
@@ -89,7 +89,7 @@
 Derived appenders should override this method if option 
structure
 requires it.
 */
-virtual void activateOptions(log4cxx::helpers::Pool& pool) {}
+virtual void activateOptions(log4cxx::helpers::Pool& /* pool 
*/) {}
 virtual void setOption(const LogString& option, const 
LogString& value);
 
 /**

Modified: logging/log4cxx/trunk/include/log4cxx/filter/denyallfilter.h
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/filter/denyallfilter.h?rev=422815&r1=422814&r2=422815&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/filter/denyallfilter.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/filter/denyallfilter.h Mon Jul 17 
12:45:12 2006
@@ -50,7 +50,7 @@
 @param event The LoggingEvent to filter.
 @return Always returns [EMAIL PROTECTED] 
spi::Filter#DENY DENY}.
 */
-   

svn commit: r422839 - in /logging/log4cxx/trunk: include/log4cxx/pattern/ src/ tests/src/helpers/ tests/src/rolling/

[afester]

Author: afester
Date: Mon Jul 17 13:26:24 2006
New Revision: 422839

URL: http://svn.apache.org/viewvc?rev=422839&view=rev
Log:
LOGCXX-14: use size_t and LogString::size_type to fix various "comparison 
between signed and unsigned integer expressions"

Modified:
logging/log4cxx/trunk/include/log4cxx/pattern/patternparser.h
logging/log4cxx/trunk/src/dailyrollingfileappender.cpp
logging/log4cxx/trunk/src/nameabbreviator.cpp
logging/log4cxx/trunk/src/patternparser.cpp
logging/log4cxx/trunk/tests/src/helpers/charsetencodertestcase.cpp

logging/log4cxx/trunk/tests/src/rolling/obsoletedailyrollingfileappendertest.cpp

Modified: logging/log4cxx/trunk/include/log4cxx/pattern/patternparser.h
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/pattern/patternparser.h?rev=422839&r1=422838&r2=422839&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/pattern/patternparser.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/pattern/patternparser.h Mon Jul 17 
13:26:24 2006
@@ -86,7 +86,7 @@
*/
   static int extractConverter(
 logchar lastChar, const LogString& pattern,
-int i, LogString& convBuf,
+LogString::size_type i, LogString& convBuf,
 LogString& currentLiteral);
 
   /**
@@ -96,7 +96,7 @@
* @param options array to receive extracted options
* @return position in pattern after options.
*/
-  static int extractOptions(const LogString& pattern, int i,
+  static int extractOptions(const LogString& pattern, LogString::size_type i,
  std::vector& options);
 
 public:

Modified: logging/log4cxx/trunk/src/dailyrollingfileappender.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/dailyrollingfileappender.cpp?rev=422839&r1=422838&r2=422839&view=diff
==
--- logging/log4cxx/trunk/src/dailyrollingfileappender.cpp (original)
+++ logging/log4cxx/trunk/src/dailyrollingfileappender.cpp Mon Jul 17 13:26:24 
2006
@@ -62,7 +62,7 @@
   bool inLiteral = false;
   bool inPattern = false;
 
-  for (int i = 0; i < datePattern.length(); i++) {
+  for (size_t i = 0; i < datePattern.length(); i++) {
 if (datePattern[i] == LOG4CXX_STR('\'')) {
   inLiteral = !inLiteral;
 

Modified: logging/log4cxx/trunk/src/nameabbreviator.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/nameabbreviator.cpp?rev=422839&r1=422838&r2=422839&view=diff
==
--- logging/log4cxx/trunk/src/nameabbreviator.cpp (original)
+++ logging/log4cxx/trunk/src/nameabbreviator.cpp Mon Jul 17 13:26:24 2006
@@ -111,7 +111,7 @@
 /**
  * Count of initial characters of element to output.
  */
-int charCount;
+LogString::size_type charCount;
 
 /**
  *  Character used to represent dropped characters.
@@ -266,7 +266,7 @@
   LogString::size_type pos = 0;
 
   while ((pos < trimmed.length()) && (pos >= 0)) {
-int ellipsisPos = pos;
+LogString::size_type ellipsisPos = pos;
 
 if (trimmed[pos] == LOG4CXX_STR('*')) {
   charCount = INT_MAX;

Modified: logging/log4cxx/trunk/src/patternparser.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/patternparser.cpp?rev=422839&r1=422838&r2=422839&view=diff
==
--- logging/log4cxx/trunk/src/patternparser.cpp (original)
+++ logging/log4cxx/trunk/src/patternparser.cpp Mon Jul 17 13:26:24 2006
@@ -55,9 +55,9 @@
 
 int PatternParser::extractConverter(
   logchar lastChar, const LogString& pattern,
-  int i, LogString& convBuf,
+  LogString::size_type i, LogString& convBuf,
   LogString& currentLiteral) {
-  if (!convBuf.empty()) { 
+  if (!convBuf.empty()) {
 convBuf.erase(convBuf.begin(), convBuf.end());
   }
 
@@ -86,7 +86,7 @@
 }
 
 
-int PatternParser::extractOptions(const LogString& pattern, int i,
+int PatternParser::extractOptions(const LogString& pattern, 
LogString::size_type i,
std::vector& options) {
   while ((i < pattern.length()) && (pattern[i] == LOG4CXX_STR('{'))) {
 int end = pattern.find(LOG4CXX_STR('}'), i);

Modified: logging/log4cxx/trunk/tests/src/helpers/charsetencodertestcase.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/helpers/charsetencodertestcase.cpp?rev=422839&r1=422838&r2=422839&view=diff
==
--- logging/log4cxx/trunk/tests/src/helpers/charsetencodertestcase.cpp 
(original)
+++ logging/log4cxx/trunk/tests/src/helpers/charsetencodertestcase.cpp Mon Jul 
17 13:26:24 2006
@@ -159,7 +159,7 @@
 
   out.fli

svn commit: r431200 - /logging/log4cxx/trunk/build.xml

[afester]

Author: afester
Date: Sun Aug 13 10:43:59 2006
New Revision: 431200

URL: http://svn.apache.org/viewvc?rev=431200&view=rev
Log:
LOGCXX-147: reflect removal of apr-util-1.2.2.patch in build.xml

Modified:
logging/log4cxx/trunk/build.xml

Modified: logging/log4cxx/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/build.xml?rev=431200&r1=431199&r2=431200&view=diff
==
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Sun Aug 13 10:43:59 2006
@@ -536,9 +536,6 @@
 
 
 
-
 
 

svn commit: r431216 - /logging/log4cxx/trunk/src/filterbasedtriggeringpolicy.cpp

[afester]

Author: afester
Date: Sun Aug 13 12:52:21 2006
New Revision: 431216

URL: http://svn.apache.org/viewvc?rev=431216&view=rev
Log:
LOGCXX-14: Added missing enumeration value in switch{} to 
allow gcc option -Wall

Modified:
logging/log4cxx/trunk/src/filterbasedtriggeringpolicy.cpp

Modified: logging/log4cxx/trunk/src/filterbasedtriggeringpolicy.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/filterbasedtriggeringpolicy.cpp?rev=431216&r1=431215&r2=431216&view=diff
==
--- logging/log4cxx/trunk/src/filterbasedtriggeringpolicy.cpp (original)
+++ logging/log4cxx/trunk/src/filterbasedtriggeringpolicy.cpp Sun Aug 13 
12:52:21 2006
@@ -47,6 +47,9 @@
 
   case Filter::ACCEPT:
  return true;
+
+  case Filter::NEUTRAL:
+ break;
 }
   }
   return true;

svn commit: r431218 - in /logging/log4cxx/trunk/src: hierarchy.cpp inetaddress.cpp obsoleterollingfileappender.cpp writerappender.cpp

[afester]

Author: afester
Date: Sun Aug 13 12:54:29 2006
New Revision: 431218

URL: http://svn.apache.org/viewvc?rev=431218&view=rev
Log:
LOGCXX-14: fixed initialization order of members (fix gcc warning
... is initialized before ...)

Modified:
logging/log4cxx/trunk/src/hierarchy.cpp
logging/log4cxx/trunk/src/inetaddress.cpp
logging/log4cxx/trunk/src/obsoleterollingfileappender.cpp
logging/log4cxx/trunk/src/writerappender.cpp

Modified: logging/log4cxx/trunk/src/hierarchy.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/hierarchy.cpp?rev=431218&r1=431217&r2=431218&view=diff
==
--- logging/log4cxx/trunk/src/hierarchy.cpp (original)
+++ logging/log4cxx/trunk/src/hierarchy.cpp Sun Aug 13 12:54:29 2006
@@ -40,8 +40,9 @@
 IMPLEMENT_LOG4CXX_OBJECT(Hierarchy)
 
 Hierarchy::Hierarchy(const LoggerPtr& root1) : root(root1),
+thresholdInt(Level::ALL_INT), threshold(Level::getAll()),
 emittedNoAppenderWarning(false), emittedNoResourceBundleWarning(false),
-mutex(), configured(false), thresholdInt(Level::ALL_INT), 
threshold(Level::getAll())
+mutex(), configured(false)
 {
 this->root->setHierarchy(this);
 defaultFactory = new DefaultCategoryFactory();

Modified: logging/log4cxx/trunk/src/inetaddress.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/inetaddress.cpp?rev=431218&r1=431217&r2=431218&view=diff
==
--- logging/log4cxx/trunk/src/inetaddress.cpp (original)
+++ logging/log4cxx/trunk/src/inetaddress.cpp Sun Aug 13 12:54:29 2006
@@ -42,7 +42,7 @@
 
 
 InetAddress::InetAddress(const LogString& hostName, const LogString& hostAddr) 
-: hostNameString(hostName), ipAddrString(hostAddr) {
+: ipAddrString(hostAddr), hostNameString(hostName) {
 }
 
 

Modified: logging/log4cxx/trunk/src/obsoleterollingfileappender.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/obsoleterollingfileappender.cpp?rev=431218&r1=431217&r2=431218&view=diff
==
--- logging/log4cxx/trunk/src/obsoleterollingfileappender.cpp (original)
+++ logging/log4cxx/trunk/src/obsoleterollingfileappender.cpp Sun Aug 13 
12:54:29 2006
@@ -39,17 +39,16 @@
 
 
 RollingFileAppender::RollingFileAppender()
-   : rfa(new log4cxx::rolling::RollingFileAppender()),
- maxFileSize(10*1024*1024), maxBackupIndex(1) {
+   : maxFileSize(10*1024*1024), maxBackupIndex(1),
+ rfa(new log4cxx::rolling::RollingFileAppender()) {
 }
 
 RollingFileAppender::RollingFileAppender(
   const LayoutPtr& layout,
   const LogString& filename,
   bool append)
-  : rfa(new log4cxx::rolling::RollingFileAppender()),
-  maxFileSize(10*1024*1024),
-  maxBackupIndex(1)  {
+  : maxFileSize(10*1024*1024), maxBackupIndex(1),
+rfa(new log4cxx::rolling::RollingFileAppender()) {
   rfa->setLayout(layout);
   rfa->setFile(filename);
   rfa->setAppend(append);
@@ -59,9 +58,8 @@
 
 RollingFileAppender::RollingFileAppender(const LayoutPtr& layout,
const LogString& filename)
-   : rfa(new log4cxx::rolling::RollingFileAppender()),
-   maxFileSize(10*1024*1024),
-   maxBackupIndex(1) {
+   : maxFileSize(10*1024*1024), maxBackupIndex(1),
+ rfa(new log4cxx::rolling::RollingFileAppender()) {
   rfa->setLayout(layout);
   rfa->setFile(filename);
   Pool pool;

Modified: logging/log4cxx/trunk/src/writerappender.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/writerappender.cpp?rev=431218&r1=431217&r2=431218&view=diff
==
--- logging/log4cxx/trunk/src/writerappender.cpp (original)
+++ logging/log4cxx/trunk/src/writerappender.cpp Sun Aug 13 12:54:29 2006
@@ -32,7 +32,7 @@
 
 WriterAppender::WriterAppender(const LayoutPtr& layout1,
log4cxx::helpers::WriterPtr& writer1)
-: AppenderSkeleton(layout1), writer(writer1), immediateFlush(true) {
+: AppenderSkeleton(layout1), immediateFlush(true), writer(writer1) {
   Pool p;
   activateOptions(p);
 }

svn commit: r431220 - /logging/log4cxx/trunk/include/log4cxx/rolling/fixedwindowrollingpolicy.h

[afester]

Author: afester
Date: Sun Aug 13 12:56:03 2006
New Revision: 431220

URL: http://svn.apache.org/viewvc?rev=431220&view=rev
Log:
LOGCXX-14: fixed initialization order of members (fix gcc warning
... is initialized before ...)

Modified:
logging/log4cxx/trunk/include/log4cxx/rolling/fixedwindowrollingpolicy.h

Modified: 
logging/log4cxx/trunk/include/log4cxx/rolling/fixedwindowrollingpolicy.h
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/rolling/fixedwindowrollingpolicy.h?rev=431220&r1=431219&r2=431220&view=diff
==
--- logging/log4cxx/trunk/include/log4cxx/rolling/fixedwindowrollingpolicy.h 
(original)
+++ logging/log4cxx/trunk/include/log4cxx/rolling/fixedwindowrollingpolicy.h 
Sun Aug 13 12:56:03 2006
@@ -72,8 +72,8 @@
   LOG4CXX_CAST_ENTRY_CHAIN(RollingPolicyBase)
   END_LOG4CXX_CAST_MAP()
 
-  int maxIndex;
   int minIndex;
+  int maxIndex;
   bool explicitActiveFile;
 
   /**

svn commit: r442313 - /logging/log4cxx/trunk/Makefile.am

[afester]

Author: afester
Date: Mon Sep 11 12:55:26 2006
New Revision: 442313

URL: http://svn.apache.org/viewvc?view=rev&rev=442313
Log:
LOGCXX-62: reflect removal of license.apl in Makefile.am

Modified:
logging/log4cxx/trunk/Makefile.am

Modified: logging/log4cxx/trunk/Makefile.am
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/Makefile.am?view=diff&rev=442313&r1=442312&r2=442313
==
--- logging/log4cxx/trunk/Makefile.am (original)
+++ logging/log4cxx/trunk/Makefile.am Mon Sep 11 12:55:26 2006
@@ -1,2 +1,2 @@
 SUBDIRS = docs src include simplesocketserver tests performance examples
-EXTRA_DIST = autogen.sh aclocal.m4 license.apl 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
+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

svn commit: r446836 - in /logging/log4cxx/trunk: COPYING configure.in

[afester]

Author: afester
Date: Sat Sep 16 01:55:51 2006
New Revision: 446836

URL: http://svn.apache.org/viewvc?view=rev&rev=446836
Log:
LOGCXX-62: Change version to 0.10.0, refer to LICENSE file instead of 
license.apl

Modified:
logging/log4cxx/trunk/COPYING
logging/log4cxx/trunk/configure.in

Modified: logging/log4cxx/trunk/COPYING
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/COPYING?view=diff&rev=446836&r1=446835&r2=446836
==
--- logging/log4cxx/trunk/COPYING (original)
+++ logging/log4cxx/trunk/COPYING Sat Sep 16 01:55:51 2006
@@ -1 +1 @@
-See license.apl
+See LICENSE

Modified: logging/log4cxx/trunk/configure.in
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/configure.in?view=diff&rev=446836&r1=446835&r2=446836
==
--- logging/log4cxx/trunk/configure.in (original)
+++ logging/log4cxx/trunk/configure.in Sat Sep 16 01:55:51 2006
@@ -14,7 +14,7 @@
 #  ? :+1 : ?   == just some internal changes, nothing breaks but might work
 # better
 # CURRENT : REVISION : AGE
-LT_VERSION=9:0:0
+LT_VERSION=10:0:0
 
 AC_SUBST(LT_VERSION)
 
@@ -22,7 +22,7 @@
 [/* no explicit exports */
 #define LOG4CXX_EXPORT])
 
-AM_INIT_AUTOMAKE(log4cxx, 0.9.8)
+AM_INIT_AUTOMAKE(log4cxx, 0.10.0)
 
 # Checks for programs
 # 

svn commit: r447530 - /logging/log4cxx/trunk/configure.in

[afester]

Author: afester
Date: Mon Sep 18 13:06:03 2006
New Revision: 447530

URL: http://svn.apache.org/viewvc?view=rev&rev=447530
Log:
LOGCXX-43: Added configure option --enable-wchar_t to allow manual
disabling of the wchar_t interfaces on systems which do not support
a __STDC_ISO_10646__ wchar_t implementation.

Modified:
logging/log4cxx/trunk/configure.in

Modified: logging/log4cxx/trunk/configure.in
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/configure.in?view=diff&rev=447530&r1=447529&r2=447530
==
--- logging/log4cxx/trunk/configure.in (original)
+++ logging/log4cxx/trunk/configure.in Mon Sep 18 13:06:03 2006
@@ -324,11 +324,18 @@
 CPPFLAGS="-DLOG4CXX $CPPFLAGS"
 
 #for wchar_t
-AC_MSG_CHECKING([for wchar_t])
-AC_COMPILE_IFELSE(AC_LANG_SOURCE([[
-   #include 
-   std::wstring w;]]), [have_wchar_t=yes], [have_wchar_t=no])
-AC_MSG_RESULT($have_wchar_t)
+AC_ARG_ENABLE(wchar_t,
+AC_HELP_STRING(--enable-wchar_t,
+   [enable wchar_t interfaces (auto)]))
+if test "x$enable_wchar_t" = xno; then
+have_wchar_t=no
+else
+AC_MSG_CHECKING([for wchar_t])
+AC_COMPILE_IFELSE(AC_LANG_SOURCE([[
+   #include 
+   std::wstring w;]]), [have_wchar_t=yes], [have_wchar_t=no])
+AC_MSG_RESULT($have_wchar_t)
+fi
 
 if test "$have_wchar_t" = "yes"
 then

svn commit: r464571 - in /logging/log4cxx/trunk/src: systemerrwriter.cpp systemoutwriter.cpp writerappender.cpp

[afester]

Author: afester
Date: Mon Oct 16 10:10:55 2006
New Revision: 464571

URL: http://svn.apache.org/viewvc?view=rev&rev=464571
Log:
LOGCXX-156: fix autoflushing for console appender

Modified:
logging/log4cxx/trunk/src/systemerrwriter.cpp
logging/log4cxx/trunk/src/systemoutwriter.cpp
logging/log4cxx/trunk/src/writerappender.cpp

Modified: logging/log4cxx/trunk/src/systemerrwriter.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/systemerrwriter.cpp?view=diff&rev=464571&r1=464570&r2=464571
==
--- logging/log4cxx/trunk/src/systemerrwriter.cpp (original)
+++ logging/log4cxx/trunk/src/systemerrwriter.cpp Mon Oct 16 10:10:55 2006
@@ -34,6 +34,7 @@
 }
 
 void SystemErrWriter::flush(Pool& /* p */) {
+fflush(stderr);
 }
 
 void SystemErrWriter::write(const LogString& str, Pool& /* p */) {

Modified: logging/log4cxx/trunk/src/systemoutwriter.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/systemoutwriter.cpp?view=diff&rev=464571&r1=464570&r2=464571
==
--- logging/log4cxx/trunk/src/systemoutwriter.cpp (original)
+++ logging/log4cxx/trunk/src/systemoutwriter.cpp Mon Oct 16 10:10:55 2006
@@ -35,6 +35,7 @@
 }
 
 void SystemOutWriter::flush(Pool& /* p */ ) {
+fflush(stdout);
 }
 
 void SystemOutWriter::write(const LogString& str, Pool& /* p */ ) {

Modified: logging/log4cxx/trunk/src/writerappender.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/writerappender.cpp?view=diff&rev=464571&r1=464570&r2=464571
==
--- logging/log4cxx/trunk/src/writerappender.cpp (original)
+++ logging/log4cxx/trunk/src/writerappender.cpp Mon Oct 16 10:10:55 2006
@@ -197,6 +197,9 @@
 LogString msg;
 layout->format(msg, event, p);
 writer->write(msg, p);
+if (immediateFlush) {
+   writer->flush(p);
+}
 }
 
 

svn commit: r465160 - in /logging/log4cxx/trunk: configure.in docs/Makefile.am

[afester]

Author: afester
Date: Tue Oct 17 23:51:44 2006
New Revision: 465160

URL: http://svn.apache.org/viewvc?view=rev&rev=465160
Log:
LOGCXX-157: added @manual_dest@ replacement variable to autoconf based build

Modified:
logging/log4cxx/trunk/configure.in
logging/log4cxx/trunk/docs/Makefile.am

Modified: logging/log4cxx/trunk/configure.in
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/configure.in?view=diff&rev=465160&r1=465159&r2=465160
==
--- logging/log4cxx/trunk/configure.in (original)
+++ logging/log4cxx/trunk/configure.in Tue Oct 17 23:51:44 2006
@@ -92,9 +92,13 @@
 else
 enable_dot=yes
 fi
+
+manual_dest="manual"
+
 AC_SUBST(enable_dot)
 AC_SUBST(enable_html_docs)
 AC_SUBST(enable_latex_docs)
+AC_SUBST(manual_dest)
 
 # CppUnit
 

Modified: logging/log4cxx/trunk/docs/Makefile.am
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/docs/Makefile.am?view=diff&rev=465160&r1=465159&r2=465160
==
--- logging/log4cxx/trunk/docs/Makefile.am (original)
+++ logging/log4cxx/trunk/docs/Makefile.am Tue Oct 17 23:51:44 2006
@@ -6,18 +6,17 @@
 if DOC
 
 htmldir = $(pkgdatadir)/html
-#html_DATA = html/index.html
 
 install-data-hook:
$(mkinstalldirs) $(DESTDIR)$(htmldir)
-   cp -dpR html/* $(DESTDIR)$(htmldir)
+   cp -dpR @manual_dest@/* $(DESTDIR)$(htmldir)
 
 # Automake's "distcheck" is sensitive to having files left over
 # after "make uninstall", so we have to clean up the install hook.
 uninstall-local:
rm -rf $(DESTDIR)$(htmldir)
 
-dox: html/index.html
+dox: @manual_dest@/index.html
 
 if LATEX_DOC
 
@@ -47,7 +46,7 @@
 all-local: dox
 
 
-html/index.html: Doxyfile introduction.dox mainpage.dox
[EMAIL PROTECTED]@/index.html: Doxyfile introduction.dox mainpage.dox
"@DOXYGEN@"
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)
@@ -58,14 +57,14 @@
mkdir $(distdir)
mkdir $(distdir)/docs
mkdir $(distdir)/docs/html
-   cp html/* $(distdir)/docs/html
+   cp @manual_dest@/* $(distdir)/docs/html
tar -czf $(top_builddir)/$(PACKAGE)-docs-$(VERSION).tar.gz -C 
$(distdir) docs
rm -rf $(distdir)
 
 
 clean-local:
$(RM) -r latex
-   $(RM) -r html man @[EMAIL PROTECTED] @[EMAIL PROTECTED]
+   $(RM) -r @manual_dest@ man @[EMAIL PROTECTED] @[EMAIL PROTECTED]
 
 dist-hook:
-rm -f $(distdir)/Doxyfile

svn commit: r493846 - /logging/log4cxx/trunk/src/charsetdecoder.cpp

[afester]

Author: afester
Date: Sun Jan  7 13:22:42 2007
New Revision: 493846

URL: http://svn.apache.org/viewvc?view=rev&rev=493846
Log:
LOGCXX-162: cast-tweak to fix compilation on gcc-3.3

Modified:
logging/log4cxx/trunk/src/charsetdecoder.cpp

Modified: logging/log4cxx/trunk/src/charsetdecoder.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/charsetdecoder.cpp?view=diff&rev=493846&r1=493845&r2=493846
==
--- logging/log4cxx/trunk/src/charsetdecoder.cpp (original)
+++ logging/log4cxx/trunk/src/charsetdecoder.cpp Sun Jan  7 13:22:42 2007
@@ -182,7 +182,7 @@
   memset(buf, 0, BUFSIZE*sizeof(wchar_t));
   const char* src = in.current();
   if(*src == 0) {
-   out.append(1, 0);
+   out.append(1, (logchar) 0);
in.position(in.position() + 1);
   } else {
size_t converted = mbsrtowcs(buf,

svn commit: r493850 - /logging/log4cxx/trunk/tests/src/net/socketservertestcase.cpp

[afester]

Author: afester
Date: Sun Jan  7 13:27:47 2007
New Revision: 493850

URL: http://svn.apache.org/viewvc?view=rev&rev=493850
Log:
LOGCXX-14: fixed "missing sentinel in function call" error
when pedantic warnings are enabled

Modified:
logging/log4cxx/trunk/tests/src/net/socketservertestcase.cpp

Modified: logging/log4cxx/trunk/tests/src/net/socketservertestcase.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/net/socketservertestcase.cpp?view=diff&rev=493850&r1=493849&r2=493850
==
--- logging/log4cxx/trunk/tests/src/net/socketservertestcase.cpp (original)
+++ logging/log4cxx/trunk/tests/src/net/socketservertestcase.cpp Sun Jan  7 
13:27:47 2007
@@ -115,7 +115,7 @@
 if(!::fork())
 {
 ::execl("src/shortsocketserver", 
"shortsocketserver",
-"8", "input/socketServer", 0);
+"8", "input/socketServer", NULL);
 ::perror("execl() failed");
 ::exit(1);
 }

svn commit: r493847 - /logging/log4cxx/trunk/src/loggingevent.cpp

[afester]

Author: afester
Date: Sun Jan  7 13:25:01 2007
New Revision: 493847

URL: http://svn.apache.org/viewvc?view=rev&rev=493847
Log:
LOGCXX-140: cast-tweak to fix compilation failure with gcc-3.3 
when pedantic warnings are enables (see also LOGCXX-14)

Modified:
logging/log4cxx/trunk/src/loggingevent.cpp

Modified: logging/log4cxx/trunk/src/loggingevent.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/loggingevent.cpp?view=diff&rev=493847&r1=493846&r2=493847
==
--- logging/log4cxx/trunk/src/loggingevent.cpp (original)
+++ logging/log4cxx/trunk/src/loggingevent.cpp Sun Jan  7 13:25:01 2007
@@ -204,7 +204,7 @@
char result[sizeof(apr_os_thread_t) * 2 + 10];
result[0] = '0';
result[1] = 'x';   apr_os_thread_t threadId = apr_os_thread_current();
-   apr_snprintf(result+2, (sizeof result) - 2, "%pt", &threadId);
+   apr_snprintf(result+2, (sizeof result) - 2, "%pt", (void*) &threadId);
 #endif
LOG4CXX_DECODE_CHAR(str, (const char*) result);
return str;

svn commit: r494188 - in /logging/log4cxx/trunk: include/log4cxx/simplelayout.h performance/nullappender.cpp src/literalpatternconverter.cpp tests/src/rolling/sizebasedrollingtest.cpp

[afester]

Author: afester
Date: Mon Jan  8 12:30:29 2007
New Revision: 494188

URL: http://svn.apache.org/viewvc?view=rev&rev=494188
Log:
LOGCXX-14: some more "unused parameter" warnings

Modified:
logging/log4cxx/trunk/include/log4cxx/simplelayout.h
logging/log4cxx/trunk/performance/nullappender.cpp
logging/log4cxx/trunk/src/literalpatternconverter.cpp
logging/log4cxx/trunk/tests/src/rolling/sizebasedrollingtest.cpp

Modified: logging/log4cxx/trunk/include/log4cxx/simplelayout.h
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/simplelayout.h?view=diff&rev=494188&r1=494187&r2=494188
==
--- logging/log4cxx/trunk/include/log4cxx/simplelayout.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/simplelayout.h Mon Jan  8 12:30:29 
2007
@@ -66,9 +66,9 @@
 */
 bool ignoresThrowable() const { return true; }
 
-virtual void activateOptions(log4cxx::helpers::Pool& p) {}
-virtual void setOption(const LogString& option,
- const LogString& value) {}
+virtual void activateOptions(log4cxx::helpers::Pool& /* p */) 
{}
+virtual void setOption(const LogString& /* option */,
+ const LogString& /* value */) {}
 };
 }  // namespace log4cxx
 

Modified: logging/log4cxx/trunk/performance/nullappender.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/performance/nullappender.cpp?view=diff&rev=494188&r1=494187&r2=494188
==
--- logging/log4cxx/trunk/performance/nullappender.cpp (original)
+++ logging/log4cxx/trunk/performance/nullappender.cpp Mon Jan  8 12:30:29 2007
@@ -45,7 +45,7 @@
 }
 }
 
-void NullAppender::append(const LoggingEventPtr& event, Pool& p)
+void NullAppender::append(const LoggingEventPtr& /* event */, Pool& /*p*/)
 {
 }
 

Modified: logging/log4cxx/trunk/src/literalpatternconverter.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/literalpatternconverter.cpp?view=diff&rev=494188&r1=494187&r2=494188
==
--- logging/log4cxx/trunk/src/literalpatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/literalpatternconverter.cpp Mon Jan  8 12:30:29 
2007
@@ -43,16 +43,16 @@
 }
 
 void LiteralPatternConverter::format(
-  const LoggingEventPtr& event,
+  const LoggingEventPtr& /* event */,
   LogString& toAppendTo,
-  Pool& p) const {
+  Pool& /* p */) const {
   toAppendTo.append(literal);
  }
 
 void LiteralPatternConverter::format(
-  const ObjectPtr& event,
+  const ObjectPtr& /* event */,
   LogString& toAppendTo,
-  Pool& p) const {
+  Pool& /* p */)  const {
   toAppendTo.append(literal);
  }
 

Modified: logging/log4cxx/trunk/tests/src/rolling/sizebasedrollingtest.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/rolling/sizebasedrollingtest.cpp?view=diff&rev=494188&r1=494187&r2=494188
==
--- logging/log4cxx/trunk/tests/src/rolling/sizebasedrollingtest.cpp (original)
+++ logging/log4cxx/trunk/tests/src/rolling/sizebasedrollingtest.cpp Mon Jan  8 
12:30:29 2007
@@ -75,7 +75,7 @@
 LogManager::shutdown();
   }
 
-  void common(LoggerPtr& logger1, int sleep) {
+  void common(LoggerPtr& logger1, int /*sleep*/) {
 char msg[] = { 'H', 'e', 'l', 'l', 'o', '-', '-', '-', 'N', 0 };
 
 // Write exactly 10 bytes with each log

svn commit: r494555 - in /logging/log4cxx/trunk: include/log4cxx/private/ src/ tests/src/helpers/ tests/src/net/ tests/src/xml/

[afester]

Author: afester
Date: Tue Jan  9 12:20:20 2007
New Revision: 494555

URL: http://svn.apache.org/viewvc?view=rev&rev=494555
Log:
LOGCXX-14: make sure that macros which are tested with #if are always 
defined (either 0 or 1), otherwise compilation fails when pedantic 
warnings are enabled.

Modified:
logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.h.in
logging/log4cxx/trunk/src/charsetdecoder.cpp
logging/log4cxx/trunk/src/charsetencoder.cpp
logging/log4cxx/trunk/src/systemerrwriter.cpp
logging/log4cxx/trunk/src/systemoutwriter.cpp
logging/log4cxx/trunk/tests/src/helpers/iso8601dateformattestcase.cpp
logging/log4cxx/trunk/tests/src/net/smtpappendertestcase.cpp
logging/log4cxx/trunk/tests/src/xml/xmllayouttestcase.cpp

Modified: logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.h.in
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.h.in?view=diff&rev=494555&r1=494554&r2=494555
==
--- logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.h.in 
(original)
+++ logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.h.in Tue Jan  
9 12:20:20 2007
@@ -38,6 +38,7 @@
 
 #define LOG4CXX_HAS_STD_WCOUT 1
 #define LOG4CXX_HAS_STD_WLOCALE 1
+#define LOG4CXX_FORCE_WIDE_CONSOLE 0
 
 typedef long long log4cxx_int64_t;
 typedef log4cxx_int64_t log4cxx_time_t;

Modified: logging/log4cxx/trunk/src/charsetdecoder.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/charsetdecoder.cpp?view=diff&rev=494555&r1=494554&r2=494555
==
--- logging/log4cxx/trunk/src/charsetdecoder.cpp (original)
+++ logging/log4cxx/trunk/src/charsetdecoder.cpp Tue Jan  9 12:20:20 2007
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
 using namespace log4cxx;

Modified: logging/log4cxx/trunk/src/charsetencoder.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/charsetencoder.cpp?view=diff&rev=494555&r1=494554&r2=494555
==
--- logging/log4cxx/trunk/src/charsetencoder.cpp (original)
+++ logging/log4cxx/trunk/src/charsetencoder.cpp Tue Jan  9 12:20:20 2007
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
 using namespace log4cxx;

Modified: logging/log4cxx/trunk/src/systemerrwriter.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/systemerrwriter.cpp?view=diff&rev=494555&r1=494554&r2=494555
==
--- logging/log4cxx/trunk/src/systemerrwriter.cpp (original)
+++ logging/log4cxx/trunk/src/systemerrwriter.cpp Tue Jan  9 12:20:20 2007
@@ -18,6 +18,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace log4cxx;
 using namespace log4cxx::helpers;

Modified: logging/log4cxx/trunk/src/systemoutwriter.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/systemoutwriter.cpp?view=diff&rev=494555&r1=494554&r2=494555
==
--- logging/log4cxx/trunk/src/systemoutwriter.cpp (original)
+++ logging/log4cxx/trunk/src/systemoutwriter.cpp Tue Jan  9 12:20:20 2007
@@ -18,6 +18,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace log4cxx;
 using namespace log4cxx::helpers;

Modified: logging/log4cxx/trunk/tests/src/helpers/iso8601dateformattestcase.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/helpers/iso8601dateformattestcase.cpp?view=diff&rev=494555&r1=494554&r2=494555
==
--- logging/log4cxx/trunk/tests/src/helpers/iso8601dateformattestcase.cpp 
(original)
+++ logging/log4cxx/trunk/tests/src/helpers/iso8601dateformattestcase.cpp Tue 
Jan  9 12:20:20 2007
@@ -16,6 +16,7 @@
 #include 
 #include 
 #include 
+#include 
 #if LOG4CXX_HAS_STD_LOCALE
 #include 
 #endif

Modified: logging/log4cxx/trunk/tests/src/net/smtpappendertestcase.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/net/smtpappendertestcase.cpp?view=diff&rev=494555&r1=494554&r2=494555
==
--- logging/log4cxx/trunk/tests/src/net/smtpappendertestcase.cpp (original)
+++ logging/log4cxx/trunk/tests/src/net/smtpappendertestcase.cpp Tue Jan  9 
12:20:20 2007
@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
+#define LOG4CXX_TEST 1
+#include 
+
 #if LOG4CXX_HAVE_SMTP
 
 #include 
 #include 
 #include 
 #include "../appenderskeletontestcase.h"
-
-#define LOG4CXX_TEST 1
-#include 
-
 
 using namespace log4cxx;
 using namespace log4cxx::helpers;

Modified: logging/log4cxx/trunk/tests/src/xml/xmllayouttestcase.cpp
URL: 
http://sv

svn commit: r494563 - /logging/log4cxx/trunk/src/exception.cpp

[afester]

Author: afester
Date: Tue Jan  9 12:40:28 2007
New Revision: 494563

URL: http://svn.apache.org/viewvc?view=rev&rev=494563
Log:
LOGCXX-14: fix 'std::exception' should be explicitly initialized in the 
copy constructor

Modified:
logging/log4cxx/trunk/src/exception.cpp

Modified: logging/log4cxx/trunk/src/exception.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/exception.cpp?view=diff&rev=494563&r1=494562&r2=494563
==
--- logging/log4cxx/trunk/src/exception.cpp (original)
+++ logging/log4cxx/trunk/src/exception.cpp Tue Jan  9 12:40:28 2007
@@ -32,7 +32,7 @@
   this->msg[msgLen] = 0;
 }
 
-Exception::Exception(const Exception& src) {
+Exception::Exception(const Exception& src) : std::exception() {
 #if defined(__STDC_LIB_EXT1__) || defined(__STDC_SECURE_LIB__)
   strcpy_s(msg, sizeof msg, src.msg);
 #else

svn commit: r495844 - in /logging/log4cxx/trunk/src: action.cpp appenderskeleton.cpp filerenameaction.cpp writerappender.cpp

[afester]

Author: afester
Date: Fri Jan 12 22:45:42 2007
New Revision: 495844

URL: http://svn.apache.org/viewvc?view=rev&rev=495844
Log:
LOGCXX-14: fixed "parameter shaddows member" warnings

Modified:
logging/log4cxx/trunk/src/action.cpp
logging/log4cxx/trunk/src/appenderskeleton.cpp
logging/log4cxx/trunk/src/filerenameaction.cpp
logging/log4cxx/trunk/src/writerappender.cpp

Modified: logging/log4cxx/trunk/src/action.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/action.cpp?view=diff&rev=495844&r1=495843&r2=495844
==
--- logging/log4cxx/trunk/src/action.cpp (original)
+++ logging/log4cxx/trunk/src/action.cpp Fri Jan 12 22:45:42 2007
@@ -37,11 +37,11 @@
 /**
  * [EMAIL PROTECTED]
  */
-void Action::run(log4cxx::helpers::Pool& pool) {
+void Action::run(log4cxx::helpers::Pool& pool1) {
   synchronized sync(mutex);
   if (!interrupted) {
   try {
- execute(pool);
+ execute(pool1);
   } catch(std::exception& ex) {
  reportException(ex);
   }

Modified: logging/log4cxx/trunk/src/appenderskeleton.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/appenderskeleton.cpp?view=diff&rev=495844&r1=495843&r2=495844
==
--- logging/log4cxx/trunk/src/appenderskeleton.cpp (original)
+++ logging/log4cxx/trunk/src/appenderskeleton.cpp Fri Jan 12 22:45:42 2007
@@ -91,7 +91,7 @@
 return ((level == 0) || level->isGreaterOrEqual(threshold));
 }
 
-void AppenderSkeleton::doAppend(const spi::LoggingEventPtr& event, Pool& pool)
+void AppenderSkeleton::doAppend(const spi::LoggingEventPtr& event, Pool& pool1)
 {
 synchronized sync(mutex);
 
@@ -125,7 +125,7 @@
  }
 }
 
-append(event, pool);
+append(event, pool1);
 }
 
 void AppenderSkeleton::setErrorHandler(const spi::ErrorHandlerPtr& 
errorHandler1)

Modified: logging/log4cxx/trunk/src/filerenameaction.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/filerenameaction.cpp?view=diff&rev=495844&r1=495843&r2=495844
==
--- logging/log4cxx/trunk/src/filerenameaction.cpp (original)
+++ logging/log4cxx/trunk/src/filerenameaction.cpp Fri Jan 12 22:45:42 2007
@@ -30,6 +30,6 @@
: source(toRename), destination(renameTo), 
renameEmptyFile(renameEmptyFile1) {
 }
 
-bool FileRenameAction::execute(log4cxx::helpers::Pool& pool) const {
-  return source.renameTo(destination, pool);
+bool FileRenameAction::execute(log4cxx::helpers::Pool& pool1) const {
+  return source.renameTo(destination, pool1);
 }

Modified: logging/log4cxx/trunk/src/writerappender.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/writerappender.cpp?view=diff&rev=495844&r1=495843&r2=495844
==
--- logging/log4cxx/trunk/src/writerappender.cpp (original)
+++ logging/log4cxx/trunk/src/writerappender.cpp Fri Jan 12 22:45:42 2007
@@ -72,7 +72,7 @@
 
 
 
-void WriterAppender::append(const spi::LoggingEventPtr& event, Pool& pool)
+void WriterAppender::append(const spi::LoggingEventPtr& event, Pool& pool1)
 {
 
 if(!checkEntryConditions())
@@ -80,7 +80,7 @@
 return;
 }
 
-subAppend(event, pool);
+subAppend(event, pool1);
 }
 
 /**

svn commit: r495845 - in /logging/log4cxx/trunk/src: bytebuffer.cpp nameabbreviator.cpp

[afester]

Author: afester
Date: Fri Jan 12 22:46:32 2007
New Revision: 495845

URL: http://svn.apache.org/viewvc?view=rev&rev=495845
Log:
LOGCXX-14: fixed "expression always true" warnings

Modified:
logging/log4cxx/trunk/src/bytebuffer.cpp
logging/log4cxx/trunk/src/nameabbreviator.cpp

Modified: logging/log4cxx/trunk/src/bytebuffer.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/bytebuffer.cpp?view=diff&rev=495845&r1=495844&r2=495845
==
--- logging/log4cxx/trunk/src/bytebuffer.cpp (original)
+++ logging/log4cxx/trunk/src/bytebuffer.cpp Fri Jan 12 22:46:32 2007
@@ -49,7 +49,7 @@
 }
 
 void ByteBuffer::limit(size_t newLimit) {
-  if (newLimit < 0 || newLimit > cap) {
+  if (newLimit > cap) {
 throw IllegalArgumentException("newLimit");
   }
   lim = newLimit;

Modified: logging/log4cxx/trunk/src/nameabbreviator.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/nameabbreviator.cpp?view=diff&rev=495845&r1=495844&r2=495845
==
--- logging/log4cxx/trunk/src/nameabbreviator.cpp (original)
+++ logging/log4cxx/trunk/src/nameabbreviator.cpp Fri Jan 12 22:46:32 2007
@@ -222,7 +222,7 @@
   PatternAbbreviatorFragment terminalFragment =
 fragments[fragments.size() - 1];
 
-  while ((pos < buf.length()) && (pos >= 0)) {
+  while (pos < buf.length()) {
 pos = terminalFragment.abbreviate(buf, pos);
   }
 }
@@ -266,7 +266,7 @@
   int charCount;
   LogString::size_type pos = 0;
 
-  while ((pos < trimmed.length()) && (pos >= 0)) {
+  while (pos < trimmed.length()) {
 LogString::size_type ellipsisPos = pos;
 
 if (trimmed[pos] == LOG4CXX_STR('*')) {

svn commit: r495943 - in /logging/log4cxx/trunk: include/log4cxx/spi/loggingevent.h src/loggingevent.cpp

[afester]

Author: afester
Date: Sat Jan 13 10:55:38 2007
New Revision: 495943

URL: http://svn.apache.org/viewvc?view=rev&rev=495943
Log:
LOGCXX-14: removed const to non-const casts

Modified:
logging/log4cxx/trunk/include/log4cxx/spi/loggingevent.h
logging/log4cxx/trunk/src/loggingevent.cpp

Modified: logging/log4cxx/trunk/include/log4cxx/spi/loggingevent.h
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/spi/loggingevent.h?view=diff&rev=495943&r1=495942&r2=495943
==
--- logging/log4cxx/trunk/include/log4cxx/spi/loggingevent.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/spi/loggingevent.h Sat Jan 13 
10:55:38 2007
@@ -206,10 +206,10 @@
 LevelPtr level;
 
 /** The nested diagnostic context (NDC) of logging 
event. */
-LogString ndc;
+mutable LogString ndc;
 
 /** The mapped diagnostic context (MDC) of logging 
event. */
-MDC::Map mdcCopy;
+mutable MDC::Map mdcCopy;
 
 /**
 * A map of String keys and String values.
@@ -221,14 +221,14 @@
 *  serialized. Thus, a receiving SocketNode will never 
use it's own
 *  (incorrect) NDC. See also writeObject method.
 */
-bool ndcLookupRequired;
+mutable bool ndcLookupRequired;
 
 /**
 * Have we tried to do an MDC lookup? If we did, there 
is no need to do it
 * again.  Note that its value is always false when 
serialized. See also
 * the getMDC and getMDCCopy methods.
 */
-bool mdcCopyLookupRequired;
+mutable bool mdcCopyLookupRequired;
 
 /** The application supplied message of logging event. 
*/
 LogString message;

Modified: logging/log4cxx/trunk/src/loggingevent.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/loggingevent.cpp?view=diff&rev=495943&r1=495942&r2=495943
==
--- logging/log4cxx/trunk/src/loggingevent.cpp (original)
+++ logging/log4cxx/trunk/src/loggingevent.cpp Sat Jan 13 10:55:38 2007
@@ -89,8 +89,8 @@
 {
 if(ndcLookupRequired)
 {
-((LoggingEvent *)this)->ndcLookupRequired = false;
-((LoggingEvent *)this)->ndc = NDC::get();
+ndcLookupRequired = false;
+ndc = NDC::get();
 }
 
 return ndc;
@@ -148,9 +148,9 @@
 {
 if(mdcCopyLookupRequired)
 {
-((LoggingEvent *)this)->mdcCopyLookupRequired = false;
+mdcCopyLookupRequired = false;
 // the clone call is required for asynchronous logging.
-((LoggingEvent *)this)->mdcCopy = 
ThreadSpecificData::getCurrentThreadMap();
+mdcCopy = ThreadSpecificData::getCurrentThreadMap();
 }
 }
 

svn commit: r524236 - /logging/log4cxx/trunk/examples/console.cpp

[afester]

Author: afester
Date: Fri Mar 30 12:08:29 2007
New Revision: 524236

URL: http://svn.apache.org/viewvc?view=rev&rev=524236
Log:
LOGCXX-126: fix build failure of console.cpp on systems with no wchar_t support

Modified:
logging/log4cxx/trunk/examples/console.cpp

Modified: logging/log4cxx/trunk/examples/console.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/examples/console.cpp?view=diff&rev=524236&r1=524235&r2=524236
==
--- logging/log4cxx/trunk/examples/console.cpp (original)
+++ logging/log4cxx/trunk/examples/console.cpp Fri Mar 30 12:08:29 2007
@@ -72,9 +72,17 @@
 }
 } else if (strcmp("wcout", argv[i]) == 0) {
 if (err) {
+#if LOG4CXX_HAS_STD_WCOUT
 std::wcerr << L"Hello, wcout" << std::endl;
+#else
+std::cerr << "Log4cxx has not wcout" << std::endl;
+#endif
 } else {
+#if LOG4CXX_HAS_STD_WCOUT
 std::wcout << L"Hello, wcout" << std::endl;
+#else
+std::cout << "Log4cxx has not wcout" << std::endl;
+#endif
 }
 } else if (strcmp("configure", argv[i]) == 0) {
 configure(err);

svn commit: r537449 - /logging/log4cxx/trunk/src/unicodehelper.cpp

[afester]

Author: afester
Date: Sat May 12 07:54:52 2007
New Revision: 537449

URL: http://svn.apache.org/viewvc?view=rev&rev=537449
Log:
LOGCXX-178: In case of __STDC_ISO_10646__, removed unused 
variable to avoid build failure with pedantic errors, and
fixed undefined variables

Modified:
logging/log4cxx/trunk/src/unicodehelper.cpp

Modified: logging/log4cxx/trunk/src/unicodehelper.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/unicodehelper.cpp?view=diff&rev=537449&r1=537448&r2=537449
==
--- logging/log4cxx/trunk/src/unicodehelper.cpp (original)
+++ logging/log4cxx/trunk/src/unicodehelper.cpp Sat May 12 07:54:52 2007
@@ -165,11 +165,12 @@
 #if LOG4CXX_LOGCHAR_IS_WCHAR
 unsigned int UnicodeHelper::decode(const LogString& in, 
LogString::const_iterator& iter) {
 const wchar_t* src = in.data() + (iter - in.begin());
-const wchar_t* srcEnd = in.data() + in.length();
 #if defined(__STDC_ISO_10646__)
 unsigned int sv = *(src++);
 #elif defined(_WIN32)
+const wchar_t* srcEnd = in.data() + in.length();
 unsigned int sv = *(src++);
+
 if (!(sv < 0xDC00 || sv >= 0xDC00)) {
if (src < srcEnd) {
unsigned short ls = *(src++);
@@ -215,7 +216,7 @@
   return 2;
 }
 #elif defined(__STDC_ISO_10646__)
-int UnicodeHelper::encode(unsigned int sv, logchar* out) {
+int UnicodeHelper::encode(unsigned int ch, logchar* dst) {
*dst = ch;
return 1;
 }

svn commit: r537476 - in /logging/log4cxx/trunk: build.xml configure.in include/log4cxx/log4cxx.h.in include/log4cxx/log4cxx.hw include/log4cxx/private/log4cxx_private.h.in include/log4cxx/private/log

[afester]

Author: afester
Date: Sat May 12 09:09:52 2007
New Revision: 537476

URL: http://svn.apache.org/viewvc?view=rev&rev=537476
Log:
LOGCXX-126: fix build failure of console.cpp on systems with no wchar_t support,
removed hard coded HAS_STD_WCOUT.

Modified:
logging/log4cxx/trunk/build.xml
logging/log4cxx/trunk/configure.in
logging/log4cxx/trunk/include/log4cxx/log4cxx.h.in
logging/log4cxx/trunk/include/log4cxx/log4cxx.hw
logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.h.in
logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.hw

Modified: logging/log4cxx/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/build.xml?view=diff&rev=537476&r1=537475&r2=537476
==
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Sat May 12 09:09:52 2007
@@ -65,6 +65,7 @@
 
 
 
+
 
 http://archive.apache.org/dist"/>
 http://easynews.dl.sourceforge.net/sourceforge"/>
@@ -143,6 +144,7 @@
 -Dapr.dir=PATH
 -Daprutil.dir=PATH
 -Dhas.wchar_t=[0|1] (default=1)
+-Dhas.wcout=[0|1] (default=1)
 -Dlogchar=[utf-8|wchar_t|cfstring] (default=wchar_t)
 
 
@@ -440,6 +442,7 @@
   unix-configure,
   win-configure">
 
+
 
 
 
@@ -472,6 +475,10 @@
 
+
+
 
 

svn commit: r537903 - in /logging/log4cxx/trunk: src/ tests/src/helpers/

[afester]

Author: afester
Date: Mon May 14 09:40:32 2007
New Revision: 537903

URL: http://svn.apache.org/viewvc?view=rev&rev=537903
Log:
LOGCXX-14: necessary casts to avoid range overflow warning


Modified:
logging/log4cxx/trunk/src/fileappender.cpp
logging/log4cxx/trunk/src/unicodehelper.cpp
logging/log4cxx/trunk/tests/src/helpers/charsetdecodertestcase.cpp
logging/log4cxx/trunk/tests/src/helpers/charsetencodertestcase.cpp
logging/log4cxx/trunk/tests/src/helpers/transcodertestcase.cpp
logging/log4cxx/trunk/tests/src/helpers/unicodehelpertestcase.cpp

Modified: logging/log4cxx/trunk/src/fileappender.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/fileappender.cpp?view=diff&rev=537903&r1=537902&r2=537903
==
--- logging/log4cxx/trunk/src/fileappender.cpp (original)
+++ logging/log4cxx/trunk/src/fileappender.cpp Mon May 14 09:40:32 2007
@@ -236,7 +236,7 @@
   //   if a new file and UTF-16, then write a BOM
   //
   if (writeBOM) {
-  char bom[] = { 0xFE, 0xFF };
+  char bom[] = { (char) 0xFE, (char) 0xFF };
   ByteBuffer buf(bom, 2);
   outStream->write(buf, p);
   }

Modified: logging/log4cxx/trunk/src/unicodehelper.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/unicodehelper.cpp?view=diff&rev=537903&r1=537902&r2=537903
==
--- logging/log4cxx/trunk/src/unicodehelper.cpp (original)
+++ logging/log4cxx/trunk/src/unicodehelper.cpp Mon May 14 09:40:32 2007
@@ -117,9 +117,9 @@
 //
 //  output UTF-8 encoding of 0x
 //
-dst[0] = 0xEF;
-dst[1] = 0xBF;
-dst[2] = 0xBF;
+dst[0] = (char) 0xEF;
+dst[1] = (char) 0xBF;
+dst[2] = (char) 0xBF;
 return 3;
 }
 }
@@ -140,7 +140,7 @@
 dst[3] = (char) (ch & 0xFF);
 return 4;
 }
-dst[0] = dst[1] = 0xFF;
+dst[0] = dst[1] = (char) 0xFF;
 return 2;
 }
 
@@ -158,7 +158,7 @@
 dst[2] = (char) (ch & 0xFF);
 return 4;
 }
-dst[0] = dst[1] = 0xFF;
+dst[0] = dst[1] = (char) 0xFF;
 return 2;
 }
 

Modified: logging/log4cxx/trunk/tests/src/helpers/charsetdecodertestcase.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/helpers/charsetdecodertestcase.cpp?view=diff&rev=537903&r1=537902&r2=537903
==
--- logging/log4cxx/trunk/tests/src/helpers/charsetdecodertestcase.cpp 
(original)
+++ logging/log4cxx/trunk/tests/src/helpers/charsetdecodertestcase.cpp Mon May 
14 09:40:32 2007
@@ -149,11 +149,11 @@
 
 #if LOG4CXX_LOGCHAR_IS_UTF8
   const logchar greet[] = { 'A',
-0xD8, 0x85,
-0xD4, 0xB0,
-0xE0, 0xA6, 0x86,
-0xE4, 0xB8, 0x83,
-0xD0, 0x80,
+(char) 0xD8, (char) 0x85,
+(char) 0xD4, (char) 0xB0,
+(char) 0xE0, (char) 0xA6, (char) 0x86,
+(char) 0xE4, (char) 0xB8, (char) 0x83,
+(char) 0xD0, (char) 0x80,
 0 };
 
 #endif

Modified: logging/log4cxx/trunk/tests/src/helpers/charsetencodertestcase.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/helpers/charsetencodertestcase.cpp?view=diff&rev=537903&r1=537902&r2=537903
==
--- logging/log4cxx/trunk/tests/src/helpers/charsetencodertestcase.cpp 
(original)
+++ logging/log4cxx/trunk/tests/src/helpers/charsetencodertestcase.cpp Mon May 
14 09:40:32 2007
@@ -105,11 +105,11 @@
 
 #if LOG4CXX_LOGCHAR_IS_UTF8
   const char greet[] = { 'A',
-0xD8, 0x85,
-0xD4, 0xB0,
-0xE0, 0xA6, 0x86,
-0xE4, 0xB8, 0x83,
-0xD0, 0x80,
+(char) 0xD8, (char) 0x85,
+(char) 0xD4, (char) 0xB0,
+(char) 0xE0, (char) 0xA6, (char) 0x86,
+(char) 0xE4, (char) 0xB8, (char) 0x83,
+(char) 0xD0, (char) 0x80,
 0 };
 #endif
   LogString greeting(greet);
@@ -131,11 +131,11 @@
 
 void encode4() {
   const char utf8_greet[] = { 'A',
-0xD8, 0x85,
-0xD4, 0xB0,
-  

svn commit: r537905 - in /logging/log4cxx/trunk: include/log4cxx/logger.h src/logger.cpp

[afester]

Author: afester
Date: Mon May 14 09:43:12 2007
New Revision: 537905

URL: http://svn.apache.org/viewvc?view=rev&rev=537905
Log:
LOGCXX-14: Made Logger::error and dependant methods const to avoid
"cast to non-const" warning

Modified:
logging/log4cxx/trunk/include/log4cxx/logger.h
logging/log4cxx/trunk/src/logger.cpp

Modified: logging/log4cxx/trunk/include/log4cxx/logger.h
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/logger.h?view=diff&rev=537905&r1=537904&r2=537905
==
--- logging/log4cxx/trunk/include/log4cxx/logger.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/logger.h Mon May 14 09:43:12 2007
@@ -132,7 +132,7 @@
 to log the particular log request.
 
 @param event the event to log.  */
-void callAppenders(const spi::LoggingEventPtr& event, 
log4cxx::helpers::Pool& p);
+void callAppenders(const spi::LoggingEventPtr& event, 
log4cxx::helpers::Pool& p) const;
 
 /**
 Close all attached appenders implementing the AppenderAttachable
@@ -176,9 +176,9 @@
 @param line the line where the log statement was written.
 */
 void error(const std::string& msg, const log4cxx::spi::LocationInfo& 
location);
-void error(const std::string& msg);
+void error(const std::string& msg) const;
 #if LOG4CXX_HAS_WCHAR_T
-void error(const std::wstring& msg);
+void error(const std::wstring& msg) const;
 void error(const std::wstring& msg, const log4cxx::spi::LocationInfo& 
location);
 #endif
 
@@ -211,14 +211,12 @@
 */
 void forcedLog(const LevelPtr& level, const std::string& message,
 const log4cxx::spi::LocationInfo& location);
-void forcedLog(const LevelPtr& level, const std::string& message);
+void forcedLog(const LevelPtr& level, const std::string& message) 
const;
 
 #if LOG4CXX_HAS_WCHAR_T
 void forcedLog(const LevelPtr& level, const std::wstring& message,
 const log4cxx::spi::LocationInfo& location);
-
-
-void forcedLog(const LevelPtr& level, const std::wstring& message);
+void forcedLog(const LevelPtr& level, const std::wstring& message) 
const;
 #endif
 
 /**

Modified: logging/log4cxx/trunk/src/logger.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/logger.cpp?view=diff&rev=537905&r1=537904&r2=537905
==
--- logging/log4cxx/trunk/src/logger.cpp (original)
+++ logging/log4cxx/trunk/src/logger.cpp Mon May 14 09:43:12 2007
@@ -66,7 +66,7 @@
 }
 
 
-void Logger::callAppenders(const spi::LoggingEventPtr& event, Pool& p)
+void Logger::callAppenders(const spi::LoggingEventPtr& event, Pool& p) const
 {
 int writes = 0;
 
@@ -122,7 +122,7 @@
 }
 #endif
 
-void Logger::forcedLog(const LevelPtr& level1, const std::string& message)
+void Logger::forcedLog(const LevelPtr& level1, const std::string& message) 
const
 {
 Pool p;
 LOG4CXX_DECODE_CHAR(msg, message);
@@ -132,7 +132,7 @@
 }
 
 #if LOG4CXX_HAS_WCHAR_T
-void Logger::forcedLog(const LevelPtr& level1, const std::wstring& message)
+void Logger::forcedLog(const LevelPtr& level1, const std::wstring& message) 
const
 {
 Pool p;
 LOG4CXX_DECODE_WCHAR(msg, message);
@@ -228,7 +228,7 @@
 }
 catch (MissingResourceException&)
 {
-((Logger *)this)->error(LOG4CXX_STR("No resource is 
associated with key \"") +
+error(LOG4CXX_STR("No resource is associated with key 
\"") +
 key + LOG4CXX_STR("\"."));
 
 return LogString();
@@ -617,14 +617,14 @@
 }
 
 #if LOG4CXX_HAS_WCHAR_T
-void Logger::error(const std::wstring& msg) {
+void Logger::error(const std::wstring& msg) const {
   if (isEnabledFor(log4cxx::Level::getError())) {
  forcedLog(log4cxx::Level::getError(), msg);
   }
 }
 #endif
 
-void Logger::error(const std::string& msg) {
+void Logger::error(const std::string& msg) const {
   if (isEnabledFor(log4cxx::Level::getError())) {
  forcedLog(log4cxx::Level::getError(), msg);
   }

svn commit: r537906 - in /logging/log4cxx/trunk: include/log4cxx/helpers/condition.h include/log4cxx/helpers/mutex.h include/log4cxx/helpers/synchronized.h src/mutex.cpp

[afester]

Author: afester
Date: Mon May 14 09:46:09 2007
New Revision: 537906

URL: http://svn.apache.org/viewvc?view=rev&rev=537906
Log:
LOGCXX-14: Made member variables non-const to avoid "cast to non-const"
warning


Modified:
logging/log4cxx/trunk/include/log4cxx/helpers/condition.h
logging/log4cxx/trunk/include/log4cxx/helpers/mutex.h
logging/log4cxx/trunk/include/log4cxx/helpers/synchronized.h
logging/log4cxx/trunk/src/mutex.cpp

Modified: logging/log4cxx/trunk/include/log4cxx/helpers/condition.h
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/helpers/condition.h?view=diff&rev=537906&r1=537905&r2=537906
==
--- logging/log4cxx/trunk/include/log4cxx/helpers/condition.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/helpers/condition.h Mon May 14 
09:46:09 2007
@@ -36,8 +36,8 @@
 void wait();
 
 private:
-const void* condition;
-const void* mutex;
+void* condition;
+void* mutex;
 Condition(const Condition&);
 Condition& operator=(const Condition&);
 };

Modified: logging/log4cxx/trunk/include/log4cxx/helpers/mutex.h
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/helpers/mutex.h?view=diff&rev=537906&r1=537905&r2=537906
==
--- logging/log4cxx/trunk/include/log4cxx/helpers/mutex.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/helpers/mutex.h Mon May 14 09:46:09 
2007
@@ -33,12 +33,12 @@
 public:
 Mutex(log4cxx::helpers::Pool& p);
 ~Mutex();
-const log4cxx_thread_mutex_t* getAPRMutex() const;
+log4cxx_thread_mutex_t* getAPRMutex() const;
 
 private:
 Mutex(const Mutex&);
 Mutex& operator=(const Mutex&);
-const log4cxx_thread_mutex_t* mutex;
+log4cxx_thread_mutex_t* mutex;
 };
 } // namespace helpers
 } // namespace log4cxx

Modified: logging/log4cxx/trunk/include/log4cxx/helpers/synchronized.h
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/helpers/synchronized.h?view=diff&rev=537906&r1=537905&r2=537906
==
--- logging/log4cxx/trunk/include/log4cxx/helpers/synchronized.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/helpers/synchronized.h Mon May 14 
09:46:09 2007
@@ -33,7 +33,7 @@
 
 
 private:
-const void* mutex;
+void* mutex;
 //  prevent use of copy and assignment
 synchronized(const synchronized&);
 synchronized& operator=(const synchronized&);

Modified: logging/log4cxx/trunk/src/mutex.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/mutex.cpp?view=diff&rev=537906&r1=537905&r2=537906
==
--- logging/log4cxx/trunk/src/mutex.cpp (original)
+++ logging/log4cxx/trunk/src/mutex.cpp Mon May 14 09:46:09 2007
@@ -45,6 +45,6 @@
 #endif
 }
 
-const log4cxx_thread_mutex_t* Mutex::getAPRMutex() const {
+log4cxx_thread_mutex_t* Mutex::getAPRMutex() const {
 return mutex;
 }

svn commit: r537907 - /logging/log4cxx/trunk/src/charsetdecoder.cpp

[afester]

Author: afester
Date: Mon May 14 09:48:34 2007
New Revision: 537907

URL: http://svn.apache.org/viewvc?view=rev&rev=537907
Log:
LOGCXX-14: added const-cast to avoid "cast to non-const" warning

Modified:
logging/log4cxx/trunk/src/charsetdecoder.cpp

Modified: logging/log4cxx/trunk/src/charsetdecoder.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/charsetdecoder.cpp?view=diff&rev=537907&r1=537906&r2=537907
==
--- logging/log4cxx/trunk/src/charsetdecoder.cpp (original)
+++ logging/log4cxx/trunk/src/charsetdecoder.cpp Mon May 14 09:48:34 2007
@@ -422,7 +422,7 @@
   int bytes = UnicodeHelper::encodeUTF8(sv, utf8);
   out.append(utf8, bytes);
   }
-  in.position(((char*) src) - in.data());
+  in.position(((const char*) src) - in.data());
   return APR_SUCCESS;
   }
 

svn commit: r537909 - in /logging/log4cxx/trunk: include/log4cxx/helpers/pool.h src/pool.cpp

[afester]

Author: afester
Date: Mon May 14 09:50:21 2007
New Revision: 537909

URL: http://svn.apache.org/viewvc?view=rev&rev=537909
Log:
LOGCXX-14: Made return value of Pool::getAPRPool() non-const to 
avoid "cast to non-const type" warning

Modified:
logging/log4cxx/trunk/include/log4cxx/helpers/pool.h
logging/log4cxx/trunk/src/pool.cpp

Modified: logging/log4cxx/trunk/include/log4cxx/helpers/pool.h
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/helpers/pool.h?view=diff&rev=537909&r1=537908&r2=537909
==
--- logging/log4cxx/trunk/include/log4cxx/helpers/pool.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/helpers/pool.h Mon May 14 09:50:21 
2007
@@ -32,7 +32,7 @@
 public:
 Pool();
 Pool(log4cxx_pool_t* pool, bool release);
-const log4cxx_pool_t* getAPRPool();
+log4cxx_pool_t* getAPRPool();
 ~Pool();
 
 char* palloc(size_t length);

Modified: logging/log4cxx/trunk/src/pool.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/pool.cpp?view=diff&rev=537909&r1=537908&r2=537909
==
--- logging/log4cxx/trunk/src/pool.cpp (original)
+++ logging/log4cxx/trunk/src/pool.cpp Mon May 14 09:50:21 2007
@@ -46,7 +46,7 @@
 }
 
 
-const log4cxx_pool_t* Pool::getAPRPool() {
+log4cxx_pool_t* Pool::getAPRPool() {
return pool;
 }
 

svn commit: r537910 - /logging/log4cxx/trunk/include/log4cxx/helpers/object.h

[afester]

Author: afester
Date: Mon May 14 09:51:45 2007
New Revision: 537910

URL: http://svn.apache.org/viewvc?view=rev&rev=537910
Log:
LOGCXX-14: tweak to avoid type mismatch warning between const and
non-const type

Modified:
logging/log4cxx/trunk/include/log4cxx/helpers/object.h

Modified: logging/log4cxx/trunk/include/log4cxx/helpers/object.h
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/helpers/object.h?view=diff&rev=537910&r1=537909&r2=537910
==
--- logging/log4cxx/trunk/include/log4cxx/helpers/object.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/helpers/object.h Mon May 14 09:51:45 
2007
@@ -121,7 +121,7 @@
 const void * cast(const helpers::Class& clazz) const\
 {\
 const void * object = 0;\
-if (&clazz == &helpers::Object::getStaticClass()) return 
(helpers::Object *)this;
+if (&clazz == &helpers::Object::getStaticClass()) return (const 
helpers::Object *)this;
 
 #define END_LOG4CXX_CAST_MAP()\
 return object;\
@@ -130,7 +130,7 @@
 { return cast(clazz) != 0; }
 
 #define LOG4CXX_CAST_ENTRY(Interface)\
-if (&clazz == &Interface::getStaticClass()) return (Interface *)this;
+if (&clazz == &Interface::getStaticClass()) return (const Interface *)this;
 
 #define LOG4CXX_CAST_ENTRY2(Interface, interface2)\
 if (&clazz == &Interface::getStaticClass()) return (Interface *)(interface2 
*)this;

svn commit: r542001 - in /logging/log4cxx/trunk: Makefile.am configure.in liblog4cxx.pc.in

[afester]

Author: afester
Date: Sun May 27 09:56:24 2007
New Revision: 542001

URL: http://svn.apache.org/viewvc?view=rev&rev=542001
Log:
LOGCXX-43: added pkg-config files

Added:
logging/log4cxx/trunk/liblog4cxx.pc.in
Modified:
logging/log4cxx/trunk/Makefile.am
logging/log4cxx/trunk/configure.in

Modified: logging/log4cxx/trunk/Makefile.am
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/Makefile.am?view=diff&rev=542001&r1=542000&r2=542001
==
--- logging/log4cxx/trunk/Makefile.am (original)
+++ logging/log4cxx/trunk/Makefile.am Sun May 27 09:56:24 2007
@@ -15,3 +15,6 @@
 #
 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
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = liblog4cxx.pc

Modified: logging/log4cxx/trunk/configure.in
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/configure.in?view=diff&rev=542001&r1=542000&r2=542001
==
--- logging/log4cxx/trunk/configure.in (original)
+++ logging/log4cxx/trunk/configure.in Sun May 27 09:56:24 2007
@@ -370,6 +370,7 @@
 
 AC_CONFIG_FILES([
 Makefile
+liblog4cxx.pc
 docs/Makefile
 docs/Doxyfile
 src/Makefile

Added: logging/log4cxx/trunk/liblog4cxx.pc.in
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/liblog4cxx.pc.in?view=auto&rev=542001
==
--- logging/log4cxx/trunk/liblog4cxx.pc.in (added)
+++ logging/log4cxx/trunk/liblog4cxx.pc.in Sun May 27 09:56:24 2007
@@ -0,0 +1,11 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+
+Name: log4cxx
+Description: log4cxx C++ logging framework
+Version: @VERSION@
+Libs: -L${libdir} -llog4cxx
+Cflags: -I${includedir}
+

svn commit: r542003 - in /logging/log4cxx/trunk/docs: Makefile.am simplesocketserver.1

[afester]

Author: afester
Date: Sun May 27 10:04:42 2007
New Revision: 542003

URL: http://svn.apache.org/viewvc?view=rev&rev=542003
Log:
LOGCXX-182: added man page for simplesocketserver

Added:
logging/log4cxx/trunk/docs/simplesocketserver.1
Modified:
logging/log4cxx/trunk/docs/Makefile.am

Modified: logging/log4cxx/trunk/docs/Makefile.am
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/docs/Makefile.am?view=diff&rev=542003&r1=542002&r2=542003
==
--- logging/log4cxx/trunk/docs/Makefile.am (original)
+++ logging/log4cxx/trunk/docs/Makefile.am Sun May 27 10:04:42 2007
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-EXTRA_DIST = Doxyfile mainpage.dox introduction.dox
+EXTRA_DIST = Doxyfile mainpage.dox introduction.dox simplesocketserver.1
 
 # DOC is defined if installer requests doc generation.
 

Added: logging/log4cxx/trunk/docs/simplesocketserver.1
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/docs/simplesocketserver.1?view=auto&rev=542003
==
--- logging/log4cxx/trunk/docs/simplesocketserver.1 (added)
+++ logging/log4cxx/trunk/docs/simplesocketserver.1 Sun May 27 10:04:42 2007
@@ -0,0 +1,28 @@
+.TH "simplesocketserver" "1" "April 2005" "" ""
+.SH "NAME"
+simplesocketserver \- a simple socket server for logging
+.SH "SYNOPSIS"
+.PP
+simplesocketserver  
+.PP
+.SH "DESCRIPTION"
+.PP
+simplesocketserver is part of the log4cxx C++ logging framework
+and provides a simple server for centralized logging.
+.PP
+.SH "OPTIONS"
+.PP
+The following parameters are required to run simplesocketserver:
+.PP
+.IP "\fB\fP" 
+The TCP port on which to listen for logging requests.
+.IP "\fB\fP" 
+The configuration file for simplesocketserver. This file is used
+to configure the appenders to which logging requests are sent. The
+format is the same as the usual property file which is used 
+to configure log4cxx.
+.PP 
+.SH "AUTHOR" 
+.PP 
+The log4cxx framework was written by Michael Catanzariti and
+Edmond Nolan.

svn commit: r561465 - in /logging/log4cxx/trunk: ./ src/ src/examples/ src/examples/cpp/ src/main/ src/main/cpp/ src/main/include/log4cxx/ src/main/include/log4cxx/config/ src/main/include/log4cxx/db/

[afester]

Author: afester
Date: Tue Jul 31 12:50:54 2007
New Revision: 561465

URL: http://svn.apache.org/viewvc?view=rev&rev=561465
Log:
LOGCXX-189: fixed autotools build

Added:
logging/log4cxx/trunk/src/examples/Makefile.am
logging/log4cxx/trunk/src/main/Makefile.am
logging/log4cxx/trunk/src/performance/Makefile.am
logging/log4cxx/trunk/src/simplesocketserver/Makefile.am
logging/log4cxx/trunk/src/site/Makefile.am
logging/log4cxx/trunk/src/test/Makefile.am
Modified:
logging/log4cxx/trunk/Makefile.am
logging/log4cxx/trunk/configure.in
logging/log4cxx/trunk/src/Makefile.am
logging/log4cxx/trunk/src/examples/   (props changed)
logging/log4cxx/trunk/src/examples/cpp/Makefile.am
logging/log4cxx/trunk/src/main/   (props changed)
logging/log4cxx/trunk/src/main/cpp/   (props changed)
logging/log4cxx/trunk/src/main/cpp/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/config/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/db/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/filter/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/net/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/nt/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/pattern/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/private/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/rolling/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/spi/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/spi/location/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/varia/Makefile.am
logging/log4cxx/trunk/src/main/include/log4cxx/xml/Makefile.am
logging/log4cxx/trunk/src/performance/   (props changed)
logging/log4cxx/trunk/src/performance/cpp/Makefile.am
logging/log4cxx/trunk/src/simplesocketserver/   (props changed)
logging/log4cxx/trunk/src/simplesocketserver/cpp/Makefile.am
logging/log4cxx/trunk/src/site/   (props changed)
logging/log4cxx/trunk/src/site/doxy/Makefile.am
logging/log4cxx/trunk/src/test/   (props changed)
logging/log4cxx/trunk/src/test/cpp/Makefile.am
logging/log4cxx/trunk/src/test/resources/Makefile.am

Modified: logging/log4cxx/trunk/Makefile.am
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/Makefile.am?view=diff&rev=561465&r1=561464&r2=561465
==
--- logging/log4cxx/trunk/Makefile.am (original)
+++ logging/log4cxx/trunk/Makefile.am Tue Jul 31 12:50:54 2007
@@ -13,6 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
+AUTOMAKE_OPTIONS = foreign
+
 SUBDIRS = src
 EXTRA_DIST = autogen.sh aclocal.m4 find_apr.m4 find_apu.m4 build.xml pom.xml 
NOTICE LICENSE
 

Modified: logging/log4cxx/trunk/configure.in
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/configure.in?view=diff&rev=561465&r1=561464&r2=561465
==
--- logging/log4cxx/trunk/configure.in (original)
+++ logging/log4cxx/trunk/configure.in Tue Jul 31 12:50:54 2007
@@ -1,4 +1,4 @@
-AC_INIT(src/logger.cpp)
+AC_INIT(src/main/cpp/logger.cpp)
 
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -109,11 +109,13 @@
 fi
 
 manual_dest="manual"
+base_dir=${ac_abs_confdir}
 
 AC_SUBST(enable_dot)
 AC_SUBST(enable_html_docs)
 AC_SUBST(enable_latex_docs)
 AC_SUBST(manual_dest)
+AC_SUBST(base_dir)
 
 # CppUnit
 
@@ -189,7 +191,6 @@
 else
  AC_SUBST(HAS_SYSLOG, 0)
 fi
-  
 
 # Checks for libraries
 # 
@@ -371,40 +372,47 @@
 AC_CONFIG_FILES([
 Makefile
 liblog4cxx.pc
-docs/Makefile
-docs/Doxyfile
 src/Makefile
-include/Makefile
-include/log4cxx/log4cxx.h
-include/log4cxx/private/log4cxx_private.h
-include/log4cxx/private/Makefile
-include/log4cxx/Makefile
-include/log4cxx/helpers/Makefile
-include/log4cxx/net/Makefile
-include/log4cxx/nt/Makefile
-include/log4cxx/spi/Makefile
-include/log4cxx/spi/location/Makefile
-include/log4cxx/varia/Makefile
-include/log4cxx/xml/Makefile
-include/log4cxx/config/Makefile
-include/log4cxx/db/Makefile
-include/log4cxx/rolling/Makefile
-include/log4cxx/pattern/Makefile
-include/log4cxx/filter/Makefile
-simplesocketserver/Makefile
-tests/Makefile
-tests/input/Makefile
-tests/input/performance/Makefile
-tests/input/ndc/Makefile
-tests/input/rolling/Makefile
-tests/input/xml/Makefile
-tests/src/Makefile
-tests/witness/Makefile
-tests/witness/encoding/Makefile
-tests/witness/ndc/Makefile
-tests/witness/rolling/Makefile
-performance/Makefi

svn commit: r561476 - /logging/log4cxx/trunk/src/test/resources/Makefile.am

[afester]

Author: afester
Date: Tue Jul 31 13:12:23 2007
New Revision: 561476

URL: http://svn.apache.org/viewvc?view=rev&rev=561476
Log:
LOGCXX-189: fixed autotools build (unit tests)

Modified:
logging/log4cxx/trunk/src/test/resources/Makefile.am

Modified: logging/log4cxx/trunk/src/test/resources/Makefile.am
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/resources/Makefile.am?view=diff&rev=561476&r1=561475&r2=561476
==
--- logging/log4cxx/trunk/src/test/resources/Makefile.am (original)
+++ logging/log4cxx/trunk/src/test/resources/Makefile.am Tue Jul 31 13:12:23 
2007
@@ -45,7 +45,7 @@
@export TOTO=wonderful; \
export key1=value1; \
export key2=value2; \
-   src/testsuite +TestCase1
+   ../cpp/testsuite +TestCase1
 
 regression: Minimum Logger DOM CustomLevel \
CustomLogger PatternLayout \
@@ -58,73 +58,73 @@
 longUnit:
 
 Minimum: build cleanOutputDir
-   src/testsuite MinimumTestCase
+   ../cpp/testsuite MinimumTestCase

 Logger: build cleanOutputDir
-   src/testsuite LoggerTestCase
+   ../cpp/testsuite LoggerTestCase

 PatternLayout: build cleanOutputDir
-   src/testsuite PatternLayoutTest
+   ../cpp/testsuite PatternLayoutTest
 
 HierarchyThreshold: build cleanOutputDir
-   src/testsuite HierarchyThresholdTestCase
+   ../cpp/testsuite HierarchyThresholdTestCase

 DOM: build cleanOutputDir
-   src/testsuite DOMTestCase
+   ../cpp/testsuite DOMTestCase
 
 CustomLevel: build cleanOutputDir
-   src/testsuite CustomLevelTestCase
+   ../cpp/testsuite CustomLevelTestCase
 
 CustomLogger: build cleanOutputDir
-   src/testsuite XLoggerTestCase
+   ../cpp/testsuite XLoggerTestCase

 DefaultInit: build cleanOutputDir
-   src/testsuite TestCase1
+   ../cpp/testsuite TestCase1
@cp input/xml/defaultInit.xml log4j.xml
-   src/testsuite TestCase2
+   ../cpp/testsuite TestCase2
@rm -f log4j.xml
@cp input/defaultInit3.properties log4j.properties
-   src/testsuite TestCase3
+   ../cpp/testsuite TestCase3
@rm -f log4j.properties
@cp input/defaultInit3.properties log4j.properties
@cp input/xml/defaultInit.xml log4j.xml
-   src/testsuite TestCase4
+   ../cpp/testsuite TestCase4
@rm -f log4j.xml
@rm -f log4j.properties
 
 SocketServer: build cleanOutputDir
-   src/testsuite SocketServerTestCase
+   ../cpp/testsuite SocketServerTestCase
 
 XMLLayout: build cleanOutputDir
-   src/testsuite XMLLayoutTestCase
+   ../cpp/testsuite XMLLayoutTestCase
 
 AsyncAppender: build cleanOutputDir
-   src/testsuite AsyncAppenderTestCase
+   ../cpp/testsuite AsyncAppenderTestCase
 
 LevelMatchFilter: build cleanOutputDir
-   src/testsuite LevelMatchFilterTestCase
+   ../cpp/testsuite LevelMatchFilterTestCase
 
 LevelRangeFilter: build cleanOutputDir
-   src/testsuite LevelRangeFilterTestCase
+   ../cpp/testsuite LevelRangeFilterTestCase
 
 ErrorHandler: build cleanOutputDir
-   src/testsuite ErrorHandlerTestCase
+   ../cpp/testsuite ErrorHandlerTestCase
 
 OptionConverter: build cleanOutputDir
-   src/testsuite OptionConverterTestCase
+   ../cpp/testsuite OptionConverterTestCase
 
 BoundedFIFO: build cleanOutputDir
-   src/testsuite BoundedFIFOTestCase
+   ../cpp/testsuite BoundedFIFOTestCase
 
 CyclicBuffer: build cleanOutputDir
-   src/testsuite CyclicBufferTestCase
+   ../cpp/testsuite CyclicBufferTestCase

 DRFA: build cleanOutputDir
-   src/testsuite DRFATestCase
+   ../cpp/testsuite DRFATestCase
 
 PatternParser: build cleanOutputDir
 
 L7d: build cleanOutputDir
-   src/testsuite L7dTestCase
+   ../cpp/testsuite L7dTestCase
 
 endif

svn commit: r562946 - in /logging/log4cxx/trunk/src/main: cpp/telnetappender.cpp include/log4cxx/net/telnetappender.h

[afester]

Author: afester
Date: Sun Aug  5 12:51:59 2007
New Revision: 562946

URL: http://svn.apache.org/viewvc?view=rev&rev=562946
Log:
LOGCXX-14: fixed "comparison between signed and unsigned" warning

Modified:
logging/log4cxx/trunk/src/main/cpp/telnetappender.cpp
logging/log4cxx/trunk/src/main/include/log4cxx/net/telnetappender.h

Modified: logging/log4cxx/trunk/src/main/cpp/telnetappender.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/telnetappender.cpp?view=diff&rev=562946&r1=562945&r2=562946
==
--- logging/log4cxx/trunk/src/main/cpp/telnetappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/telnetappender.cpp Sun Aug  5 12:51:59 
2007
@@ -112,7 +112,7 @@
 
 void TelnetAppender::append(const spi::LoggingEventPtr& event, Pool& /* p */)
 {
-int count = activeConnections;
+size_t count = activeConnections;
 if (count > 0) {
 LogString os;
 
@@ -161,7 +161,7 @@
 return NULL;
 }
 
-int count = pThis->activeConnections;
+size_t count = pThis->activeConnections;
 if (count >= pThis->connections.size()) {
 os->writeRaw(LOG4CXX_STR("Too many connections.\r\n"));
 os->flush();

Modified: logging/log4cxx/trunk/src/main/include/log4cxx/net/telnetappender.h
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/net/telnetappender.h?view=diff&rev=562946&r1=562945&r2=562946
==
--- logging/log4cxx/trunk/src/main/include/log4cxx/net/telnetappender.h 
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/net/telnetappender.h Sun Aug 
 5 12:51:59 2007
@@ -130,7 +130,7 @@
 ConnectionList connections;
 helpers::ServerSocket* serverSocket;
 helpers::Thread sh;
-int activeConnections;
+size_t activeConnections;
 static void* LOG4CXX_THREAD_FUNC 
acceptConnections(helpers::log4cxx_thread_t* thread, void* data);
 }; // class TelnetAppender
 } // namespace net

svn commit: r567285 - /logging/log4cxx/trunk/configure.in

[afester]

Author: afester
Date: Sat Aug 18 08:59:02 2007
New Revision: 567285

URL: http://svn.apache.org/viewvc?view=rev&rev=567285
Log:
LOGCXX-189: tweak for autotools build for proper documentation generation


Modified:
logging/log4cxx/trunk/configure.in

Modified: logging/log4cxx/trunk/configure.in
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/configure.in?view=diff&rev=567285&r1=567284&r2=567285
==
--- logging/log4cxx/trunk/configure.in (original)
+++ logging/log4cxx/trunk/configure.in Sat Aug 18 08:59:02 2007
@@ -109,7 +109,7 @@
 fi
 
 manual_dest="manual"
-base_dir=${ac_abs_confdir}
+base_dir=`(cd $srcdir && pwd)`
 
 AC_SUBST(enable_dot)
 AC_SUBST(enable_html_docs)

svn commit: r567286 - /logging/log4cxx/trunk/src/site/doxy/Makefile.am

[afester]

Author: afester
Date: Sat Aug 18 09:01:41 2007
New Revision: 567286

URL: http://svn.apache.org/viewvc?view=rev&rev=567286
Log:
LOGCXX-43: fix warning message (htmldir redefinition) when executing autogen.sh


Modified:
logging/log4cxx/trunk/src/site/doxy/Makefile.am

Modified: logging/log4cxx/trunk/src/site/doxy/Makefile.am
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/site/doxy/Makefile.am?view=diff&rev=567286&r1=567285&r2=567286
==
--- logging/log4cxx/trunk/src/site/doxy/Makefile.am (original)
+++ logging/log4cxx/trunk/src/site/doxy/Makefile.am Sat Aug 18 09:01:41 2007
@@ -20,16 +20,16 @@
 
 if DOC
 
-htmldir = $(pkgdatadir)/html
+htmldest = $(pkgdatadir)/html
 
 install-data-hook:
-   $(mkinstalldirs) $(DESTDIR)$(htmldir)
-   cp -dpR @manual_dest@/* $(DESTDIR)$(htmldir)
+   $(mkinstalldirs) $(DESTDIR)$(htmldest)
+   cp -dpR @manual_dest@/* $(DESTDIR)$(htmldest)
 
 # Automake's "distcheck" is sensitive to having files left over
 # after "make uninstall", so we have to clean up the install hook.
 uninstall-local:
-   rm -rf $(DESTDIR)$(htmldir)
+   rm -rf $(DESTDIR)$(htmldest)
 
 dox: @manual_dest@/index.html
 

svn commit: r609774 - /logging/log4cxx/trunk/src/test/resources/Makefile.am

[afester]

Author: afester
Date: Mon Jan  7 12:46:20 2008
New Revision: 609774

URL: http://svn.apache.org/viewvc?rev=609774&view=rev
Log:
LOGCXX-43: tweak to fix make dist for source tarball creation

Modified:
logging/log4cxx/trunk/src/test/resources/Makefile.am

Modified: logging/log4cxx/trunk/src/test/resources/Makefile.am
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/resources/Makefile.am?rev=609774&r1=609773&r2=609774&view=diff
==
--- logging/log4cxx/trunk/src/test/resources/Makefile.am (original)
+++ logging/log4cxx/trunk/src/test/resources/Makefile.am Mon Jan  7 12:46:20 
2008
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 SUBDIRS = input witness
-EXTRA_DIST = log4j.dtd L7D_en_US.properties L7D_fr_CH.properties 
L7D_fr.properties
+EXTRA_DIST = L7D_en_US.properties L7D_fr_CH.properties L7D_fr.properties
 
 if TESTS
 

svn commit: r696744 - in /logging/log4cxx/trunk/src: main/cpp/logger.cpp test/cpp/l7dtestcase.cpp test/resources/L7D_fr.properties test/resources/witness/l7d.1

[afester]

Author: afester
Date: Thu Sep 18 11:03:02 2008
New Revision: 696744

URL: http://svn.apache.org/viewvc?rev=696744&view=rev
Log:
LOGCXX-310: fixed array index when logging localized messages
with three parameters

Modified:
logging/log4cxx/trunk/src/main/cpp/logger.cpp
logging/log4cxx/trunk/src/test/cpp/l7dtestcase.cpp
logging/log4cxx/trunk/src/test/resources/L7D_fr.properties
logging/log4cxx/trunk/src/test/resources/witness/l7d.1

Modified: logging/log4cxx/trunk/src/main/cpp/logger.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/logger.cpp?rev=696744&r1=696743&r2=696744&view=diff
==
--- logging/log4cxx/trunk/src/main/cpp/logger.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/logger.cpp Thu Sep 18 11:03:02 2008
@@ -426,7 +426,7 @@
   std::vector values(3);
   values[0] = lval1;
   values[1] = lval2;
-  values[3] = lval3;
+  values[2] = lval3;
   l7dlog(level1, lkey, location, values);
 }
 

Modified: logging/log4cxx/trunk/src/test/cpp/l7dtestcase.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/l7dtestcase.cpp?rev=696744&r1=696743&r2=696744&view=diff
==
--- logging/log4cxx/trunk/src/test/cpp/l7dtestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/l7dtestcase.cpp Thu Sep 18 11:03:02 2008
@@ -94,6 +94,9 @@
 LOG4CXX_L7DLOG2(root, Level::getError(), 
LOG4CXX_TEST_STR("msg1"), os.str().c_str(),
  LOG4CXX_TEST_STR("log4j"));
 LOG4CXX_L7DLOG(root, Level::getInfo(), 
LOG4CXX_TEST_STR("bogus2"));
+
+LOG4CXX_L7DLOG3(root, Level::getError(), 
LOG4CXX_TEST_STR("msg3"), os.str().c_str(),
+ LOG4CXX_TEST_STR("log4j"), 
LOG4CXX_TEST_STR("log4cxx"));
 }
 
 LOGUNIT_ASSERT(Compare::compare(LOG4CXX_FILE("output/temp"),

Modified: logging/log4cxx/trunk/src/test/resources/L7D_fr.properties
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/resources/L7D_fr.properties?rev=696744&r1=696743&r2=696744&view=diff
==
--- logging/log4cxx/trunk/src/test/resources/L7D_fr.properties (original)
+++ logging/log4cxx/trunk/src/test/resources/L7D_fr.properties Thu Sep 18 
11:03:02 2008
@@ -16,3 +16,4 @@
 test=Ceci est le test en francais pour la France.
 hello_world=Bonjour la France.
 msg1=Ceci est le test numero {0} contenant l'argument {1}.
+msg3=Ceci est le test numero {0} contenant l'argument {1} et l'argument {2}.

Modified: logging/log4cxx/trunk/src/test/resources/witness/l7d.1
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/resources/witness/l7d.1?rev=696744&r1=696743&r2=696744&view=diff
==
--- logging/log4cxx/trunk/src/test/resources/witness/l7d.1 (original)
+++ logging/log4cxx/trunk/src/test/resources/witness/l7d.1 Thu Sep 18 11:03:02 
2008
@@ -5,6 +5,8 @@
 T1 ERROR - This is test number 1 with string argument log4j.
 T1 ERROR - No resource is associated with key "bogus2".
 T1  INFO - bogus2
+T1 ERROR - No resource is associated with key "msg3".
+T1 ERROR - msg3
 T1  INFO - Ceci est le test en francais pour la France.
 T1  WARN - Bonjour la France.
 T1 ERROR - No resource is associated with key "bogusMsg".
@@ -12,6 +14,7 @@
 T1 ERROR - Ceci est le test numero 2 contenant l'argument log4j.
 T1 ERROR - No resource is associated with key "bogus2".
 T1  INFO - bogus2
+T1 ERROR - Ceci est le test numero 2 contenant l'argument log4j et l'argument 
log4cxx.
 T1  INFO - Ceci est le test en francais pour la p'tite Suisse.
 T1  WARN - Bonjour la France.
 T1 ERROR - No resource is associated with key "bogusMsg".
@@ -19,3 +22,4 @@
 T1 ERROR - Ceci est le test numero 3 contenant l'argument log4j.
 T1 ERROR - No resource is associated with key "bogus2".
 T1  INFO - bogus2
+T1 ERROR - Ceci est le test numero 3 contenant l'argument log4j et l'argument 
log4cxx.