Remove class DefaultLoggerFactory in the next ABI

apache · Jul 14, 2024 · 4232df4 · 4232df4
1 parent 9c3366a
commit 4232df4
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/src/main/cpp/domconfigurator.cpp b/src/main/cpp/domconfigurator.cpp
@@ -30,7 +30,11 @@
 #include <log4cxx/config/propertysetter.h>
 #include <log4cxx/spi/errorhandler.h>
 #include <log4cxx/spi/loggerfactory.h>
+#if LOG4CXX_ABI_VERSION <= 15
 #include <log4cxx/defaultloggerfactory.h>
+#else
+#include <log4cxx/loggerfactory.h>
+#endif
 #include <log4cxx/helpers/filewatchdog.h>
 #include <log4cxx/spi/loggerrepository.h>
 #include <log4cxx/spi/loggingevent.h>
@@ -819,7 +823,11 @@ spi::ConfigurationStatus DOMConfigurator::doConfigure(const File& filename, spi:
 		LogLog::debug(msg);
 	}
 
+#if LOG4CXX_ABI_VERSION <= 15
 	m_priv->loggerFactory = std::make_shared<DefaultLoggerFactory>();
+#else
+	m_priv->loggerFactory = std::make_shared<LoggerFactory>();
+#endif
 
 	Pool p;
 	apr_file_t* fd;

diff --git a/src/main/cpp/propertyconfigurator.cpp b/src/main/cpp/propertyconfigurator.cpp
@@ -75,7 +75,12 @@ PropertyWatchdog* PropertyConfigurator::pdog = NULL;
 IMPLEMENT_LOG4CXX_OBJECT(PropertyConfigurator)
 
 PropertyConfigurator::PropertyConfigurator()
-	: registry(new std::map<LogString, AppenderPtr>()), loggerFactory(new DefaultLoggerFactory())
+	: registry(new std::map<LogString, AppenderPtr>())
+#if LOG4CXX_ABI_VERSION <= 15
+	, loggerFactory(new DefaultLoggerFactory())
+#else
+	, loggerFactory(new LoggerFactory())
+#endif
 {
 }
 

diff --git a/src/main/include/log4cxx/logmanager.h b/src/main/include/log4cxx/logmanager.h
@@ -80,7 +80,7 @@ class LOG4CXX_EXPORT LogManager
 		/**
 		Retrieve the \c name Logger instance from the
 		{@link spi::LoggerRepository LoggerRepository}
-		using DefaultLoggerFactory to create it if required.
+		using LoggerFactory to create it if required.
 
 		Calls {@link spi::LoggerRepository::ensureIsConfigured ensureIsConfigured} passing {@link DefaultConfigurator::configure} to ensure
 		the repository is configured.
@@ -105,7 +105,7 @@ class LOG4CXX_EXPORT LogManager
 		/**
 		Retrieve the \c name Logger instance from the
 		{@link spi::LoggerRepository LoggerRepository}
-		using DefaultLoggerFactory to create it if required.
+		using LoggerFactory to create it if required.
 
 		Calls {@link spi::LoggerRepository::ensureIsConfigured ensureIsConfigured} passing {@link DefaultConfigurator::configure} to ensure
 		the repository is configured.
@@ -130,7 +130,7 @@ class LOG4CXX_EXPORT LogManager
 		/**
 		Retrieve the \c name Logger instance from the
 		{@link spi::LoggerRepository LoggerRepository}
-		using DefaultLoggerFactory to create it if required.
+		using LoggerFactory to create it if required.
 
 		Calls {@link spi::LoggerRepository::ensureIsConfigured ensureIsConfigured}
 		passing {@link DefaultConfigurator::configure} to ensure
@@ -157,7 +157,7 @@ class LOG4CXX_EXPORT LogManager
 		/**
 		Retrieve the \c name Logger instance from the
 		{@link spi::LoggerRepository LoggerRepository}
-		using DefaultLoggerFactory to create it if required.
+		using LoggerFactory to create it if required.
 
 		Calls {@link spi::LoggerRepository::ensureIsConfigured ensureIsConfigured}
 		passing {@link DefaultConfigurator::configure} to ensure
@@ -185,7 +185,7 @@ class LOG4CXX_EXPORT LogManager
 		/**
 		Retrieve the \c name Logger instance from the
 		{@link spi::LoggerRepository LoggerRepository}
-		using DefaultLoggerFactory to create it if required.
+		using LoggerFactory to create it if required.
 
 		Calls {@link spi::LoggerRepository::ensureIsConfigured ensureIsConfigured}
 		passing {@link DefaultConfigurator::configure} to ensure

diff --git a/src/test/cpp/customlogger/xlogger.h b/src/test/cpp/customlogger/xlogger.h
@@ -44,7 +44,11 @@ class XFactory :
 
 		XFactory();
 
+#if LOG4CXX_ABI_VERSION <= 15
+		LoggerPtr makeNewLoggerInstance(const LogString& name) const;
+#else
 		LoggerPtr makeNewLoggerInstance(const LogString& name) const override;
+#endif
 
 #if LOG4CXX_ABI_VERSION <= 15
 		LoggerPtr makeNewLoggerInstance(