Author: grobmeier
Date: Sun Aug 2 15:01:32 2009
New Revision: 800094
URL: http://svn.apache.org/viewvc?rev=800094&view=rev
Log:
LOG4PHP-67: Refactoring: Use Logger instead of LoggerManager
Added:
incubator/log4php/trunk/src/site/apt/upgrading.apt
incubator/log4php/trunk/src/test/php/LoggerTest.php (contents, props
changed)
- copied, changed from r800084,
incubator/log4php/trunk/src/test/php/LoggerManagerTest.php
Removed:
incubator/log4php/trunk/src/test/php/LoggerManagerTest.php
Modified:
incubator/log4php/trunk/src/changes/changes.xml
incubator/log4php/trunk/src/examples/php/cache.php
incubator/log4php/trunk/src/examples/php/client.php
incubator/log4php/trunk/src/examples/php/console.php
incubator/log4php/trunk/src/examples/php/dailyfile.php
incubator/log4php/trunk/src/examples/php/echo.php
incubator/log4php/trunk/src/examples/php/file.php
incubator/log4php/trunk/src/examples/php/levelmatchfilter.php
incubator/log4php/trunk/src/examples/php/levelrangefilter.php
incubator/log4php/trunk/src/examples/php/mail.php
incubator/log4php/trunk/src/examples/php/mdc.php
incubator/log4php/trunk/src/examples/php/ndc.php
incubator/log4php/trunk/src/examples/php/php.php
incubator/log4php/trunk/src/examples/php/server.php
incubator/log4php/trunk/src/examples/php/simple.php
incubator/log4php/trunk/src/examples/php/stringmatchfilter.php
incubator/log4php/trunk/src/examples/php/syslog.php
incubator/log4php/trunk/src/main/php/Logger.php
incubator/log4php/trunk/src/main/php/LoggerHierarchy.php
incubator/log4php/trunk/src/main/php/LoggerLoggingEvent.php
incubator/log4php/trunk/src/main/php/LoggerManager.php
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorBasic.php
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorIni.php
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorPhp.php
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorXml.php
incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutPattern.php
incubator/log4php/trunk/src/site/site.xml
incubator/log4php/trunk/src/test/php/bootstrap.php
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorBasicTest.php
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorIniTest.php
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorPhpTest.php
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorXmlTest.php
Modified: incubator/log4php/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/changes/changes.xml?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
--- incubator/log4php/trunk/src/changes/changes.xml (original)
+++ incubator/log4php/trunk/src/changes/changes.xml Sun Aug 2 15:01:32 2009
@@ -65,6 +65,7 @@
<action type="update" issue="LOG4PHP-63">PDOAppender should
throw LoggerException on database problems (Christian Hammers)</action>
<action type="fix" issue="LOG4PHP-64">Remove deprecated
call-by-reference in LoggerLayoutPattern (Christian Hammers)</action>
<action type="fix"
issue="LOG4PHP-66">LoggerConfiguratorBasicTest fails in "mvn test" but not in
phpunit (Christian Hammers)</action>
+ <action type="fix" issue="LOG4PHP-67">Refactoring: Use Logger
instead of LoggerManager (Christian Hammers)</action>
<action type="update">Initial port to PHP 5 (Knut
Urdalen)</action>
<action type="update">Established new unit test suite (Knut
Urdalen)</action>
<action type="update">Added a range of examples (Knut
Urdalen)</action>
Modified: incubator/log4php/trunk/src/examples/php/cache.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/cache.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/cache.php (original)
+++ incubator/log4php/trunk/src/examples/php/cache.php Sun Aug 2 15:01:32 2009
@@ -18,7 +18,7 @@
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
define('LOG4PHP_CONFIGURATION',
dirname(__FILE__).'/../resources/cache.properties');
-require_once LOG4PHP_DIR.'/LoggerManager.php';
+require_once LOG4PHP_DIR.'/Logger.php';
$cache = '../../../target/examples/hierarchy.cache';
@@ -27,7 +27,7 @@
if(!is_dir($dir)) {
mkdir($dir, 0777, true);
}
- $hierarchy = LoggerManager::getLoggerRepository();
+ $hierarchy = Logger::getLoggerRepository();
file_put_contents($cache, serialize($hierarchy));
}
$hierarchy = unserialize(file_get_contents($cache));
Modified: incubator/log4php/trunk/src/examples/php/client.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/client.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/client.php (original)
+++ incubator/log4php/trunk/src/examples/php/client.php Sun Aug 2 15:01:32 2009
@@ -18,7 +18,7 @@
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
define('LOG4PHP_CONFIGURATION',
dirname(__FILE__).'/../resources/client.properties');
-require_once LOG4PHP_DIR.'/LoggerManager.php';
-$logger = LoggerManager::getRootLogger();
+require_once LOG4PHP_DIR.'/Logger.php';
+$logger = Logger::getRootLogger();
$logger->info("Hello World!");
?>
Modified: incubator/log4php/trunk/src/examples/php/console.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/console.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/console.php (original)
+++ incubator/log4php/trunk/src/examples/php/console.php Sun Aug 2 15:01:32
2009
@@ -18,7 +18,7 @@
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
define('LOG4PHP_CONFIGURATION',
dirname(__FILE__).'/../resources/console.properties');
-require_once LOG4PHP_DIR.'/LoggerManager.php';
-$logger = LoggerManager::getRootLogger();
+require_once LOG4PHP_DIR.'/Logger.php';
+$logger = Logger::getRootLogger();
$logger->debug("Hello World!");
?>
Modified: incubator/log4php/trunk/src/examples/php/dailyfile.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/dailyfile.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/dailyfile.php (original)
+++ incubator/log4php/trunk/src/examples/php/dailyfile.php Sun Aug 2 15:01:32
2009
@@ -18,7 +18,7 @@
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
define('LOG4PHP_CONFIGURATION',
dirname(__FILE__).'/../resources/dailyfile.properties');
-require_once LOG4PHP_DIR.'/LoggerManager.php';
-$logger = LoggerManager::getRootLogger();
+require_once LOG4PHP_DIR.'/Logger.php';
+$logger = Logger::getRootLogger();
$logger->debug("Hello World!");
?>
Modified: incubator/log4php/trunk/src/examples/php/echo.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/echo.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/echo.php (original)
+++ incubator/log4php/trunk/src/examples/php/echo.php Sun Aug 2 15:01:32 2009
@@ -17,7 +17,7 @@
*/
define('LOG4PHP_CONFIGURATION',
dirname(__FILE__).'/../resources/echo.properties');
-require_once dirname(__FILE__).'/../../main/php/LoggerManager.php';
-$logger = LoggerManager::getLogger('echo-example');
+require_once dirname(__FILE__).'/../../main/php/Logger.php';
+$logger = Logger::getLogger('echo-example');
$logger->debug("Hello World!");
?>
Modified: incubator/log4php/trunk/src/examples/php/file.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/file.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/file.php (original)
+++ incubator/log4php/trunk/src/examples/php/file.php Sun Aug 2 15:01:32 2009
@@ -18,7 +18,7 @@
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
define('LOG4PHP_CONFIGURATION',
dirname(__FILE__).'/../resources/file.properties');
-require_once LOG4PHP_DIR.'/LoggerManager.php';
-$logger = LoggerManager::getRootLogger();
+require_once LOG4PHP_DIR.'/Logger.php';
+$logger = Logger::getRootLogger();
$logger->debug("Hello World!");
?>
Modified: incubator/log4php/trunk/src/examples/php/levelmatchfilter.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/levelmatchfilter.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/levelmatchfilter.php (original)
+++ incubator/log4php/trunk/src/examples/php/levelmatchfilter.php Sun Aug 2
15:01:32 2009
@@ -18,8 +18,8 @@
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
define('LOG4PHP_CONFIGURATION',
dirname(__FILE__).'/../resources/levelmatchfilter.xml');
-require_once LOG4PHP_DIR.'/LoggerManager.php';
-$logger = LoggerManager::getRootLogger();
+require_once LOG4PHP_DIR.'/Logger.php';
+$logger = Logger::getRootLogger();
$logger->debug("Matching and will be rejected");
$logger->info("Not matching and will be accepted");
?>
Modified: incubator/log4php/trunk/src/examples/php/levelrangefilter.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/levelrangefilter.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/levelrangefilter.php (original)
+++ incubator/log4php/trunk/src/examples/php/levelrangefilter.php Sun Aug 2
15:01:32 2009
@@ -18,8 +18,8 @@
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
define('LOG4PHP_CONFIGURATION',
dirname(__FILE__).'/../resources/levelrangefilter.xml');
-require_once LOG4PHP_DIR.'/LoggerManager.php';
-$logger = LoggerManager::getRootLogger();
+require_once LOG4PHP_DIR.'/Logger.php';
+$logger = Logger::getRootLogger();
$logger->debug("This is a debug message");
$logger->info("This is an info message");
$logger->warn("This is a warning");
Modified: incubator/log4php/trunk/src/examples/php/mail.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/mail.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/mail.php (original)
+++ incubator/log4php/trunk/src/examples/php/mail.php Sun Aug 2 15:01:32 2009
@@ -18,7 +18,7 @@
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
define('LOG4PHP_CONFIGURATION',
dirname(__FILE__).'/../resources/mail.properties');
-require_once LOG4PHP_DIR.'/LoggerManager.php';
-$logger = LoggerManager::getRootLogger();
+require_once LOG4PHP_DIR.'/Logger.php';
+$logger = Logger::getRootLogger();
$logger->fatal("Some critical message!");
?>
Modified: incubator/log4php/trunk/src/examples/php/mdc.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/mdc.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/mdc.php (original)
+++ incubator/log4php/trunk/src/examples/php/mdc.php Sun Aug 2 15:01:32 2009
@@ -18,10 +18,10 @@
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
define('LOG4PHP_CONFIGURATION',
dirname(__FILE__).'/../resources/mdc.properties');
-require_once LOG4PHP_DIR.'/LoggerManager.php';
+require_once LOG4PHP_DIR.'/Logger.php';
LoggerMDC::put('username', 'knut');
-$logger = LoggerManager::getRootLogger();
+$logger = Logger::getRootLogger();
$logger->debug("Testing MDC");
?>
Modified: incubator/log4php/trunk/src/examples/php/ndc.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/ndc.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/ndc.php (original)
+++ incubator/log4php/trunk/src/examples/php/ndc.php Sun Aug 2 15:01:32 2009
@@ -18,9 +18,9 @@
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
define('LOG4PHP_CONFIGURATION',
dirname(__FILE__).'/../resources/mdc.properties');
-require_once LOG4PHP_DIR.'/LoggerManager.php';
+require_once LOG4PHP_DIR.'/Logger.php';
-$logger = LoggerManager::getRootLogger();
+$logger = Logger::getRootLogger();
LoggerNDC::push('Context Message');
Modified: incubator/log4php/trunk/src/examples/php/php.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/php.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/php.php (original)
+++ incubator/log4php/trunk/src/examples/php/php.php Sun Aug 2 15:01:32 2009
@@ -18,7 +18,7 @@
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
define('LOG4PHP_CONFIGURATION',
dirname(__FILE__).'/../resources/php.properties');
-require_once LOG4PHP_DIR.'/LoggerManager.php';
-$logger = LoggerManager::getRootLogger();
+require_once LOG4PHP_DIR.'/Logger.php';
+$logger = Logger::getRootLogger();
$logger->debug("Hello PHP!");
?>
Modified: incubator/log4php/trunk/src/examples/php/server.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/server.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/server.php (original)
+++ incubator/log4php/trunk/src/examples/php/server.php Sun Aug 2 15:01:32 2009
@@ -17,7 +17,7 @@
*/
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
define('LOG4PHP_CONFIGURATION',
dirname(__FILE__).'/../resources/server.properties');
-require_once LOG4PHP_DIR.'/LoggerManager.php';
+require_once LOG4PHP_DIR.'/Logger.php';
require_once 'Net/Server.php';
require_once 'Net/Server/Handler.php';
@@ -27,7 +27,7 @@
var $hierarchy;
function onStart() {
- $this->hierarchy = LoggerManager::getLoggerRepository();
+ $this->hierarchy = Logger::getLoggerRepository();
}
function onReceiveData($clientId = 0, $data = "") {
Modified: incubator/log4php/trunk/src/examples/php/simple.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/simple.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/simple.php (original)
+++ incubator/log4php/trunk/src/examples/php/simple.php Sun Aug 2 15:01:32 2009
@@ -17,21 +17,21 @@
*/
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
-require_once LOG4PHP_DIR.'/LoggerManager.php';
+require_once LOG4PHP_DIR.'/Logger.php';
class Log4phpTest {
private $_logger;
public function Log4phpTest() {
- $this->_logger = LoggerManager::getLogger('Log4phpTest');
+ $this->_logger = Logger::getLogger('Log4phpTest');
$this->_logger->debug('Hello!');
}
}
function Log4phpTestFunction() {
- $logger = LoggerManager::getLogger('Log4phpTestFunction');
+ $logger = Logger::getLogger('Log4phpTestFunction');
$logger->debug('Hello again!');
}
@@ -39,6 +39,6 @@
Log4phpTestFunction();
// Safely close all appenders with...
-LoggerManager::shutdown();
+Logger::shutdown();
?>
Modified: incubator/log4php/trunk/src/examples/php/stringmatchfilter.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/stringmatchfilter.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/stringmatchfilter.php (original)
+++ incubator/log4php/trunk/src/examples/php/stringmatchfilter.php Sun Aug 2
15:01:32 2009
@@ -18,8 +18,8 @@
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
define('LOG4PHP_CONFIGURATION',
dirname(__FILE__).'/../resources/stringmatchfilter.xml');
-require_once LOG4PHP_DIR.'/LoggerManager.php';
-$logger = LoggerManager::getRootLogger();
+require_once LOG4PHP_DIR.'/Logger.php';
+$logger = Logger::getRootLogger();
$logger->debug("Some text to match that will be rejected");
$logger->info("Some other text that will be accepted");
?>
Modified: incubator/log4php/trunk/src/examples/php/syslog.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/syslog.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/syslog.php (original)
+++ incubator/log4php/trunk/src/examples/php/syslog.php Sun Aug 2 15:01:32 2009
@@ -18,7 +18,7 @@
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
define('LOG4PHP_CONFIGURATION',
dirname(__FILE__).'/../resources/syslog.properties');
-require_once LOG4PHP_DIR.'/LoggerManager.php';
-$logger = LoggerManager::getRootLogger();
+require_once LOG4PHP_DIR.'/Logger.php';
+$logger = Logger::getRootLogger();
$logger->fatal("Hello World!");
?>
Modified: incubator/log4php/trunk/src/main/php/Logger.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/Logger.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/Logger.php (original)
+++ incubator/log4php/trunk/src/main/php/Logger.php Sun Aug 2 15:01:32 2009
@@ -18,6 +18,18 @@
*/
/**
+ * LOG4PHP_DIR points to the log4php root directory.
+ *
+ * If not defined it will be set automatically when the first package
classfile
+ * is included
+ *
+ * @var string
+ */
+if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__));
+
+spl_autoload_register(array('Logger', 'autoload'));
+
+/**
* This is the central class in the log4j package. Most logging operations,
* except configuration, are done through this class.
*
@@ -57,8 +69,82 @@
/** @var Logger The parent of this category. Null if this is the root
logger*/
private $parent = null;
-// /** @var LoggerHierarchy the object repository */
-// private $repository = null;
+ private static $_classes = array(
+ 'Logger' => '/Logger.php',
+ 'LoggerException' => '/LoggerException.php',
+ 'LoggerHierarchy' => '/LoggerHierarchy.php',
+ 'LoggerLayout' => '/LoggerLayout.php',
+ 'LoggerLevel' => '/LoggerLevel.php',
+ 'LoggerMDC' => '/LoggerMDC.php',
+ 'LoggerNDC' => '/LoggerNDC.php',
+ 'LoggerReflectionUtils' => '/LoggerReflectionUtils.php',
+ 'LoggerConfigurator' => '/LoggerConfigurator.php',
+ 'LoggerConfiguratorBasic' =>
'/configurators/LoggerConfiguratorBasic.php',
+ 'LoggerConfiguratorIni' =>
'/configurators/LoggerConfiguratorIni.php',
+ 'LoggerConfiguratorPhp' =>
'/configurators/LoggerConfiguratorPhp.php',
+ 'LoggerConfiguratorXml' =>
'/configurators/LoggerConfiguratorXml.php',
+ 'LoggerRoot' => '/LoggerRoot.php',
+ 'LoggerAppender' => '/LoggerAppender.php',
+ 'LoggerAppenderAdodb' => '/appenders/LoggerAppenderAdodb.php',
+ 'LoggerAppenderPDO' => '/appenders/LoggerAppenderPDO.php',
+ 'LoggerAppenderConsole' =>
'/appenders/LoggerAppenderConsole.php',
+ 'LoggerAppenderDailyFile' =>
'/appenders/LoggerAppenderDailyFile.php',
+ 'LoggerAppenderEcho' => '/appenders/LoggerAppenderEcho.php',
+ 'LoggerAppenderFile' => '/appenders/LoggerAppenderFile.php',
+ 'LoggerAppenderMail' => '/appenders/LoggerAppenderMail.php',
+ 'LoggerAppenderMailEvent' =>
'/appenders/LoggerAppenderMailEvent.php',
+ 'LoggerAppenderNull' => '/appenders/LoggerAppenderNull.php',
+ 'LoggerAppenderPhp' => '/appenders/LoggerAppenderPhp.php',
+ 'LoggerAppenderRollingFile' =>
'/appenders/LoggerAppenderRollingFile.php',
+ 'LoggerAppenderSocket' => '/appenders/LoggerAppenderSocket.php',
+ 'LoggerAppenderSyslog' => '/appenders/LoggerAppenderSyslog.php',
+ 'LoggerFormattingInfo' => '/helpers/LoggerFormattingInfo.php',
+ 'LoggerOptionConverter' => '/helpers/LoggerOptionConverter.php',
+ 'LoggerPatternConverter' =>
'/helpers/LoggerPatternConverter.php',
+ 'LoggerBasicPatternConverter' =>
'/helpers/LoggerBasicPatternConverter.php',
+ 'LoggerCategoryPatternConverter' =>
'/helpers/LoggerCategoryPatternConverter.php',
+ 'LoggerClassNamePatternConverter' =>
'/helpers/LoggerClassNamePatternConverter.php',
+ 'LoggerDatePatternConverter' =>
'/helpers/LoggerDatePatternConverter.php',
+ 'LoggerLiteralPatternConverter' =>
'/helpers/LoggerLiteralPatternConverter.php',
+ 'LoggerLocationPatternConverter' =>
'/helpers/LoggerLocationPatternConverter.php',
+ 'LoggerMDCPatternConverter' =>
'/helpers/LoggerMDCPatternConverter.php',
+ 'LoggerNamedPatternConverter' =>
'/helpers/LoggerNamedPatternConverter.php',
+ 'LoggerBasicPatternConverter' =>
'/helpers/LoggerBasicPatternConverter.php',
+ 'LoggerLiteralPatternConverter' =>
'/helpers/LoggerLiteralPatternConverter.php',
+ 'LoggerDatePatternConverter' =>
'/helpers/LoggerDatePatternConverter.php',
+ 'LoggerMDCPatternConverter' =>
'/helpers/LoggerMDCPatternConverter.php',
+ 'LoggerLocationPatternConverter' =>
'/helpers/LoggerLocationPatternConverter.php',
+ 'LoggerNamedPatternConverter' =>
'/helpers/LoggerNamedPatternConverter.php',
+ 'LoggerClassNamePatternConverter' =>
'/helpers/LoggerClassNamePatternConverter.php',
+ 'LoggerCategoryPatternConverter' =>
'/helpers/LoggerCategoryPatternConverter.php',
+ 'LoggerPatternParser' => '/helpers/LoggerPatternParser.php',
+ 'LoggerLayoutHtml' => '/layouts/LoggerLayoutHtml.php',
+ 'LoggerLayoutSimple' => '/layouts/LoggerLayoutSimple.php',
+ 'LoggerLayoutTTCC' => '/layouts/LoggerLayoutTTCC.php',
+ 'LoggerLayoutPattern' => '/layouts/LoggerLayoutPattern.php',
+ 'LoggerLayoutXml' => '/layouts/LoggerLayoutXml.php',
+ 'LoggerRendererDefault' =>
'/renderers/LoggerRendererDefault.php',
+ 'LoggerRendererObject' => '/renderers/LoggerRendererObject.php',
+ 'LoggerRendererMap' => '/renderers/LoggerRendererMap.php',
+ 'LoggerLocationInfo' => '/LoggerLocationInfo.php',
+ 'LoggerLoggingEvent' => '/LoggerLoggingEvent.php',
+ 'LoggerFilter' => '/LoggerFilter.php',
+ 'LoggerFilterDenyAll' => '/filters/LoggerFilterDenyAll.php',
+ 'LoggerFilterLevelMatch' =>
'/filters/LoggerFilterLevelMatch.php',
+ 'LoggerFilterLevelRange' =>
'/filters/LoggerFilterLevelRange.php',
+ 'LoggerFilterStringMatch' =>
'/filters/LoggerFilterStringMatch.php',
+ );
+
+ /**
+ * Class autoloader
+ * This method is provided to be invoked within an __autoload() magic
method.
+ * @param string class name
+ */
+ public static function autoload($className) {
+ if(isset(self::$_classes[$className])) {
+ include LOG4PHP_DIR.self::$_classes[$className];
+ }
+ }
/**
* @var array collection of appenders
@@ -236,18 +322,35 @@
}
/**
- * Get a Logger by name (Delegate to {...@link LoggerManager})
+ * Get a Logger by name (Delegate to {...@link Logger})
*
* @param string $name logger name
* @param LoggerFactory $factory a {...@link LoggerFactory} instance or
null
* @return Logger
* @static
*/
- // TODO: remove method? confusing design
- public function getLogger($name) {
- return LoggerManager::getLogger($name);
+ public static function getLogger($name) {
+ return LoggerHierarchy::singleton()->getLogger($name);
+ }
+
+ /**
+ * Destroy loggers object tree.
+ *
+ * @static
+ * @return boolean
+ */
+ public static function resetConfiguration() {
+ return LoggerHierarchy::singleton()->resetConfiguration();
}
+ /**
+ * Safely close all appenders.
+ * @static
+ */
+ public static function shutdown() {
+ return LoggerHierarchy::singleton()->shutdown();
+ }
+
// /**
// * Return the the repository where this Category is attached.
// * @return LoggerHierarchy
@@ -278,20 +381,50 @@
// */
// // TODO: remove method? confusing design
// public function getRoot() {
-// return LoggerManager::getRootLogger();
+// return Logger::getRootLogger();
// }
/**
- * get the Root Logger (Delegate to {...@link LoggerManager})
+ * get the Root Logger (Delegate to {...@link Logger})
* @return LoggerRoot
* @static
*/
- // TODO: remove method? confusing design
public static function getRootLogger() {
- return LoggerManager::getRootLogger();
+ return LoggerHierarchy::singleton()->getRootLogger();
+ }
+
+ /**
+ * check if a given logger exists.
+ *
+ * @param string $name logger name
+ * @static
+ * @return boolean
+ */
+ public static function exists($name) {
+ return LoggerHierarchy::singleton()->exists($name);
+ }
+
+ /**
+ * Returns the LoggerHierarchy.
+ *
+ * @static
+ * @return LoggerHierarchy
+ */
+ public static function getLoggerRepository() {
+ return LoggerHierarchy::singleton();
}
/**
+ * Returns an array this whole Logger instances.
+ *
+ * @static
+ * @see Logger
+ * @return array
+ */
+ public static function getCurrentLoggers() {
+ return LoggerHierarchy::singleton()->getCurrentLoggers();
+ }
+ /**
* Is the appender passed as parameter attached to this category?
*
* @param LoggerAppender $appender
@@ -384,9 +517,9 @@
* @param LoggerHierarchy $repository
*/
// TODO: remove method?
- public function setHierarchy($repository) {
+// public function setHierarchy($repository) {
// $this->repository = $repository;
- }
+// }
/**
* Set the level of this Category.
@@ -404,3 +537,117 @@
$this->parent = $logger;
}
}
+
+
+// ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+
+if (!defined('LOG4PHP_DEFAULT_INIT_OVERRIDE')) {
+ if (isset($_ENV['log4php.defaultInitOverride'])) {
+ /**
+ * @ignore
+ */
+ define('LOG4PHP_DEFAULT_INIT_OVERRIDE',
+
LoggerOptionConverter::toBoolean($_ENV['log4php.defaultInitOverride'], false)
+ );
+ } elseif (isset($GLOBALS['log4php.defaultInitOverride'])) {
+ /**
+ * @ignore
+ */
+ define('LOG4PHP_DEFAULT_INIT_OVERRIDE',
+
LoggerOptionConverter::toBoolean($GLOBALS['log4php.defaultInitOverride'], false)
+ );
+ } else {
+ /**
+ * Controls init execution
+ *
+ * With this constant users can skip the default init procedure
that is
+ * called when this file is included.
+ *
+ * <p>If it is not user defined, log4php tries to autoconfigure
using (in order):</p>
+ *
+ * - the <code>$_ENV['log4php.defaultInitOverride']</code>
variable.
+ * - the <code>$GLOBALS['log4php.defaultInitOverride']</code>
global variable.
+ * - defaults to <i>false</i>
+ *
+ * @var boolean
+ */
+ define('LOG4PHP_DEFAULT_INIT_OVERRIDE', false);
+ }
+}
+
+if (!defined('LOG4PHP_CONFIGURATION')) {
+ if (isset($_ENV['log4php.configuration'])) {
+ /**
+ * @ignore
+ */
+ define('LOG4PHP_CONFIGURATION',
trim($_ENV['log4php.configuration']));
+ } else {
+ /**
+ * Configuration file.
+ *
+ * <p>This constant tells configurator classes where the
configuration
+ * file is located.</p>
+ * <p>If not set by user, log4php tries to set it automatically
using
+ * (in order):</p>
+ *
+ * - the <code>$_ENV['log4php.configuration']</code> enviroment
variable.
+ * - defaults to 'log4php.properties'.
+ *
+ * @var string
+ */
+ define('LOG4PHP_CONFIGURATION', 'log4php.properties');
+ }
+}
+
+if (!defined('LOG4PHP_CONFIGURATOR_CLASS')) {
+ if ( strtolower(substr( LOG4PHP_CONFIGURATION, -4 )) == '.xml') {
+ /**
+ * @ignore
+ */
+ define('LOG4PHP_CONFIGURATOR_CLASS', 'LoggerConfiguratorXml');
+ } else {
+ /**
+ * Holds the configurator class name.
+ *
+ * <p>This constant is set with the fullname (path included but
non the
+ * .php extension) of the configurator class that init
procedure will use.</p>
+ * <p>If not set by user, log4php tries to set it
automatically.</p>
+ * <p>If {...@link LOG4PHP_CONFIGURATION} has '.xml' extension
set the
+ * constants to '{...@link LOG4PHP_DIR}/xml/{...@link
LoggerConfiguratorXml}'.</p>
+ * <p>Otherwise set the constants to
+ * '{...@link LOG4PHP_DIR}/{...@link
LoggerConfiguratorIni}'.</p>
+ *
+ * <p><b>Security Note</b>: classfile pointed by this constant
will be brutally
+ * included with a:
+ * <code>@include_once(LOG4PHP_CONFIGURATOR_CLASS .
".php");</code></p>
+ *
+ * @var string
+ */
+ define('LOG4PHP_CONFIGURATOR_CLASS', 'LoggerConfiguratorIni');
+ }
+}
+
+if (!LOG4PHP_DEFAULT_INIT_OVERRIDE) {
+ if (!LoggerDefaultInit()) {
+// LoggerLog::warn("LOG4PHP main() Default Init failed.");
+ }
+}
+
+/**
+ * Default init procedure.
+ *
+ * <p>This procedure tries to configure the {...@link LoggerHierarchy} using
the
+ * configurator class defined via {...@link LOG4PHP_CONFIGURATOR_CLASS} that
tries
+ * to load the configurator file defined in {...@link LOG4PHP_CONFIGURATION}.
+ * If something goes wrong a warn is raised.</p>
+ * <p>Users can skip this procedure using {...@link
LOG4PHP_DEFAULT_INIT_OVERRIDE}
+ * constant.</p>
+ *
+ * @return boolean
+ */
+function LoggerDefaultInit() {
+ $configuratorClass = basename(LOG4PHP_CONFIGURATOR_CLASS);
+ return call_user_func(array($configuratorClass, 'configure'),
LOG4PHP_CONFIGURATION);
+}
Modified: incubator/log4php/trunk/src/main/php/LoggerHierarchy.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerHierarchy.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerHierarchy.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerHierarchy.php Sun Aug 2
15:01:32 2009
@@ -83,7 +83,8 @@
*/
public function __construct(LoggerRoot $root) {
$this->root = $root;
- $this->root->setHierarchy($this);
+ // TODO: isn't necessary, access via singleton?'
+// $this->root->setHierarchy($this);
$this->setThreshold(LoggerLevel::getLevelAll());
$this->rendererMap = new LoggerRendererMap();
}
@@ -131,7 +132,8 @@
public function getLogger($name) {
if(!isset($this->ht[$name])) {
$this->ht[$name] = new Logger($name);;
- $this->ht[$name]->setHierarchy($this);
+ // TODO: isn't necessary, access via singleton?
+ // $this->ht[$name]->setHierarchy($this);
$nodes = explode('.', $name);
$firstNode = array_shift($nodes);
Modified: incubator/log4php/trunk/src/main/php/LoggerLoggingEvent.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerLoggingEvent.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerLoggingEvent.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerLoggingEvent.php Sun Aug 2
15:01:32 2009
@@ -263,7 +263,7 @@
if($this->logger !== null) {
$repository =
$this->logger->getLoggerRepository();
} else {
- $repository =
LoggerManager::getLoggerRepository();
+ $repository =
Logger::getLoggerRepository();
}
if(method_exists($repository,
'getRendererMap')) {
$rendererMap =
$repository->getRendererMap();
Modified: incubator/log4php/trunk/src/main/php/LoggerManager.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerManager.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerManager.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerManager.php Sun Aug 2 15:01:32
2009
@@ -32,6 +32,9 @@
/**
* Use the LoggerManager to get Logger instances.
*
+ * TODO: remove before releasing 2.0
+ *
+ * @deprecated
* @version $Revision$
* @package log4php
* @see Logger
Modified:
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorBasic.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorBasic.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
---
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorBasic.php
(original)
+++
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorBasic.php
Sun Aug 2 15:01:32 2009
@@ -36,7 +36,7 @@
* @param string $url not used here
*/
public static function configure($url = null) {
- $root = LoggerManager::getRootLogger();
+ $root = Logger::getRootLogger();
$appender = new LoggerAppenderConsole('A1');
$appender->setLayout( new LoggerLayoutTTCC() );
$root->addAppender($appender);
@@ -46,13 +46,13 @@
* Reset the default hierarchy to its default.
* It is equivalent to
* <code>
- * LoggerManager::resetConfiguration();
+ * Logger::resetConfiguration();
* </code>
*
* @see LoggerHierarchy::resetConfiguration()
* @static
*/
public static function resetConfiguration() {
- LoggerManager::resetConfiguration();
+ Logger::resetConfiguration();
}
}
Modified:
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorIni.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorIni.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
---
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorIni.php
(original)
+++
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorIni.php
Sun Aug 2 15:01:32 2009
@@ -101,7 +101,7 @@
*/
public static function configure($url = '') {
$configurator = new LoggerConfiguratorIni();
- $repository = LoggerManager::getLoggerRepository();
+ $repository = Logger::getLoggerRepository();
return $configurator->doConfigure($url, $repository);
}
@@ -113,7 +113,7 @@
*
* <b>The existing configuration is not cleared nor reset.</b>
* If you require a different behavior, then call
- * {...@link LoggerManager::resetConfiguration()}
+ * {...@link Logger::resetConfiguration()}
* method before calling {...@link doConfigure()}.
*
* <p>The configuration file consists of statements in the format
Modified:
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorPhp.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorPhp.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
---
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorPhp.php
(original)
+++
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorPhp.php
Sun Aug 2 15:01:32 2009
@@ -58,7 +58,7 @@
public static function configure($url = '') {
$configurator = new self();
- $hierarchy = LoggerManager::getLoggerRepository();
+ $hierarchy = Logger::getLoggerRepository();
return $configurator->doConfigure($url, $hierarchy);
}
Modified:
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorXml.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorXml.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
---
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorXml.php
(original)
+++
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorXml.php
Sun Aug 2 15:01:32 2009
@@ -121,7 +121,7 @@
*/
public static function configure($url = '') {
$configurator = new self();
- $repository = LoggerManager::getLoggerRepository();
+ $repository = Logger::getLoggerRepository();
return $configurator->doConfigure($url, $repository);
}
@@ -166,7 +166,7 @@
*/
private function parse($xmlData, LoggerHierarchy $repository)
{
- // LoggerManager::resetConfiguration();
+ // Logger::resetConfiguration();
$this->repository = $repository;
$parser = xml_parser_create_ns();
@@ -367,7 +367,7 @@
case 'ROOT':
case self::XMLNS.':ROOT':
- $this->logger = LoggerManager::getRootLogger();
+ $this->logger = Logger::getRootLogger();
$this->state[] = self::ROOT_STATE;
break;
}
Modified: incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutPattern.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutPattern.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutPattern.php
(original)
+++ incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutPattern.php Sun
Aug 2 15:01:32 2009
@@ -39,7 +39,7 @@
*
* Then the statements
* <code>
- * $root = LoggerManager::getRoot();
+ * $root = Logger::getRoot();
* $root->debug("Message 1");
* $root->warn("Message 2");
* </code>
Added: incubator/log4php/trunk/src/site/apt/upgrading.apt
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/site/apt/upgrading.apt?rev=800094&view=auto
==============================================================================
--- incubator/log4php/trunk/src/site/apt/upgrading.apt (added)
+++ incubator/log4php/trunk/src/site/apt/upgrading.apt Sun Aug 2 15:01:32 2009
@@ -0,0 +1,29 @@
+~~ Licensed to the Apache Software Foundation (ASF) under one or more
+~~ contributor license agreements. See the NOTICE file distributed with
+~~ this work for additional information regarding copyright ownership.
+~~ The ASF licenses this file to You 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.
+ ------
+ Apache log4php Upgrading Instructions
+ ------
+ ------
+ ------
+
+Upgrading from previous versions to 2.0
+
+ Log4PHP 2.0 is not compatible with the previous versions. Please have the
following in mind when
+ upgrading to Log4PHP 2.0 in your project:
+
+ * PHP5 is required instead of PHP4
+
+ * The LoggerManager class has been removed. Use Logger instead.
+
\ No newline at end of file
Modified: incubator/log4php/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/site/site.xml?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
--- incubator/log4php/trunk/src/site/site.xml (original)
+++ incubator/log4php/trunk/src/site/site.xml Sun Aug 2 15:01:32 2009
@@ -41,6 +41,7 @@
<item name="What is it?" href="/index.html"/>
<item name="Who uses it?" href="/showcase.html"/>
<item name="Install" href="/install.html"/>
+ <item name="Upgrading" href="/upgrading.html"/>
<item name="Quick start" href="/quickstart.html"/>
<!-- <item name="Usage" href="/usage.html"/> -->
<item name="Roadmap" href="/roadmap.html"/>
Copied: incubator/log4php/trunk/src/test/php/LoggerTest.php (from r800084,
incubator/log4php/trunk/src/test/php/LoggerManagerTest.php)
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/LoggerTest.php?p2=incubator/log4php/trunk/src/test/php/LoggerTest.php&p1=incubator/log4php/trunk/src/test/php/LoggerManagerTest.php&r1=800084&r2=800094&rev=800094&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/LoggerManagerTest.php (original)
+++ incubator/log4php/trunk/src/test/php/LoggerTest.php Sun Aug 2 15:01:32 2009
@@ -22,29 +22,29 @@
* @link http://logging.apache.org/log4php
*/
-class LoggerManagerTest extends PHPUnit_Framework_TestCase {
+class LoggerTest extends PHPUnit_Framework_TestCase {
public function testGetCurrentLoggers() {
- //var_dump(LoggerManager::getCurrentLoggers());
+ //var_dump(Logger::getCurrentLoggers());
self::markTestIncomplete();
}
public function testLoggerExist() {
-// $l = LoggerManager::getRootLogger();
+// $l = Logger::getRootLogger();
// self::assertEquals($l->getName(), 'root');
// $l->debug('test');
-// self::assertTrue(LoggerManager::exists('root'));
+// self::assertTrue(Logger::exists('root'));
self::markTestIncomplete();
}
public function testCanGetRootLogger() {
- $l = LoggerManager::getRootLogger();
+ $l = Logger::getRootLogger();
self::assertEquals($l->getName(), 'root');
}
public function testCanGetASpecificLogger() {
- $l = LoggerManager::getLogger('test');
+ $l = Logger::getLogger('test');
self::assertEquals($l->getName(), 'test');
}
Propchange: incubator/log4php/trunk/src/test/php/LoggerTest.php
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/log4php/trunk/src/test/php/LoggerTest.php
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: incubator/log4php/trunk/src/test/php/bootstrap.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/bootstrap.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/bootstrap.php (original)
+++ incubator/log4php/trunk/src/test/php/bootstrap.php Sun Aug 2 15:01:32 2009
@@ -34,7 +34,7 @@
define('LOG4PHP_DEFAULT_INIT_OVERRIDE', true);
}
-require_once LOG4PHP_DIR.'/LoggerManager.php';
+require_once LOG4PHP_DIR.'/Logger.php';
require_once 'PHPUnit/Framework/TestCase.php';
require_once 'PHPUnit/Framework/TestSuite.php';
Modified:
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorBasicTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorBasicTest.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
---
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorBasicTest.php
(original)
+++
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorBasicTest.php
Sun Aug 2 15:01:32 2009
@@ -34,7 +34,7 @@
}
public function testConfigure() {
- $root = LoggerManager::getRootLogger();
+ $root = Logger::getRootLogger();
$appender = $root->getAppender('A1');
self::assertType('LoggerAppenderConsole', $appender);
$layout = $appender->getLayout();
@@ -42,7 +42,7 @@
}
public function testResetConfiguration() {
- $root = LoggerManager::getRootLogger();
+ $root = Logger::getRootLogger();
$appender = $root->getAppender('A1');
self::assertType('LoggerAppenderConsole', $appender);
$layout = $appender->getLayout();
Modified:
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorIniTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorIniTest.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
---
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorIniTest.php
(original)
+++
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorIniTest.php
Sun Aug 2 15:01:32 2009
@@ -30,12 +30,12 @@
}
protected function tearDown() {
- LoggerManager::resetConfiguration();
+ Logger::resetConfiguration();
}
public function testConfigure() {
LoggerConfiguratorIni::configure('configurators/test1.properties');
- $hierarchy = LoggerManager::getLoggerRepository();
+ $hierarchy = Logger::getLoggerRepository();
$root = $hierarchy->getRootLogger();
self::assertEquals(LoggerLevel::getLevelWarn(),
$root->getLevel());
$appender = $root->getAppender("default");
@@ -55,7 +55,7 @@
public function testConfigureWithRootCategory() {
LoggerConfiguratorIni::configure('configurators/test3.properties');
- $hierarchy = LoggerManager::getLoggerRepository();
+ $hierarchy = Logger::getLoggerRepository();
$root = $hierarchy->getRootLogger();
self::assertEquals(LoggerLevel::getLevelWarn(),
$root->getLevel());
$appender = $root->getAppender("default");
Modified:
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorPhpTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorPhpTest.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
---
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorPhpTest.php
(original)
+++
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorPhpTest.php
Sun Aug 2 15:01:32 2009
@@ -30,12 +30,12 @@
}
protected function tearDown() {
- LoggerManager::resetConfiguration();
+ Logger::resetConfiguration();
}
public function testConfigure() {
LoggerConfiguratorPhp::configure('configurators/test1.php');
- $hierarchy = LoggerManager::getLoggerRepository();
+ $hierarchy = Logger::getLoggerRepository();
$root = $hierarchy->getRootLogger();
self::assertEquals(LoggerLevel::getLevelWarn(),
$root->getLevel());
$appender = $root->getAppender("default");
Modified:
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorXmlTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorXmlTest.php?rev=800094&r1=800093&r2=800094&view=diff
==============================================================================
---
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorXmlTest.php
(original)
+++
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorXmlTest.php
Sun Aug 2 15:01:32 2009
@@ -30,12 +30,12 @@
}
protected function tearDown() {
- LoggerManager::resetConfiguration();
+ Logger::resetConfiguration();
}
public function testConfigure() {
LoggerConfiguratorXml::configure('configurators/test1.xml');
- $hierarchy = LoggerManager::getLoggerRepository();
+ $hierarchy = Logger::getLoggerRepository();
$root = $hierarchy->getRootLogger();
self::assertEquals(LoggerLevel::getLevelWarn(),
$root->getLevel());
$appender = $root->getAppender("default");
