Author: grobmeier
Date: Fri May 22 14:07:06 2009
New Revision: 777532
URL: http://svn.apache.org/viewvc?rev=777532&view=rev
Log:
moved factory call to ReflectionUtils
Modified:
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderAdodb.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderPDO.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSocket.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
Modified: incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderAdodb.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderAdodb.php?rev=777532&r1=777531&r2=777532&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderAdodb.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderAdodb.php Fri
May 22 14:07:06 2009
@@ -128,7 +128,7 @@
return;
}
- $this->layout = LoggerLayout::factory('LoggerLayoutPattern');
+ $this->layout =
LoggerReflectionUtils::createObject('LoggerLayoutPattern');
$this->layout->setConversionPattern($this->getSql());
// test if log table exists
Modified: incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderPDO.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderPDO.php?rev=777532&r1=777531&r2=777532&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderPDO.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderPDO.php Fri
May 22 14:07:06 2009
@@ -113,7 +113,7 @@
") VALUES
('%d','%c','%p','%m','%t','%F','%L')";
}
- $this->layout = LoggerLayout::factory('LoggerLayoutPattern');
+ $this->layout =
LoggerReflectionUtils::createObject('LoggerLayoutPattern');
$this->layout->setConversionPattern($this->sql);
$this->canAppend = true;
return true;
Modified:
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSocket.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSocket.php?rev=777532&r1=777531&r2=777532&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSocket.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSocket.php Fri
May 22 14:07:06 2009
@@ -88,7 +88,7 @@
$this->closed = true;
} else {
if($this->getUseXml()) {
- $this->xmlLayout =
LoggerLayout::factory('LoggerXmlLayout');
+ $this->xmlLayout =
LoggerReflectionUtils::createObject('LoggerXmlLayout');
if($this->xmlLayout === null) {
$this->setUseXml(false);
} else {
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=777532&r1=777531&r2=777532&view=diff
==============================================================================
---
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorIni.php
(original)
+++
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorIni.php
Fri May 22 14:07:06 2009
@@ -549,11 +549,11 @@
$layoutClass = @$props[$layoutPrefix];
$layoutClass =
LoggerOptionConverter::substVars($layoutClass, $props);
if(empty($layoutClass)) {
- $layout =
LoggerLayout::factory('LoggerLayoutSimple');
+ $layout =
LoggerReflectionUtils::createObject('LoggerLayoutSimple');
} else {
- $layout = LoggerLayout::factory($layoutClass);
+ $layout =
LoggerReflectionUtils::createObject($layoutClass);
if($layout === null) {
- $layout =
LoggerLayout::factory('LoggerLayoutSimple');
+ $layout =
LoggerReflectionUtils::createObject('LoggerLayoutSimple');
}
}
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=777532&r1=777531&r2=777532&view=diff
==============================================================================
---
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorPhp.php
(original)
+++
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorPhp.php
Fri May 22 14:07:06 2009
@@ -91,9 +91,9 @@
$layoutClass =
'LoggerLayoutSimple';
}
- $layout =
LoggerLayout::factory($layoutClass);
+ $layout =
LoggerReflectionUtils::createObject($layoutClass);
if($layout === null) {
- $layout =
LoggerLayout::factory('LoggerLayoutSimple');
+ $layout =
LoggerReflectionUtils::createObject('LoggerLayoutSimple');
}
if($layout instanceof
LoggerLayoutPattern) {
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=777532&r1=777531&r2=777532&view=diff
==============================================================================
---
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorXml.php
(original)
+++
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorXml.php
Fri May 22 14:07:06 2009
@@ -272,7 +272,7 @@
case 'LAYOUT':
case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LAYOUT':
$class = @$attribs['CLASS'];
- $this->layout = LoggerLayout::factory($this->subst($class));
+ $this->layout =
LoggerReflectionUtils::createObject($this->subst($class));
$this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_LAYOUT_STATE;
break;
@@ -431,7 +431,7 @@
if ($this->appender !== null) {
if ($this->appender->requiresLayout() and
$this->appender->getLayout() === null) {
$appenderName = $this->appender->getName();
-
$this->appender->setLayout(LoggerLayout::factory('LoggerLayoutSimple'));
+
$this->appender->setLayout(LoggerReflectionUtils::createObject('LoggerLayoutSimple'));
}
$this->appender->activateOptions();
}
