You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4php-dev@logging.apache.org by ku...@apache.org on 2009/04/28 23:44:45 UTC
svn commit: r769556 - in /incubator/log4php/trunk/src/main/php:
LoggerManager.php LoggerPropertyConfigurator.php
helpers/LoggerOptionConverter.php or/LoggerRendererMap.php
xml/LoggerDOMConfigurator.php
Author: kurdalen
Date: Tue Apr 28 21:44:45 2009
New Revision: 769556
URL: http://svn.apache.org/viewvc?rev=769556&view=rev
Log:
even more fixed related to #LOG4PHP-29
Modified:
incubator/log4php/trunk/src/main/php/LoggerManager.php
incubator/log4php/trunk/src/main/php/LoggerPropertyConfigurator.php
incubator/log4php/trunk/src/main/php/helpers/LoggerOptionConverter.php
incubator/log4php/trunk/src/main/php/or/LoggerRendererMap.php
incubator/log4php/trunk/src/main/php/xml/LoggerDOMConfigurator.php
Modified: incubator/log4php/trunk/src/main/php/LoggerManager.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerManager.php?rev=769556&r1=769555&r2=769556&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerManager.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerManager.php Tue Apr 28 21:44:45 2009
@@ -316,17 +316,7 @@
*/
function LoggerManagerDefaultInit()
{
- $configuratorClass = basename(LOG4PHP_CONFIGURATOR_CLASS);
- if (!class_exists($configuratorClass)) {
- include_once(LOG4PHP_CONFIGURATOR_CLASS . ".php");
- }
- if (class_exists($configuratorClass)) {
-
- return call_user_func(array($configuratorClass, 'configure'), LOG4PHP_CONFIGURATION);
-
- } else {
- LoggerLog::warn("LoggerManagerDefaultInit() Configurator '{$configuratorClass}' doesnt exists");
- return false;
- }
+ $configuratorClass = basename(LOG4PHP_CONFIGURATOR_CLASS);
+ return call_user_func(array($configuratorClass, 'configure'), LOG4PHP_CONFIGURATION);
}
Modified: incubator/log4php/trunk/src/main/php/LoggerPropertyConfigurator.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerPropertyConfigurator.php?rev=769556&r1=769555&r2=769556&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerPropertyConfigurator.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerPropertyConfigurator.php Tue Apr 28 21:44:45 2009
@@ -383,8 +383,6 @@
"]."
);
- if (!class_exists($factoryClassName))
- @include_once("{$factoryFqcn}.php");
if (class_exists($factoryClassName)) {
$loggerFactory = new $factoryClassName();
} else {
Modified: incubator/log4php/trunk/src/main/php/helpers/LoggerOptionConverter.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/helpers/LoggerOptionConverter.php?rev=769556&r1=769555&r2=769556&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/helpers/LoggerOptionConverter.php (original)
+++ incubator/log4php/trunk/src/main/php/helpers/LoggerOptionConverter.php Tue Apr 28 21:44:45 2009
@@ -181,9 +181,6 @@
LoggerLog::debug("LoggerOptionConverter::toLevel():class=[{$clazz}]:pri=[{$levelName}]");
- if (!class_exists($clazz))
- @include_once("{$clazz}.php");
-
$clazz = basename($clazz);
if (class_exists($clazz)) {
Modified: incubator/log4php/trunk/src/main/php/or/LoggerRendererMap.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/or/LoggerRendererMap.php?rev=769556&r1=769555&r2=769556&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/or/LoggerRendererMap.php (original)
+++ incubator/log4php/trunk/src/main/php/or/LoggerRendererMap.php Tue Apr 28 21:44:45 2009
@@ -172,9 +172,6 @@
public function rendererExists($class)
{
$class = basename($class);
- if (!class_exists($class)) {
- include_once(LOG4PHP_DIR ."/or/{$class}.php");
- }
return class_exists($class);
}
}
Modified: incubator/log4php/trunk/src/main/php/xml/LoggerDOMConfigurator.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/xml/LoggerDOMConfigurator.php?rev=769556&r1=769555&r2=769556&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/xml/LoggerDOMConfigurator.php (original)
+++ incubator/log4php/trunk/src/main/php/xml/LoggerDOMConfigurator.php Tue Apr 28 21:44:45 2009
@@ -291,14 +291,7 @@
$filterName = basename($this->subst(@$attribs['CLASS']));
if (!empty($filterName)) {
- if (!class_exists($filterName)) {
- @include_once(LOG4PHP_DIR . "/varia/{$filterName}.php");
- }
- if (class_exists($filterName)) {
- $this->filter = new $filterName();
- } else {
- LoggerLog::warn("LoggerDOMConfigurator::tagOpen() FILTER. class '$filterName' doesnt exist");
- }
+ $this->filter = new $filterName();
$this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_FILTER_STATE;
} else {
LoggerLog::warn("LoggerDOMConfigurator::tagOpen() FILTER filter name cannot be empty");
@@ -336,8 +329,6 @@
$this->logger =& $this->repository->getLogger($loggerName);
} else {
$className = basename($class);
- if (!class_exists($className))
- @include_once("{$class}.php");
if (!class_exists($className)) {
LoggerLog::warn(
"LoggerDOMConfigurator::tagOpen() LOGGER. ".