Author: kurdalen
Date: Tue May 5 13:52:57 2009
New Revision: 771728
URL: http://svn.apache.org/viewvc?rev=771728&view=rev
Log:
more cleanup #LOG4PHP-41
Added:
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorBasic.php
- copied, changed from r771577,
incubator/log4php/trunk/src/main/php/LoggerBasicConfigurator.php
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorIni.php
- copied, changed from r771704,
incubator/log4php/trunk/src/main/php/configurators/LoggerPropertyConfigurator.php
Removed:
incubator/log4php/trunk/src/main/php/LoggerBasicConfigurator.php
incubator/log4php/trunk/src/main/php/configurators/LoggerPropertyConfigurator.php
incubator/log4php/trunk/src/main/php/spi/
Modified:
incubator/log4php/trunk/src/examples/php/levelmatchfilter.php
incubator/log4php/trunk/src/examples/php/levelrangefilter.php
incubator/log4php/trunk/src/examples/php/stringmatchfilter.php
incubator/log4php/trunk/src/examples/resources/levelmatchfilter.xml
incubator/log4php/trunk/src/examples/resources/levelrangefilter.xml
incubator/log4php/trunk/src/examples/resources/stringmatchfilter.xml
incubator/log4php/trunk/src/main/php/LoggerManager.php
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorXml.php
Modified: incubator/log4php/trunk/src/examples/php/levelmatchfilter.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/levelmatchfilter.php?rev=771728&r1=771727&r2=771728&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/levelmatchfilter.php (original)
+++ incubator/log4php/trunk/src/examples/php/levelmatchfilter.php Tue May 5
13:52:57 2009
@@ -16,7 +16,6 @@
* limitations under the License.
*/
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
-define('LOG4PHP_CONFIGURATOR_CLASS', LOG4PHP_DIR.'/xml/LoggerDOMConfigurator');
define('LOG4PHP_CONFIGURATION',
dirname(__FILE__).'/../resources/levelmatchfilter.xml');
require_once LOG4PHP_DIR.'/LoggerManager.php';
Modified: incubator/log4php/trunk/src/examples/php/levelrangefilter.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/levelrangefilter.php?rev=771728&r1=771727&r2=771728&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/levelrangefilter.php (original)
+++ incubator/log4php/trunk/src/examples/php/levelrangefilter.php Tue May 5
13:52:57 2009
@@ -16,7 +16,6 @@
* limitations under the License.
*/
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
-define('LOG4PHP_CONFIGURATOR_CLASS', LOG4PHP_DIR.'/xml/LoggerDOMConfigurator');
define('LOG4PHP_CONFIGURATION',
dirname(__FILE__).'/../resources/levelrangefilter.xml');
require_once LOG4PHP_DIR.'/LoggerManager.php';
Modified: incubator/log4php/trunk/src/examples/php/stringmatchfilter.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/stringmatchfilter.php?rev=771728&r1=771727&r2=771728&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/stringmatchfilter.php (original)
+++ incubator/log4php/trunk/src/examples/php/stringmatchfilter.php Tue May 5
13:52:57 2009
@@ -16,7 +16,6 @@
* limitations under the License.
*/
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
-define('LOG4PHP_CONFIGURATOR_CLASS', LOG4PHP_DIR.'/xml/LoggerDOMConfigurator');
define('LOG4PHP_CONFIGURATION',
dirname(__FILE__).'/../resources/stringmatchfilter.xml');
require_once LOG4PHP_DIR.'/LoggerManager.php';
Modified: incubator/log4php/trunk/src/examples/resources/levelmatchfilter.xml
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/resources/levelmatchfilter.xml?rev=771728&r1=771727&r2=771728&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/resources/levelmatchfilter.xml
(original)
+++ incubator/log4php/trunk/src/examples/resources/levelmatchfilter.xml Tue May
5 13:52:57 2009
@@ -21,7 +21,7 @@
threshold="all" debug="false">
<appender name="default" class="LoggerAppenderEcho">
<layout class="LoggerLayoutTTCC"/>
- <filter class="LoggerLevelMatchFilter">
+ <filter class="LoggerFilterLevelMatch">
<param name="LevelToMatch" value="DEBUG" />
<param name="AcceptOnMatch" value="false" />
</filter>
Modified: incubator/log4php/trunk/src/examples/resources/levelrangefilter.xml
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/resources/levelrangefilter.xml?rev=771728&r1=771727&r2=771728&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/resources/levelrangefilter.xml
(original)
+++ incubator/log4php/trunk/src/examples/resources/levelrangefilter.xml Tue May
5 13:52:57 2009
@@ -21,7 +21,7 @@
threshold="all" debug="false">
<appender name="default" class="LoggerAppenderEcho">
<layout class="LoggerLayoutTTCC"/>
- <filter class="LoggerLevelRangeFilter">
+ <filter class="LoggerFilterLevelRange">
<param name="LevelMin" value="ERROR" />
<param name="LevelMax" value="FATAL" />
<param name="AcceptOnMatch" value="false" />
Modified: incubator/log4php/trunk/src/examples/resources/stringmatchfilter.xml
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/resources/stringmatchfilter.xml?rev=771728&r1=771727&r2=771728&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/resources/stringmatchfilter.xml
(original)
+++ incubator/log4php/trunk/src/examples/resources/stringmatchfilter.xml Tue
May 5 13:52:57 2009
@@ -21,7 +21,7 @@
threshold="all" debug="false">
<appender name="default" class="LoggerAppenderEcho">
<layout class="LoggerLayoutTTCC"/>
- <filter class="LoggerStringMatchFilter">
+ <filter class="LoggerFilterStringMatch">
<param name="StringToMatch" value="match" />
<param name="AcceptOnMatch" value="false" />
</filter>
Modified: incubator/log4php/trunk/src/main/php/LoggerManager.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerManager.php?rev=771728&r1=771727&r2=771728&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerManager.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerManager.php Tue May 5 13:52:57
2009
@@ -46,20 +46,20 @@
private static $_classes = array(
'Logger' => '/Logger.php',
- 'LoggerAppender' => '/LoggerAppender.php',
'LoggerHierarchy' => '/LoggerHierarchy.php',
- 'LoggerBasicConfigurator' => '/LoggerBasicConfigurator.php',
'LoggerDefaultCategoryFactory' =>
'/LoggerDefaultCategoryFactory.php',
'LoggerHierarchy' => '/LoggerHierarchy.php',
'LoggerLayout' => '/LoggerLayout.php',
'LoggerLevel' => '/LoggerLevel.php',
- // 'LoggerLog' => '/LoggerLog.php',
'LoggerMDC' => '/LoggerMDC.php',
'LoggerNDC' => '/LoggerNDC.php',
+ 'LoggerConfigurator' => '/LoggerConfigurator.php',
+ 'LoggerConfiguratorBasic' =>
'/configurators/LoggerConfiguratorBasic.php',
+ 'LoggerConfiguratorIni' =>
'/configurators/LoggerConfiguratorIni.php',
'LoggerConfiguratorPhp' =>
'/configurators/LoggerConfiguratorPhp.php',
- 'LoggerPropertyConfigurator' =>
'/LoggerPropertyConfigurator.php',
'LoggerConfiguratorXml' =>
'/configurators/LoggerConfiguratorXml.php',
'LoggerRoot' => '/LoggerRoot.php',
+ 'LoggerAppender' => '/LoggerAppender.php',
'LoggerAppenderAdodb' => '/appenders/LoggerAppenderAdodb.php',
'LoggerAppenderConsole' =>
'/appenders/LoggerAppenderConsole.php',
'LoggerAppenderDailyFile' =>
'/appenders/LoggerAppenderDailyFile.php',
@@ -96,15 +96,14 @@
'LoggerRendererDefault' =>
'/renderers/LoggerRendererDefault.php',
'LoggerRendererObject' => '/renderers/LoggerRendererObject.php',
'LoggerRendererMap' => '/renderers/LoggerRendererMap.php',
- 'LoggerConfigurator' => '/LoggerConfigurator.php',
'LoggerFactory' => '/LoggerFactory.php',
- 'LoggerFilter' => '/LoggerFilter.php',
'LoggerLocationInfo' => '/LoggerLocationInfo.php',
'LoggerLoggingEvent' => '/LoggerLoggingEvent.php',
- 'LoggerFilterDenyAll' => '/filters/LoggerDenyAllFilter.php',
- 'LoggerFilterLevelMatch' =>
'/filters/LoggerLevelMatchFilter.php',
- 'LoggerFilterLevelRange' =>
'/filters/LoggerLevelRangeFilter.php',
- 'LoggerFilterStringMatch' =>
'/filters/LoggerStringMatchFilter.php',
+ 'LoggerFilter' => '/LoggerFilter.php',
+ 'LoggerFilterDenyAll' => '/filters/LoggerFilterDenyAll.php',
+ 'LoggerFilterLevelMatch' =>
'/filters/LoggerFilterLevelMatch.php',
+ 'LoggerFilterLevelRange' =>
'/filters/LoggerFilterLevelRange.php',
+ 'LoggerFilterStringMatch' =>
'/filters/LoggerFilterStringMatch.php',
);
/**
@@ -270,7 +269,7 @@
/**
* @ignore
*/
- define('LOG4PHP_CONFIGURATOR_CLASS', 'LoggerDOMConfigurator');
+ define('LOG4PHP_CONFIGURATOR_CLASS', 'LoggerConfiguratorXml');
} else {
/**
* Holds the configurator class name.
@@ -279,9 +278,9 @@
* .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
LoggerDOMConfigurator}'.</p>
+ * constants to '{...@link LOG4PHP_DIR}/xml/{...@link
LoggerConfiguratorXml}'.</p>
* <p>Otherwise set the constants to
- * '{...@link LOG4PHP_DIR}/{...@link
LoggerPropertyConfigurator}'.</p>
+ * '{...@link LOG4PHP_DIR}/{...@link
LoggerConfiguratorIni}'.</p>
*
* <p><b>Security Note</b>: classfile pointed by this constant
will be brutally
* included with a:
@@ -289,7 +288,7 @@
*
* @var string
*/
- define('LOG4PHP_CONFIGURATOR_CLASS',
'LoggerPropertyConfigurator');
+ define('LOG4PHP_CONFIGURATOR_CLASS', 'LoggerConfiguratorIni');
}
}
Copied:
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorBasic.php
(from r771577, incubator/log4php/trunk/src/main/php/LoggerBasicConfigurator.php)
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorBasic.php?p2=incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorBasic.php&p1=incubator/log4php/trunk/src/main/php/LoggerBasicConfigurator.php&r1=771577&r2=771728&rev=771728&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerBasicConfigurator.php (original)
+++
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorBasic.php
Tue May 5 13:52:57 2009
@@ -22,8 +22,8 @@
/**
* Use this class to quickly configure the package.
*
- * <p>For file based configuration see {...@link LoggerPropertyConfigurator}.
- * <p>For XML based configuration see {...@link LoggerDOMConfigurator}.
+ * <p>For file based configuration see {...@link LoggerConfiguratorIni}.
+ * <p>For XML based configuration see {...@link LoggerConfiguratorXml}.
*
* @version $Revision$
* @package log4php
Copied:
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorIni.php
(from r771704,
incubator/log4php/trunk/src/main/php/configurators/LoggerPropertyConfigurator.php)
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorIni.php?p2=incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorIni.php&p1=incubator/log4php/trunk/src/main/php/configurators/LoggerPropertyConfigurator.php&r1=771704&r2=771728&rev=771728&view=diff
==============================================================================
---
incubator/log4php/trunk/src/main/php/configurators/LoggerPropertyConfigurator.php
(original)
+++
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorIni.php
Tue May 5 13:52:57 2009
@@ -17,6 +17,7 @@
*
*
* @package log4php
+ * @subpackage configurators
*/
define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_CATEGORY_PREFIX',
"log4php.category.");
@@ -47,8 +48,8 @@
* files. You can enable log4php internal logging by defining the
* <b>log4php.debug</b> variable.</p>
*
- * <p>The <i>LoggerPropertyConfigurator</i> does not handle the
- * advanced configuration features supported by the {...@link
LoggerDOMConfigurator}
+ * <p>The <i>LoggerConfiguratorIni</i> does not handle the
+ * advanced configuration features supported by the {...@link
LoggerConfiguratorXml}
* such as support for {...@link LoggerFilter},
custom {...@link LoggerErrorHandlers}, nested appenders such as the
{...@link Logger AsyncAppender},
@@ -83,9 +84,10 @@
*
* @version $Revision$
* @package log4php
+ * @subpackage configurators
* @since 0.5
*/
-class LoggerPropertyConfigurator implements LoggerConfigurator {
+class LoggerConfiguratorIni implements LoggerConfigurator {
/**
* @var LoggerFactory
@@ -95,7 +97,7 @@
/**
* Constructor
*/
- public function LoggerPropertyConfigurator() {
+ public function __construct() {
$this->loggerFactory = new LoggerDefaultCategoryFactory();
}
@@ -110,7 +112,7 @@
* @static
*/
public static function configure($url = '') {
- $configurator = new LoggerPropertyConfigurator();
+ $configurator = new self();
$repository = LoggerManager::getLoggerRepository();
return $configurator->doConfigure($url, $repository);
}
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=771728&r1=771727&r2=771728&view=diff
==============================================================================
---
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorXml.php
(original)
+++
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorXml.php
Tue May 5 13:52:57 2009
@@ -17,7 +17,7 @@
*
*
* @package log4php
- * @subpackage xml
+ * @subpackage configurators
*/
define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_APPENDER_STATE', 1000);
@@ -106,8 +106,7 @@
/**
* Constructor
*/
- function LoggerDOMConfigurator()
- {
+ public function __construct() {
$this->state = array();
$this->logger = null;
$this->appender = null;
@@ -125,7 +124,7 @@
* @static
*/
public static function configure($url = '') {
- $configurator = new LoggerDOMConfigurator();
+ $configurator = new self();
$repository =& LoggerManager::getLoggerRepository();
return $configurator->doConfigure($url, $repository);
}
