Author: grobmeier
Date: Thu Jul 2 12:36:22 2009
New Revision: 790565
URL: http://svn.apache.org/viewvc?rev=790565&view=rev
Log:
moved global vars to class members
Modified:
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorXml.php
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=790565&r1=790564&r2=790565&view=diff
==============================================================================
---
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorXml.php
(original)
+++
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorXml.php
Thu Jul 2 12:36:22 2009
@@ -20,34 +20,6 @@
* @subpackage configurators
*/
-define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_APPENDER_STATE', 1000);
-define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_LAYOUT_STATE', 1010);
-define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_ROOT_STATE', 1020);
-define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE', 1030);
-define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_FILTER_STATE', 1040);
-
-define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_DEFAULT_FILENAME', './log4php.xml');
-
-/**
- * @var string the default configuration document
- */
-define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_DEFAULT_CONFIGURATION',
-'<?xml version="1.0" ?>
-<log4php:configuration threshold="all">
- <appender name="A1" class="LoggerAppenderEcho">
- <layout class="LoggerLayoutSimple" />
- </appender>
- <root>
- <level value="debug" />
- <appender_ref ref="A1" />
- </root>
-</log4php:configuration>');
-
-/**
- * @var string the elements namespace
- */
-define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS',
'HTTP://LOGGING.APACHE.ORG/LOG4PHP/');
-
/**
* Use this class to initialize the log4php environment using expat parser.
*
@@ -72,6 +44,33 @@
* @since 0.4
*/
class LoggerConfiguratorXml implements LoggerConfigurator {
+ const LOG4PHP_LOGGER_DOM_CONFIGURATOR_APPENDER_STATE = 1000;
+ const LOG4PHP_LOGGER_DOM_CONFIGURATOR_LAYOUT_STATE = 1010;
+ const LOG4PHP_LOGGER_DOM_CONFIGURATOR_ROOT_STATE = 1020;
+ const LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE = 1030;
+ const LOG4PHP_LOGGER_DOM_CONFIGURATOR_FILTER_STATE = 1040;
+
+ const LOG4PHP_LOGGER_DOM_CONFIGURATOR_DEFAULT_FILENAME =
'./log4php.xml';
+
+ /**
+ * @var string the default configuration document
+ */
+ const LOG4PHP_LOGGER_DOM_CONFIGURATOR_DEFAULT_CONFIGURATION =
+ '<?xml version="1.0" ?>
+ <log4php:configuration threshold="all">
+ <appender name="A1" class="LoggerAppenderEcho">
+ <layout class="LoggerLayoutSimple" />
+ </appender>
+ <root>
+ <level value="debug" />
+ <appender_ref ref="A1" />
+ </root>
+ </log4php:configuration>';
+
+ /**
+ * @var string the elements namespace
+ */
+ const LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS =
'HTTP://LOGGING.APACHE.ORG/LOG4PHP/';
/**
* @var LoggerHierarchy
@@ -162,7 +161,7 @@
*/
function doConfigureDefault(&$repository)
{
- return
$this->doConfigureByString(LOG4PHP_LOGGER_DOM_CONFIGURATOR_DEFAULT_CONFIGURATION,
$repository);
+ return
$this->doConfigureByString(self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_DEFAULT_CONFIGURATION,
$repository);
}
/**
@@ -202,7 +201,7 @@
switch ($tag) {
case 'CONFIGURATION' :
- case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':CONFIGURATION':
+ case self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':CONFIGURATION':
if (isset($attribs['THRESHOLD'])) {
@@ -226,7 +225,7 @@
break;
case 'APPENDER' :
- case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER':
+ case self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER':
unset($this->appender);
$this->appender = null;
@@ -235,21 +234,21 @@
$class = $this->subst(@$attribs['CLASS']);
$this->appender = LoggerAppender::singleton($name, $class);
- $this->state[] =
LOG4PHP_LOGGER_DOM_CONFIGURATOR_APPENDER_STATE;
+ $this->state[] =
self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_APPENDER_STATE;
break;
case 'APPENDER_REF' :
case 'APPENDER-REF' :
- case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER_REF':
- case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER-REF':
+ case self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER_REF':
+ case self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER-REF':
if (isset($attribs['REF']) and !empty($attribs['REF'])) {
$appenderName = $this->subst($attribs['REF']);
$appender = LoggerAppender::singleton($appenderName);
if ($appender !== null) {
switch (end($this->state)) {
- case LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE:
- case LOG4PHP_LOGGER_DOM_CONFIGURATOR_ROOT_STATE:
+ case
self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE:
+ case
self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_ROOT_STATE:
$this->logger->addAppender($appender);
break;
}
@@ -258,26 +257,26 @@
break;
case 'FILTER' :
- case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':FILTER':
+ case self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':FILTER':
unset($this->filter);
$this->filter = null;
$filterName = basename($this->subst(@$attribs['CLASS']));
if (!empty($filterName)) {
$this->filter = new $filterName();
- $this->state[] =
LOG4PHP_LOGGER_DOM_CONFIGURATOR_FILTER_STATE;
+ $this->state[] =
self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_FILTER_STATE;
}
break;
case 'LAYOUT':
- case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LAYOUT':
+ case self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LAYOUT':
$class = @$attribs['CLASS'];
$this->layout =
LoggerReflectionUtils::createObject($this->subst($class));
- $this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_LAYOUT_STATE;
+ $this->state[] =
self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_LAYOUT_STATE;
break;
case 'LOGGER':
- case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LOGGER':
+ case self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LOGGER':
// $this->logger is assigned by reference.
// Only '$this->logger=null;' destroys referenced object
unset($this->logger);
@@ -316,13 +315,13 @@
$this->logger->setAdditivity($additivity);
}
}
- $this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE;;
+ $this->state[] =
self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE;;
break;
case 'LEVEL':
- case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LEVEL':
+ case self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LEVEL':
case 'PRIORITY':
- case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':PRIORITY':
+ case self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':PRIORITY':
if (!isset($attribs['VALUE'])) {
// LoggerDOMConfigurator::tagOpen() LEVEL value not set
@@ -335,7 +334,7 @@
}
switch (end($this->state)) {
- case LOG4PHP_LOGGER_DOM_CONFIGURATOR_ROOT_STATE:
+ case self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_ROOT_STATE:
$this->logger->setLevel(
LoggerOptionConverter::toLevel(
$this->subst($attribs['VALUE']),
@@ -343,7 +342,7 @@
)
);
break;
- case LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE:
+ case self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE:
$this->logger->setLevel(
LoggerOptionConverter::toLevel(
$this->subst($attribs['VALUE']),
@@ -357,7 +356,7 @@
break;
case 'PARAM':
- case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':PARAM':
+ case self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':PARAM':
if (!isset($attribs['NAME'])) {
// LoggerDOMConfigurator::tagOpen() PARAM attribute 'name'
not defined.
break;
@@ -368,17 +367,17 @@
}
switch (end($this->state)) {
- case LOG4PHP_LOGGER_DOM_CONFIGURATOR_APPENDER_STATE:
+ case self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_APPENDER_STATE:
if ($this->appender !== null) {
LoggerReflectionUtils::setter($this->appender,
$this->subst($attribs['NAME']), $this->subst($attribs['VALUE']));
}
break;
- case LOG4PHP_LOGGER_DOM_CONFIGURATOR_LAYOUT_STATE:
+ case self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_LAYOUT_STATE:
if ($this->layout !== null) {
LoggerReflectionUtils::setter($this->layout,
$this->subst($attribs['NAME']), $this->subst($attribs['VALUE']));
}
break;
- case LOG4PHP_LOGGER_DOM_CONFIGURATOR_FILTER_STATE:
+ case self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_FILTER_STATE:
if ($this->filter !== null) {
LoggerReflectionUtils::setter($this->filter,
$this->subst($attribs['NAME']), $this->subst($attribs['VALUE']));
}
@@ -389,7 +388,7 @@
break;
case 'RENDERER':
- case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':RENDERER':
+ case self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':RENDERER':
$renderedClass = $this->subst(@$attribs['RENDEREDCLASS']);
$renderingClass = $this->subst(@$attribs['RENDERINGCLASS']);
@@ -405,9 +404,9 @@
break;
case 'ROOT':
- case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':ROOT':
+ case self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':ROOT':
$this->logger = LoggerManager::getRootLogger();
- $this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_ROOT_STATE;
+ $this->state[] =
self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_ROOT_STATE;
break;
}
}
@@ -422,11 +421,11 @@
switch ($tag) {
case 'CONFIGURATION' :
- case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':CONFIGURATION':
+ case self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':CONFIGURATION':
break;
case 'APPENDER' :
- case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER':
+ case self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER':
if ($this->appender !== null) {
if ($this->appender->requiresLayout() and
$this->appender->getLayout() === null) {
$appenderName = $this->appender->getName();
@@ -438,7 +437,7 @@
break;
case 'FILTER' :
- case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':FILTER':
+ case self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':FILTER':
if ($this->filter !== null) {
$this->filter->activateOptions();
$this->appender->addFilter($this->filter);
@@ -448,7 +447,7 @@
break;
case 'LAYOUT':
- case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LAYOUT':
+ case self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LAYOUT':
if ($this->appender !== null and $this->layout !== null and
$this->appender->requiresLayout()) {
$this->layout->activateOptions();
$this->appender->setLayout($this->layout);
@@ -458,12 +457,12 @@
break;
case 'LOGGER':
- case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LOGGER':
+ case self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LOGGER':
array_pop($this->state);
break;
case 'ROOT':
- case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':ROOT':
+ case self::LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':ROOT':
array_pop($this->state);
break;
}
