You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by ca...@apache.org on 2005/05/07 17:12:16 UTC
cvs commit: logging-log4cxx/tests/src/xml customleveltestcase.cpp
carnold 2005/05/07 08:12:16
Modified: . build.xml
include/log4cxx log4cxx.hw
include/log4cxx/helpers aprinitializer.h socketimpl.h
include/log4cxx/net smtpappender.h
include/log4cxx/private Makefile.am
src charsetdecoder.cpp charsetencoder.cpp class.cpp
domconfigurator.cpp logger.cpp loglog.cpp msxml.cpp
propertyresourcebundle.cpp simpledateformat.cpp
smtpappender.cpp stringhelper.cpp
stringtokenizer.cpp
tests/src/customlogger xloggertestcase.cpp
tests/src/db odbcappendertestcase.cpp
tests/src/defaultinit testcase2.cpp testcase4.cpp
tests/src/helpers cacheddateformattestcase.cpp
datetimedateformattestcase.cpp
tests/src/net smtpappendertestcase.cpp
tests/src/varia errorhandlertestcase.cpp
tests/src/xml customleveltestcase.cpp
Added: include/log4cxx/private log4cxx_private.h.in
log4cxx_private.hw
Removed: include/log4cxx/private log4cxx.h.in log4cxx.hw
Log:
LOGCXX-43: Renamed private/log4cxx.h, other header-check fixes
Revision Changes Path
1.66 +8 -8 logging-log4cxx/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/build.xml,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- build.xml 4 May 2005 21:32:16 -0000 1.65
+++ build.xml 7 May 2005 15:12:15 -0000 1.66
@@ -323,7 +323,7 @@
<condition property="config-available" value="true">
<and>
<available file="${include.dir}/log4cxx/log4cxx.h"/>
- <available file="${include.dir}/log4cxx/private/log4cxx.h"/>
+ <available file="${include.dir}/log4cxx/private/log4cxx_private.h"/>
</and>
</condition>
</target>
@@ -336,8 +336,8 @@
<copy tofile="${include.dir}/log4cxx/log4cxx.h"
file="${include.dir}/log4cxx/log4cxx.h.in"/>
- <copy tofile="${include.dir}/log4cxx/private/log4cxx.h"
- file="${include.dir}/log4cxx/private/log4cxx.h.in"/>
+ <copy tofile="${include.dir}/log4cxx/private/log4cxx_private.h"
+ file="${include.dir}/log4cxx/private/log4cxx_private.h.in"/>
</target>
<target name="win-configure"
@@ -346,8 +346,8 @@
unless="config-available">
<copy tofile="${include.dir}/log4cxx/log4cxx.h"
file="${include.dir}/log4cxx/log4cxx.hw"/>
- <copy tofile="${include.dir}/log4cxx/private/log4cxx.h"
- file="${include.dir}/log4cxx/private/log4cxx.hw"/>
+ <copy tofile="${include.dir}/log4cxx/private/log4cxx_private.h"
+ file="${include.dir}/log4cxx/private/log4cxx_private.hw"/>
</target>
@@ -567,11 +567,11 @@
<compilerarg value="-Weffc++"/>
<compilerarg value="-Wall"/>
<compilerarg value="${pic-option}" if="pic-option"/>
- <fileset dir="${build.dir}/header-check" includes="**/*.cpp"/>
+ <fileset dir="${build.dir}/header-check"
+ includes="**/*.cpp"
+ excludes="log4cxx/private/*.cpp **/aprinitializer.h.cpp"/>
<includepath path="mock"/>
<includepath path="include"/>
- <includepath path="${apr.include.dir}"/>
- <includepath path="${aprutil.include.dir}"/>
<project outfile="${project.dir}/header-check"
type="${project.type}" if="project.if"/>
</cc>
1.3 +54 -51 logging-log4cxx/include/log4cxx/log4cxx.hw
Index: log4cxx.hw
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/log4cxx.hw,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- log4cxx.hw 4 May 2005 19:17:35 -0000 1.2
+++ log4cxx.hw 7 May 2005 15:12:15 -0000 1.3
@@ -1,57 +1,60 @@
-/* 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_LOG4CXX_H
-#define LOG4CXX_LOG4CXX_H
-
-/* GENERATED FILE WARNING! DO NOT EDIT log4cxx.h
- *
- * Edit log4cxx.h.in instead
- *
- */
-
-
-#define LOG4CXX_LOGCHAR_IS_UTF8 0
-#if LOG4CXX_LOGCHAR_IS_UTF8
-#define LOG4CXX_LOGCHAR_IS_WCHAR 0
-#else
-#define LOG4CXX_LOGCHAR_IS_WCHAR 1
-#endif
-
-#define LOG4CXX_HAS_WCHAR_T 1
-
-
+/* 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_LOG4CXX_H
+#define LOG4CXX_LOG4CXX_H
+
+/* GENERATED FILE WARNING! DO NOT EDIT log4cxx_private.h
+ *
+ * Edit log4cxx_private.h.in instead
+ *
+ */
+
+
+#define LOG4CXX_LOGCHAR_IS_UTF8 0
+#if LOG4CXX_LOGCHAR_IS_UTF8
+#define LOG4CXX_LOGCHAR_IS_WCHAR 0
+#else
+#define LOG4CXX_LOGCHAR_IS_WCHAR 1
+#endif
+
+#define LOG4CXX_HAS_WCHAR_T 1
+
+
#if defined(_MSC_VER)
typedef __int64 log4cxx_int64_t;
#else
-typedef long long log4cxx_int64_t;
+typedef long long log4cxx_int64_t;
+#endif
+
+typedef log4cxx_int64_t log4cxx_time_t;
+typedef int log4cxx_status_t;
+
+#if defined(LOG4CXX_STATIC)
+#define LOG4CXX_EXPORT
+#else
+#ifdef LOG4CXX
+ #define LOG4CXX_EXPORT __declspec(dllexport)
+#else
+ #define LOG4CXX_EXPORT __declspec(dllimport)
+#endif
#endif
-
-typedef log4cxx_int64_t log4cxx_time_t;
-typedef int log4cxx_status_t;
-
-#if defined(LOG4CXX_STATIC)
-#define LOG4CXX_EXPORT
-#else
-#ifdef LOG4CXX
- #define LOG4CXX_EXPORT __declspec(dllexport)
-#else
- #define LOG4CXX_EXPORT __declspec(dllimport)
-#endif
-#endif
+#define LOG4CXX_LOCALE_ENCODING_UTF8 0
+#define LOG4CXX_LOCALE_ENCODING_ISO_8859_1 0
+#define LOG4CXX_LOCALE_ENCODING_US_ASCII 0
-#endif
\ No newline at end of file
+#endif
1.12 +4 -0 logging-log4cxx/include/log4cxx/helpers/aprinitializer.h
Index: aprinitializer.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/aprinitializer.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- aprinitializer.h 4 May 2005 16:13:40 -0000 1.11
+++ aprinitializer.h 7 May 2005 15:12:15 -0000 1.12
@@ -17,6 +17,10 @@
#ifndef _LOG4CXX_HELPERS_APRINITIALIZER_H
#define _LOG4CXX_HELPERS_APRINITIALIZER_H
+#ifndef LOG4CXX
+#error "aprinitializer.h should only be included by log4cxx implementation"
+#endif
+
#include <log4cxx/helpers/pool.h>
#include <apr_pools.h>
#include <apr_thread_proc.h>
1.19 +5 -1 logging-log4cxx/include/log4cxx/helpers/socketimpl.h
Index: socketimpl.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/socketimpl.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- socketimpl.h 29 Apr 2005 01:23:16 -0000 1.18
+++ socketimpl.h 7 May 2005 15:12:15 -0000 1.19
@@ -213,7 +213,7 @@
/** Binds this socket to the specified port number
on the specified host.
@param host the host address
- @param port the port number.
+ @param port the port number.
@exception BindException if an I/O error occurs when binding this socket.
*/
void bind(InetAddress host, int port);
@@ -263,6 +263,10 @@
/** Enable/disable SO_TIMEOUT with the specified timeout, in milliseconds.
*/
void setSoTimeout(int timeout);
+
+ private:
+ SocketImpl(const SocketImpl&);
+ SocketImpl& operator=(const SocketImpl&);
};
} // namespace helpers
} // namespace log4cxx
1.21 +14 -9 logging-log4cxx/include/log4cxx/net/smtpappender.h
Index: smtpappender.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/net/smtpappender.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- smtpappender.h 4 May 2005 16:13:41 -0000 1.20
+++ smtpappender.h 7 May 2005 15:12:15 -0000 1.21
@@ -79,9 +79,9 @@
~SMTPAppender();
- /**
- Set options
- */
+ /**
+ Set options
+ */
virtual void setOption(const LogString& option, const LogString& value);
/**
@@ -159,7 +159,7 @@
<code>iso8859_2</code>, <code>iso8859_3</code>).
*/
inline void setCharset(const LogString& charset)
- { this->charset = charset; }
+ { this->charset.assign(charset); }
/**
The <b>Encoding</b> option takes a string value which should be the
@@ -167,21 +167,21 @@
<code>base64</code>, <code>binary</code>, <code>quoted</code>).
*/
inline void setEncoding(const LogString& charset)
- { this->encoding = encoding; }
+ { this->encoding.assign(encoding); }
/**
The <b>From</b> option takes a string value which should be a
e-mail address of the sender.
*/
inline void setFrom(const LogString& from)
- { this->from = from; }
+ { this->from.assign(from); }
/**
The <b>Subject</b> option takes a string value which should be a
the subject of the e-mail message.
*/
inline void setSubject(const LogString& subject)
- { this->subject = subject; }
+ { this->subject.assign(subject); }
/**
The <b>BufferSize</b> option takes a positive integer
@@ -197,7 +197,7 @@
the host name of the SMTP server that will send the e-mail message.
*/
inline void setSMTPHost(const LogString& smtpHost)
- { this->smtpHost = smtpHost; }
+ { this->smtpHost.assign(smtpHost); }
/**
Returns value of the <b>SMTPHost</b> option.
@@ -210,7 +210,7 @@
comma separated list of e-mail address of the recipients.
*/
inline void setTo(const LogString& to)
- { this->to = to; }
+ { this->to.assign(to); }
/**
Returns value of the <b>BufferSize</b> option.
@@ -246,6 +246,11 @@
*/
inline bool getLocationInfo() const
{ return locationInfo; }
+
+ private:
+ SMTPAppender(const SMTPAppender&);
+ SMTPAppender& operator=(const SMTPAppender&);
+
}; // class SMTPAppender
class LOG4CXX_EXPORT DefaultEvaluator :
1.2 +2 -2 logging-log4cxx/include/log4cxx/private/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/private/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am 4 May 2005 16:13:41 -0000 1.1
+++ Makefile.am 7 May 2005 15:12:15 -0000 1.2
@@ -1,3 +1,3 @@
privateincdir = $(includedir)/log4cxx/private
-privateinc_HEADERS= $(top_srcdir)/include/log4cxx/private/*.h log4cxx.h
-DISTCLEANFILES = log4cxx.h
+privateinc_HEADERS= $(top_srcdir)/include/log4cxx/private/*.h log4cxx_private.h
+DISTCLEANFILES = log4cxx_private.h
1.1 logging-log4cxx/include/log4cxx/private/log4cxx_private.h.in
Index: log4cxx_private.h.in
===================================================================
/* 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_PRIVATE_LOG4CXX_H
#define LOG4CXX_PRIVATE_LOG4CXX_H
/* GENERATED FILE WARNING! DO NOT EDIT log4cxx_private.h
*
* You must modify log4cxx_private.h.in instead.
*
*/
#include <log4cxx/log4cxx.h>
#if !defined(LOG4CXX) && !defined(LOG4CXX_TEST)
#error "log4cxx/private/log4cxx_private.h should only be used within log4cxx implementation or tests"
#endif
#define LOG4CXX_HAS_STD_LOCALE 0
#define LOG4CXX_HAS_STD_WLOCALE 1
#define LOG4CXX_RETURN_AFTER_THROW 0
#define LOG4CXX_HAS_STD_WCOUT 1
#define LOG4CXX_HAS_STD_WLOCALE 1
typedef long long log4cxx_int64_t;
typedef log4cxx_int64_t log4cxx_time_t;
typedef int log4cxx_status_t;
//
// unsigned int same size as void*
//
typedef unsigned int log4cxx_intptr_t;
#define LOG4CXX_LOCALE_ENCODING_UTF8 0
#define LOG4CXX_LOCALE_ENCODING_ISO_8859_1 0
#define LOG4CXX_LOCALE_ENCODING_US_ASCII 0
//
// Capabilities should be checked in client code by
// attempting creation of the corresponding appender.
//
#define LOG4CXX_HAVE_XML 1
#define LOG4CXX_HAVE_SMTP 0
#define LOG4CXX_HAVE_SYSLOG 1
#endif
1.1 logging-log4cxx/include/log4cxx/private/log4cxx_private.hw
Index: log4cxx_private.hw
===================================================================
/* 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_PRIVATE_LOG4CXX_H
#define LOG4CXX_PRIVATE_LOG4CXX_H
/* GENERATED FILE WARNING! DO NOT EDIT log4cxx.h
*
* You must modify log4cxx.hw instead.
*
*
* This is the Win32 specific version of log4cxx.h.
*/
#include <log4cxx/log4cxx.h>
#if !defined(LOG4CXX) && !defined(LOG4CXX_TEST)
#error "log4cxx/private/log4cxx.h should only be used within log4cxx and tests implementation"
#endif
#define LOG4CXX_HAVE_SYSLOG 0
#if defined(_MSC_VER)
#define LOG4CXX_HAVE_XML 1
#endif
#if !defined(__BORLANDC__)
#define LOG4CXX_RETURN_AFTER_THROW 1
#else
#define LOG4CXX_RETURN_AFTER_THROW 0
#endif
#define LOG4CXX_HAS_STD_LOCALE 1
#if defined(__GNUC__)
#define LOG4CXX_HAS_STD_WLOCALE 0
#else
#define LOG4CXX_HAS_STD_WLOCALE 1
#endif
#define LOG4CXX_HAS_STD_WCOUT 1
#define LOG4CXX_HAS_STD_WLOCALE 1
#if defined(LOG4CXX_STATIC)
#define LOG4CXX_EXPORT
#else
#ifdef LOG4CXX
#define LOG4CXX_EXPORT __declspec(dllexport)
#else
#define LOG4CXX_EXPORT __declspec(dllimport)
#endif
#endif
#if defined(_WIN64)
typedef unsigned long long log4cxx_intptr_t;
#else
typedef unsigned int log4cxx_intptr_t;
#endif
#endif
1.7 +7 -1 logging-log4cxx/src/charsetdecoder.cpp
Index: charsetdecoder.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/charsetdecoder.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- charsetdecoder.cpp 29 Apr 2005 16:03:11 -0000 1.6
+++ charsetdecoder.cpp 7 May 2005 15:12:15 -0000 1.7
@@ -415,7 +415,13 @@
}
CharsetDecoder* CharsetDecoder::createDefaultDecoder() {
-#if LOG4CXX_HAS_WCHAR_T
+#if LOG4CXX_LOCALE_ENCODING_UTF8
+ return new UTF8CharsetDecoder();
+#elif LOG4CXX_LOCALE_ENCODING_ISO_8859_1
+ return new ISOLatinCharsetDecoder();
+#elif LOG4CXX_LOCALE_ENCODING_US_ASCII
+ return new USASCIICharsetDecoder();
+#elif LOG4CXX_HAS_WCHAR_T
return new MbstowcsCharsetDecoder();
#else
return new APRCharsetDecoder(APR_LOCALE_CHARSET);
1.7 +7 -1 logging-log4cxx/src/charsetencoder.cpp
Index: charsetencoder.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/charsetencoder.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- charsetencoder.cpp 29 Apr 2005 16:03:11 -0000 1.6
+++ charsetencoder.cpp 7 May 2005 15:12:15 -0000 1.7
@@ -468,7 +468,13 @@
}
CharsetEncoder* CharsetEncoder::createDefaultEncoder() {
-#if LOG4CXX_HAS_WCHAR_T
+#if LOG4CXX_LOCALE_ENCODING_UTF8
+ return new UTF8CharsetEncoder();
+#elif LOG4CXX_LOCALE_ENCODING_ISO_8859_1
+ return new ISOLatinCharsetEncoder();
+#elif LOG4CXX_LOCALE_ENCODING_US_ASCII
+ return new USASCIICharsetEncoder();
+#elif LOG4CXX_HAS_WCHAR_T
return new WcstombsCharsetEncoder();
#else
return new APRCharsetEncoder(APR_LOCALE_CHARSET);
1.21 +1 -1 logging-log4cxx/src/class.cpp
Index: class.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/class.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- class.cpp 4 May 2005 16:13:41 -0000 1.20
+++ class.cpp 7 May 2005 15:12:15 -0000 1.21
@@ -19,7 +19,7 @@
#include <log4cxx/helpers/object.h>
#include <map>
#include <log4cxx/helpers/stringhelper.h>
-#include <log4cxx/private/log4cxx.h>
+#include <log4cxx/private/log4cxx_private.h>
using namespace log4cxx;
using namespace log4cxx::helpers;
1.25 +1 -1 logging-log4cxx/src/domconfigurator.cpp
Index: domconfigurator.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/domconfigurator.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- domconfigurator.cpp 4 May 2005 16:13:41 -0000 1.24
+++ domconfigurator.cpp 7 May 2005 15:12:15 -0000 1.25
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <log4cxx/private/log4cxx.h>
+#include <log4cxx/private/log4cxx_private.h>
#ifdef LOG4CXX_HAVE_XML
#if defined(_WIN32)
1.30 +1 -1 logging-log4cxx/src/logger.cpp
Index: logger.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/logger.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- logger.cpp 4 May 2005 16:13:41 -0000 1.29
+++ logger.cpp 7 May 2005 15:12:15 -0000 1.30
@@ -29,7 +29,7 @@
#include <log4cxx/helpers/appenderattachableimpl.h>
#include <log4cxx/helpers/exception.h>
#include <log4cxx/helpers/aprinitializer.h>
-#include <log4cxx/private/log4cxx.h>
+#include <log4cxx/private/log4cxx_private.h>
using namespace log4cxx;
using namespace log4cxx::helpers;
1.15 +1 -1 logging-log4cxx/src/loglog.cpp
Index: loglog.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/loglog.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- loglog.cpp 4 May 2005 16:13:41 -0000 1.14
+++ loglog.cpp 7 May 2005 15:12:15 -0000 1.15
@@ -17,7 +17,7 @@
#include <log4cxx/helpers/loglog.h>
#include <log4cxx/helpers/transcoder.h>
#include <iostream>
-#include <log4cxx/private/log4cxx.h>
+#include <log4cxx/private/log4cxx_private.h>
using namespace log4cxx;
using namespace log4cxx::helpers;
1.17 +1 -1 logging-log4cxx/src/msxml.cpp
Index: msxml.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/msxml.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- msxml.cpp 4 May 2005 19:17:35 -0000 1.16
+++ msxml.cpp 7 May 2005 15:12:15 -0000 1.17
@@ -16,7 +16,7 @@
#define _WIN32_DCOM
-#include <log4cxx/private/log4cxx.h>
+#include <log4cxx/private/log4cxx_private.h>
#if LOG4CXX_HAVE_XML
#ifdef _WIN32
1.10 +1 -1 logging-log4cxx/src/propertyresourcebundle.cpp
Index: propertyresourcebundle.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/propertyresourcebundle.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- propertyresourcebundle.cpp 4 May 2005 16:13:41 -0000 1.9
+++ propertyresourcebundle.cpp 7 May 2005 15:12:15 -0000 1.10
@@ -16,7 +16,7 @@
#include <log4cxx/helpers/propertyresourcebundle.h>
#include <log4cxx/helpers/exception.h>
-#include <log4cxx/private/log4cxx.h>
+#include <log4cxx/private/log4cxx_private.h>
using namespace log4cxx;
using namespace log4cxx::helpers;
1.18 +1 -1 logging-log4cxx/src/simpledateformat.cpp
Index: simpledateformat.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/simpledateformat.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- simpledateformat.cpp 4 May 2005 15:55:39 -0000 1.17
+++ simpledateformat.cpp 7 May 2005 15:12:15 -0000 1.18
@@ -13,7 +13,7 @@
#include <log4cxx/helpers/transcoder.h>
#include <log4cxx/helpers/stringhelper.h>
#include <assert.h>
-#include <log4cxx/private/log4cxx.h>
+#include <log4cxx/private/log4cxx_private.h>
using namespace log4cxx;
using namespace log4cxx::helpers;
1.12 +1 -1 logging-log4cxx/src/smtpappender.cpp
Index: smtpappender.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/smtpappender.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- smtpappender.cpp 4 May 2005 16:13:41 -0000 1.11
+++ smtpappender.cpp 7 May 2005 15:12:15 -0000 1.12
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <log4cxx/private/log4cxx.h>
+#include <log4cxx/private/log4cxx_private.h>
#if LOG4CXX_HAVE_SMTP
#include <log4cxx/net/smtpappender.h>
1.22 +1 -1 logging-log4cxx/src/stringhelper.cpp
Index: stringhelper.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/stringhelper.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- stringhelper.cpp 4 May 2005 16:13:41 -0000 1.21
+++ stringhelper.cpp 7 May 2005 15:12:15 -0000 1.22
@@ -22,7 +22,7 @@
#include <locale>
#include <apr_strings.h>
#include <log4cxx/helpers/pool.h>
-#include <log4cxx/private/log4cxx.h>
+#include <log4cxx/private/log4cxx_private.h>
using namespace log4cxx;
using namespace log4cxx::helpers;
1.14 +1 -1 logging-log4cxx/src/stringtokenizer.cpp
Index: stringtokenizer.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/stringtokenizer.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- stringtokenizer.cpp 4 May 2005 16:13:41 -0000 1.13
+++ stringtokenizer.cpp 7 May 2005 15:12:15 -0000 1.14
@@ -16,7 +16,7 @@
#include <log4cxx/helpers/stringtokenizer.h>
#include <log4cxx/helpers/exception.h>
-#include <log4cxx/private/log4cxx.h>
+#include <log4cxx/private/log4cxx_private.h>
using namespace log4cxx;
using namespace log4cxx::helpers;
1.12 +1 -1 logging-log4cxx/tests/src/customlogger/xloggertestcase.cpp
Index: xloggertestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/customlogger/xloggertestcase.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xloggertestcase.cpp 4 May 2005 16:13:42 -0000 1.11
+++ xloggertestcase.cpp 7 May 2005 15:12:16 -0000 1.12
@@ -15,7 +15,7 @@
*/
#define LOG4CXX_TEST 1
-#include <log4cxx/private/log4cxx.h>
+#include <log4cxx/private/log4cxx_private.h>
#ifdef LOG4CXX_HAVE_XML
1.4 +1 -1 logging-log4cxx/tests/src/db/odbcappendertestcase.cpp
Index: odbcappendertestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/db/odbcappendertestcase.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- odbcappendertestcase.cpp 4 May 2005 16:13:42 -0000 1.3
+++ odbcappendertestcase.cpp 7 May 2005 15:12:16 -0000 1.4
@@ -20,7 +20,7 @@
#include "../appenderskeletontestcase.h"
#define LOG4CXX_TEST 1
-#include <log4cxx/private/log4cxx.h>
+#include <log4cxx/private/log4cxx_private.h>
#ifdef LOG4CXX_HAVE_ODBC
1.11 +1 -1 logging-log4cxx/tests/src/defaultinit/testcase2.cpp
Index: testcase2.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/defaultinit/testcase2.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- testcase2.cpp 4 May 2005 16:13:42 -0000 1.10
+++ testcase2.cpp 7 May 2005 15:12:16 -0000 1.11
@@ -15,7 +15,7 @@
*/
#define LOG4CXX_TEST 1
-#include <log4cxx/private/log4cxx.h>
+#include <log4cxx/private/log4cxx_private.h>
#ifdef LOG4CXX_HAVE_XML
1.11 +1 -1 logging-log4cxx/tests/src/defaultinit/testcase4.cpp
Index: testcase4.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/defaultinit/testcase4.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- testcase4.cpp 4 May 2005 16:13:42 -0000 1.10
+++ testcase4.cpp 7 May 2005 15:12:16 -0000 1.11
@@ -15,7 +15,7 @@
*/
#define LOG4CXX_TEST 1
-#include <log4cxx/private/log4cxx.h>
+#include <log4cxx/private/log4cxx_private.h>
#ifdef LOG4CXX_HAVE_XML
1.14 +1 -1 logging-log4cxx/tests/src/helpers/cacheddateformattestcase.cpp
Index: cacheddateformattestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/helpers/cacheddateformattestcase.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cacheddateformattestcase.cpp 4 May 2005 15:55:39 -0000 1.13
+++ cacheddateformattestcase.cpp 7 May 2005 15:12:16 -0000 1.14
@@ -44,7 +44,7 @@
#endif
#define LOG4CXX_TEST 1
-#include <log4cxx/private/log4cxx.h>
+#include <log4cxx/private/log4cxx_private.h>
/**
1.14 +1 -1 logging-log4cxx/tests/src/helpers/datetimedateformattestcase.cpp
Index: datetimedateformattestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/helpers/datetimedateformattestcase.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- datetimedateformattestcase.cpp 4 May 2005 15:55:39 -0000 1.13
+++ datetimedateformattestcase.cpp 7 May 2005 15:12:16 -0000 1.14
@@ -38,7 +38,7 @@
#endif
#define LOG4CXX_TEST 1
-#include <log4cxx/private/log4cxx.h>
+#include <log4cxx/private/log4cxx_private.h>
#if LOG4CXX_HAS_STD_LOCALE
1.4 +1 -1 logging-log4cxx/tests/src/net/smtpappendertestcase.cpp
Index: smtpappendertestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/net/smtpappendertestcase.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- smtpappendertestcase.cpp 4 May 2005 16:13:42 -0000 1.3
+++ smtpappendertestcase.cpp 7 May 2005 15:12:16 -0000 1.4
@@ -21,7 +21,7 @@
#include "../appenderskeletontestcase.h"
#define LOG4CXX_TEST 1
-#include <log4cxx/private/log4cxx.h>
+#include <log4cxx/private/log4cxx_private.h>
#if LOG4CXX_HAVE_SMTP
1.12 +1 -1 logging-log4cxx/tests/src/varia/errorhandlertestcase.cpp
Index: errorhandlertestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/varia/errorhandlertestcase.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- errorhandlertestcase.cpp 4 May 2005 16:13:42 -0000 1.11
+++ errorhandlertestcase.cpp 7 May 2005 15:12:16 -0000 1.12
@@ -15,7 +15,7 @@
*/
#define LOG4CXX_TEST 1
-#include <log4cxx/private/log4cxx.h>
+#include <log4cxx/private/log4cxx_private.h>
#ifdef LOG4CXX_HAVE_XML
1.10 +1 -1 logging-log4cxx/tests/src/xml/customleveltestcase.cpp
Index: customleveltestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/xml/customleveltestcase.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- customleveltestcase.cpp 4 May 2005 16:13:42 -0000 1.9
+++ customleveltestcase.cpp 7 May 2005 15:12:16 -0000 1.10
@@ -15,7 +15,7 @@
*/
#define LOG4CXX_TEST 1
-#include <log4cxx/private/log4cxx.h>
+#include <log4cxx/private/log4cxx_private.h>
#ifdef LOG4CXX_HAVE_XML