Author: kurdalen
Date: Tue May 5 12:51:53 2009
New Revision: 771701
URL: http://svn.apache.org/viewvc?rev=771701&view=rev
Log:
fixes related to #LOG4PHP-41
Added:
incubator/log4php/trunk/src/main/php/LoggerFilter.php
- copied unchanged from r771577,
incubator/log4php/trunk/src/main/php/spi/LoggerFilter.php
incubator/log4php/trunk/src/main/php/configurators/LoggerDOMConfigurator.php
- copied, changed from r771577,
incubator/log4php/trunk/src/main/php/xml/LoggerDOMConfigurator.php
incubator/log4php/trunk/src/main/php/filters/
incubator/log4php/trunk/src/main/php/filters/LoggerFilterDenyAll.php
- copied, changed from r771577,
incubator/log4php/trunk/src/main/php/varia/LoggerDenyAllFilter.php
incubator/log4php/trunk/src/main/php/filters/LoggerFilterLevelMatch.php
- copied, changed from r771577,
incubator/log4php/trunk/src/main/php/varia/LoggerLevelMatchFilter.php
incubator/log4php/trunk/src/main/php/filters/LoggerFilterLevelRange.php
- copied, changed from r771577,
incubator/log4php/trunk/src/main/php/varia/LoggerLevelRangeFilter.php
incubator/log4php/trunk/src/main/php/filters/LoggerFilterStringMatch.php
- copied, changed from r771577,
incubator/log4php/trunk/src/main/php/varia/LoggerStringMatchFilter.php
incubator/log4php/trunk/src/main/php/renderers/
incubator/log4php/trunk/src/main/php/renderers/LoggerRendererDefault.php
- copied, changed from r771577,
incubator/log4php/trunk/src/main/php/or/LoggerDefaultRenderer.php
incubator/log4php/trunk/src/main/php/renderers/LoggerRendererMap.php
- copied, changed from r771577,
incubator/log4php/trunk/src/main/php/or/LoggerRendererMap.php
incubator/log4php/trunk/src/main/php/renderers/LoggerRendererObject.php
- copied, changed from r771577,
incubator/log4php/trunk/src/main/php/or/LoggerObjectRenderer.php
Removed:
incubator/log4php/trunk/src/main/php/or/
incubator/log4php/trunk/src/main/php/varia/
Modified:
incubator/log4php/trunk/src/main/php/LoggerManager.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=771701&r1=771700&r2=771701&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerManager.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerManager.php Tue May 5 12:51:53
2009
@@ -92,18 +92,18 @@
'LoggerLayoutTTCC' => '/layouts/LoggerLayoutTTCC.php',
'LoggerPatternLayout' => '/layouts/LoggerPatternLayout.php',
'LoggerXmlLayout' => '/layouts/LoggerXmlLayout.php',
- 'LoggerDefaultRenderer' => '/or/LoggerDefaultRenderer.php',
- 'LoggerObjectRenderer' => '/or/LoggerObjectRenderer.php',
- 'LoggerRendererMap' => '/or/LoggerRendererMap.php',
+ 'LoggerRendererDefault' =>
'/renderers/LoggerRendererDefault.php',
+ 'LoggerRendererObject' => '/renderers/LoggerRendererObject.php',
+ 'LoggerRendererMap' => '/renderers/LoggerRendererMap.php',
'LoggerConfigurator' => '/spi/LoggerConfigurator.php',
'LoggerFactory' => '/spi/LoggerFactory.php',
- 'LoggerFilter' => '/spi/LoggerFilter.php',
+ 'LoggerFilter' => '/LoggerFilter.php',
'LoggerLocationInfo' => '/spi/LoggerLocationInfo.php',
'LoggerLoggingEvent' => '/spi/LoggerLoggingEvent.php',
- 'LoggerDenyAllFilter' => '/varia/LoggerDenyAllFilter.php',
- 'LoggerLevelMatchFilter' => '/varia/LoggerLevelMatchFilter.php',
- 'LoggerLevelRangeFilter' => '/varia/LoggerLevelRangeFilter.php',
- 'LoggerStringMatchFilter' =>
'/varia/LoggerStringMatchFilter.php',
+ 'LoggerFilterDenyAll' => '/filters/LoggerDenyAllFilter.php',
+ 'LoggerFilterLevelMatch' =>
'/filters/LoggerLevelMatchFilter.php',
+ 'LoggerFilterLevelRange' =>
'/filters/LoggerLevelRangeFilter.php',
+ 'LoggerFilterStringMatch' =>
'/filters/LoggerStringMatchFilter.php',
'LoggerDOMConfigurator' => '/xml/LoggerDOMConfigurator.php',
);
Copied:
incubator/log4php/trunk/src/main/php/configurators/LoggerDOMConfigurator.php
(from r771577,
incubator/log4php/trunk/src/main/php/xml/LoggerDOMConfigurator.php)
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/configurators/LoggerDOMConfigurator.php?p2=incubator/log4php/trunk/src/main/php/configurators/LoggerDOMConfigurator.php&p1=incubator/log4php/trunk/src/main/php/xml/LoggerDOMConfigurator.php&r1=771577&r2=771701&rev=771701&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/xml/LoggerDOMConfigurator.php
(original)
+++
incubator/log4php/trunk/src/main/php/configurators/LoggerDOMConfigurator.php
Tue May 5 12:51:53 2009
@@ -71,7 +71,7 @@
* @subpackage xml
* @since 0.4
*/
-class LoggerDOMConfigurator implements LoggerConfigurator {
+class LoggerConfiguratorDOM implements LoggerConfigurator {
/**
* @var LoggerHierarchy
@@ -397,7 +397,7 @@
$renderingClass = $this->subst(@$attribs['RENDERINGCLASS']);
if (!empty($renderedClass) and !empty($renderingClass)) {
- $renderer = LoggerObjectRenderer::factory($renderingClass);
+ $renderer = LoggerRendererObject::factory($renderingClass);
if ($renderer === null) {
// LoggerDOMConfigurator::tagOpen() RENDERER cannot
instantiate '$renderingClass'
} else {
Copied: incubator/log4php/trunk/src/main/php/filters/LoggerFilterDenyAll.php
(from r771577,
incubator/log4php/trunk/src/main/php/varia/LoggerDenyAllFilter.php)
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/filters/LoggerFilterDenyAll.php?p2=incubator/log4php/trunk/src/main/php/filters/LoggerFilterDenyAll.php&p1=incubator/log4php/trunk/src/main/php/varia/LoggerDenyAllFilter.php&r1=771577&r2=771701&rev=771701&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/varia/LoggerDenyAllFilter.php
(original)
+++ incubator/log4php/trunk/src/main/php/filters/LoggerFilterDenyAll.php Tue
May 5 12:51:53 2009
@@ -17,7 +17,7 @@
*
*
* @package log4php
- * @subpackage varia
+ * @subpackage filters
*/
/**
@@ -33,7 +33,7 @@
* @subpackage varia
* @since 0.3
*/
-class LoggerDenyAllFilter extends LoggerFilter {
+class LoggerFilterDenyAll extends LoggerFilter {
/**
* Always returns the integer constant {...@link LoggerFilter::DENY}
Copied: incubator/log4php/trunk/src/main/php/filters/LoggerFilterLevelMatch.php
(from r771577,
incubator/log4php/trunk/src/main/php/varia/LoggerLevelMatchFilter.php)
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/filters/LoggerFilterLevelMatch.php?p2=incubator/log4php/trunk/src/main/php/filters/LoggerFilterLevelMatch.php&p1=incubator/log4php/trunk/src/main/php/varia/LoggerLevelMatchFilter.php&r1=771577&r2=771701&rev=771701&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/varia/LoggerLevelMatchFilter.php
(original)
+++ incubator/log4php/trunk/src/main/php/filters/LoggerFilterLevelMatch.php Tue
May 5 12:51:53 2009
@@ -17,7 +17,7 @@
*
*
* @package log4php
- * @subpackage varia
+ * @subpackage filters
*/
/**
@@ -37,7 +37,7 @@
* @subpackage varia
* @since 0.6
*/
-class LoggerLevelMatchFilter extends LoggerFilter {
+class LoggerFilterLevelMatch extends LoggerFilter {
/**
* @var boolean
Copied: incubator/log4php/trunk/src/main/php/filters/LoggerFilterLevelRange.php
(from r771577,
incubator/log4php/trunk/src/main/php/varia/LoggerLevelRangeFilter.php)
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/filters/LoggerFilterLevelRange.php?p2=incubator/log4php/trunk/src/main/php/filters/LoggerFilterLevelRange.php&p1=incubator/log4php/trunk/src/main/php/varia/LoggerLevelRangeFilter.php&r1=771577&r2=771701&rev=771701&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/varia/LoggerLevelRangeFilter.php
(original)
+++ incubator/log4php/trunk/src/main/php/filters/LoggerFilterLevelRange.php Tue
May 5 12:51:53 2009
@@ -17,7 +17,7 @@
*
*
* @package log4php
- * @subpackage varia
+ * @subpackage filters
*/
/**
@@ -55,7 +55,7 @@
* @subpackage varia
* @since 0.6
*/
-class LoggerLevelRangeFilter extends LoggerFilter {
+class LoggerFilterLevelRange extends LoggerFilter {
/**
* @var boolean
Copied:
incubator/log4php/trunk/src/main/php/filters/LoggerFilterStringMatch.php (from
r771577, incubator/log4php/trunk/src/main/php/varia/LoggerStringMatchFilter.php)
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/filters/LoggerFilterStringMatch.php?p2=incubator/log4php/trunk/src/main/php/filters/LoggerFilterStringMatch.php&p1=incubator/log4php/trunk/src/main/php/varia/LoggerStringMatchFilter.php&r1=771577&r2=771701&rev=771701&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/varia/LoggerStringMatchFilter.php
(original)
+++ incubator/log4php/trunk/src/main/php/filters/LoggerFilterStringMatch.php
Tue May 5 12:51:53 2009
@@ -17,7 +17,7 @@
*
*
* @package log4php
- * @subpackage varia
+ * @subpackage filters
*/
/**
@@ -37,7 +37,7 @@
* @subpackage varia
* @since 0.3
*/
-class LoggerStringMatchFilter extends LoggerFilter {
+class LoggerFilterStringMatch extends LoggerFilter {
/**
* @var boolean
Copied:
incubator/log4php/trunk/src/main/php/renderers/LoggerRendererDefault.php (from
r771577, incubator/log4php/trunk/src/main/php/or/LoggerDefaultRenderer.php)
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/renderers/LoggerRendererDefault.php?p2=incubator/log4php/trunk/src/main/php/renderers/LoggerRendererDefault.php&p1=incubator/log4php/trunk/src/main/php/or/LoggerDefaultRenderer.php&r1=771577&r2=771701&rev=771701&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/or/LoggerDefaultRenderer.php (original)
+++ incubator/log4php/trunk/src/main/php/renderers/LoggerRendererDefault.php
Tue May 5 12:51:53 2009
@@ -27,7 +27,7 @@
* @subpackage or
* @since 0.3
*/
-class LoggerDefaultRenderer extends LoggerObjectRenderer {
+class LoggerRendererDefault extends LoggerRendererObject {
/**
* Render objects by type casting
Copied: incubator/log4php/trunk/src/main/php/renderers/LoggerRendererMap.php
(from r771577, incubator/log4php/trunk/src/main/php/or/LoggerRendererMap.php)
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/renderers/LoggerRendererMap.php?p2=incubator/log4php/trunk/src/main/php/renderers/LoggerRendererMap.php&p1=incubator/log4php/trunk/src/main/php/or/LoggerRendererMap.php&r1=771577&r2=771701&rev=771701&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/or/LoggerRendererMap.php (original)
+++ incubator/log4php/trunk/src/main/php/renderers/LoggerRendererMap.php Tue
May 5 12:51:53 2009
@@ -21,7 +21,7 @@
*/
/**
- * Map class objects to an {...@link LoggerObjectRenderer}.
+ * Map class objects to an {...@link LoggerRendererObject}.
*
* @version $Revision$
* @package log4php
@@ -45,7 +45,7 @@
*/
public function __construct() {
$this->map = array();
- $this->defaultRenderer = new LoggerDefaultRenderer();
+ $this->defaultRenderer = new LoggerRendererDefault();
}
/**
@@ -58,7 +58,7 @@
* @static
*/
public static function addRenderer($repository, $renderedClassName,
$renderingClassName) {
- $renderer = LoggerObjectRenderer::factory($renderingClassName);
+ $renderer = LoggerRendererObject::factory($renderingClassName);
if($renderer == null) {
return;
} else {
@@ -72,7 +72,7 @@
* <var>o</var> parameter.
*
* This is accomplished by calling the {...@link getByObject()}
- * method if <var>o</var> is object or using {...@link
LoggerDefaultRenderer}.
+ * method if <var>o</var> is object or using {...@link
LoggerRendererDefault}.
* Once a renderer is found, it is applied on the object <var>o</var>
and
* the result is returned as a string.
*
@@ -116,7 +116,7 @@
* renderers could be found, then the default renderer is returned.
*
* @param string $class
- * @return LoggerObjectRenderer
+ * @return LoggerRendererObject
*/
public function getByClassName($class) {
$r = null;
@@ -129,7 +129,7 @@
}
/**
- * @return LoggerDefaultRenderer
+ * @return LoggerRendererDefault
*/
public function getDefaultRenderer() {
return $this->defaultRenderer;
@@ -141,9 +141,9 @@
}
/**
- * Register a {...@link LoggerObjectRenderer} for <var>clazz</var>.
+ * Register a {...@link LoggerRendererObject} for <var>clazz</var>.
* @param string $class
- * @param LoggerObjectRenderer $or
+ * @param LoggerRendererObject $or
*/
public function put($class, $or) {
$this->map[strtolower($class)] = $or;
Copied: incubator/log4php/trunk/src/main/php/renderers/LoggerRendererObject.php
(from r771577, incubator/log4php/trunk/src/main/php/or/LoggerObjectRenderer.php)
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/renderers/LoggerRendererObject.php?p2=incubator/log4php/trunk/src/main/php/renderers/LoggerRendererObject.php&p1=incubator/log4php/trunk/src/main/php/or/LoggerObjectRenderer.php&r1=771577&r2=771701&rev=771701&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/or/LoggerObjectRenderer.php (original)
+++ incubator/log4php/trunk/src/main/php/renderers/LoggerRendererObject.php Tue
May 5 12:51:53 2009
@@ -17,7 +17,7 @@
*
*
* @package log4php
- * @subpackage or
+ * @subpackage renderers
*/
/**
@@ -29,11 +29,11 @@
* @abstract
* @since 0.3
*/
-abstract class LoggerObjectRenderer {
+abstract class LoggerRendererObject {
/**
* @param string $class classname
- * @return LoggerObjectRenderer create LoggerObjectRenderer instances
+ * @return LoggerRendererObject create LoggerRendererObject instances
*/
public static function factory($class) {
if(!empty($class)) {
