Author: kurdalen
Date: Tue Apr 28 14:05:21 2009
New Revision: 769408
URL: http://svn.apache.org/viewvc?rev=769408&view=rev
Log:
fixed #LOG4PHP-29
Modified:
incubator/log4php/trunk/src/main/php/Logger.php
incubator/log4php/trunk/src/main/php/LoggerAppenderSkeleton.php
incubator/log4php/trunk/src/main/php/LoggerBasicConfigurator.php
incubator/log4php/trunk/src/main/php/LoggerDefaultCategoryFactory.php
incubator/log4php/trunk/src/main/php/LoggerHierarchy.php
incubator/log4php/trunk/src/main/php/LoggerLevel.php
incubator/log4php/trunk/src/main/php/LoggerMDC.php
incubator/log4php/trunk/src/main/php/LoggerManager.php
incubator/log4php/trunk/src/main/php/LoggerNDC.php
incubator/log4php/trunk/src/main/php/LoggerPropertyConfigurator.php
incubator/log4php/trunk/src/main/php/LoggerRoot.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderAdodb.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderConsole.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderDailyFile.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderDb.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderEcho.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderFile.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderMail.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderMailEvent.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderNull.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderPhp.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderRollingFile.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSocket.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSyslog.php
incubator/log4php/trunk/src/main/php/config/LoggerPropertySetter.php
incubator/log4php/trunk/src/main/php/helpers/LoggerFormattingInfo.php
incubator/log4php/trunk/src/main/php/helpers/LoggerOptionConverter.php
incubator/log4php/trunk/src/main/php/helpers/LoggerPatternConverter.php
incubator/log4php/trunk/src/main/php/helpers/LoggerPatternParser.php
incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutHtml.php
incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutSimple.php
incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutTTCC.php
incubator/log4php/trunk/src/main/php/layouts/LoggerPatternLayout.php
incubator/log4php/trunk/src/main/php/layouts/LoggerXmlLayout.php
incubator/log4php/trunk/src/main/php/or/LoggerDefaultRenderer.php
incubator/log4php/trunk/src/main/php/or/LoggerRendererMap.php
incubator/log4php/trunk/src/main/php/spi/LoggerFactory.php
incubator/log4php/trunk/src/main/php/spi/LoggerLoggingEvent.php
incubator/log4php/trunk/src/main/php/varia/LoggerDenyAllFilter.php
incubator/log4php/trunk/src/main/php/varia/LoggerLevelMatchFilter.php
incubator/log4php/trunk/src/main/php/varia/LoggerLevelRangeFilter.php
incubator/log4php/trunk/src/main/php/varia/LoggerStringMatchFilter.php
incubator/log4php/trunk/src/main/php/xml/LoggerDOMConfigurator.php
incubator/log4php/trunk/src/test/php/LoggerBasicConfiguratorTest.php
incubator/log4php/trunk/src/test/php/LoggerHierarchyTest.php
incubator/log4php/trunk/src/test/php/LoggerLevelTest.php
incubator/log4php/trunk/src/test/php/LoggerLogTest.php
incubator/log4php/trunk/src/test/php/LoggerManagerTest.php
incubator/log4php/trunk/src/test/php/LoggerRootTest.php
incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderConsoleTest.php
incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderNullTest.php
incubator/log4php/trunk/src/test/php/bootstrap.php
incubator/log4php/trunk/src/test/php/or/LoggerDefaultRendererTest.php
incubator/log4php/trunk/src/test/php/or/LoggerObjectRendererTest.php
incubator/log4php/trunk/src/test/php/or/LoggerRendererMapTest.php
incubator/log4php/trunk/src/test/php/spi/LoggerLoggingEventTest.php
Modified: incubator/log4php/trunk/src/main/php/Logger.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/Logger.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/Logger.php (original)
+++ incubator/log4php/trunk/src/main/php/Logger.php Tue Apr 28 14:05:21 2009
@@ -27,11 +27,6 @@
* @ignore
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__));
-
-/**
- */
-require_once(LOG4PHP_DIR . '/LoggerLevel.php');
-require_once(LOG4PHP_DIR . '/spi/LoggerLoggingEvent.php');
/**
* This class has been deprecated and replaced by the Logger subclass.
Modified: incubator/log4php/trunk/src/main/php/LoggerAppenderSkeleton.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerAppenderSkeleton.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerAppenderSkeleton.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerAppenderSkeleton.php Tue Apr 28
14:05:21 2009
@@ -23,12 +23,6 @@
* @ignore
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__));
-
-/**
- */
-require_once(LOG4PHP_DIR . '/LoggerAppender.php');
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
-require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php');
/**
* Abstract superclass of the other appenders in the package.
Modified: incubator/log4php/trunk/src/main/php/LoggerBasicConfigurator.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerBasicConfigurator.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerBasicConfigurator.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerBasicConfigurator.php Tue Apr 28
14:05:21 2009
@@ -24,11 +24,6 @@
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__));
-require_once(LOG4PHP_DIR . '/spi/LoggerConfigurator.php');
-require_once(LOG4PHP_DIR . '/layouts/LoggerLayoutTTCC.php');
-require_once(LOG4PHP_DIR . '/appenders/LoggerAppenderConsole.php');
-require_once(LOG4PHP_DIR . '/LoggerManager.php');
-
/**
* Use this class to quickly configure the package.
*
Modified: incubator/log4php/trunk/src/main/php/LoggerDefaultCategoryFactory.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerDefaultCategoryFactory.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerDefaultCategoryFactory.php
(original)
+++ incubator/log4php/trunk/src/main/php/LoggerDefaultCategoryFactory.php Tue
Apr 28 14:05:21 2009
@@ -24,9 +24,6 @@
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__));
-require_once(LOG4PHP_DIR . '/spi/LoggerFactory.php');
-require_once(LOG4PHP_DIR . '/Logger.php');
-
/**
* Creates instances of {...@link Logger} with a given name.
*
Modified: incubator/log4php/trunk/src/main/php/LoggerHierarchy.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerHierarchy.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerHierarchy.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerHierarchy.php Tue Apr 28
14:05:21 2009
@@ -25,14 +25,6 @@
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__));
/**
- */
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
-require_once(LOG4PHP_DIR . '/LoggerLevel.php');
-require_once(LOG4PHP_DIR . '/LoggerRoot.php');
-require_once(LOG4PHP_DIR . '/or/LoggerRendererMap.php');
-require_once(LOG4PHP_DIR . '/LoggerDefaultCategoryFactory.php');
-
-/**
* This class is specialized in retrieving loggers by name and also
maintaining
* the logger hierarchy.
*
Modified: incubator/log4php/trunk/src/main/php/LoggerLevel.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerLevel.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerLevel.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerLevel.php Tue Apr 28 14:05:21
2009
@@ -23,10 +23,6 @@
* @ignore
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__));
-
-/**
- */
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
define('LOG4PHP_LEVEL_OFF_INT', 2147483647);
define('LOG4PHP_LEVEL_FATAL_INT', 50000);
Modified: incubator/log4php/trunk/src/main/php/LoggerMDC.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerMDC.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerMDC.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerMDC.php Tue Apr 28 14:05:21 2009
@@ -24,11 +24,6 @@
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__));
-/**
- */
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
-
-
define('LOGGER_MDC_HT_SIZE', 7);
/**
Modified: incubator/log4php/trunk/src/main/php/LoggerManager.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerManager.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerManager.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerManager.php Tue Apr 28 14:05:21
2009
@@ -29,7 +29,7 @@
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__));
-require_once(LOG4PHP_DIR . '/LoggerHierarchy.php');
+spl_autoload_register(array('LoggerManager', 'autoload'));
/**
* Use the LoggerManager to get Logger instances.
@@ -42,6 +42,72 @@
*/
class LoggerManager {
+ private static $_classes = array(
+ 'Logger' => '/Logger.php',
+ 'LoggerAppender' => '/LoggerAppender.php',
+ 'LoggerAppenderSkeleton' => '/LoggerAppenderSkeleton.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',
+ 'LoggerPropertyConfigurator' =>
'/LoggerPropertyConfigurator.php',
+ 'LoggerRoot' => '/LoggerRoot.php',
+ 'LoggerAppenderAdodb' => '/appenders/LoggerAppenderAdodb.php',
+ 'LoggerAppenderConsole' =>
'/appenders/LoggerAppenderConsole.php',
+ 'LoggerAppenderDailyFile' =>
'/appenders/LoggerAppenderDailyFile.php',
+ 'LoggerAppenderDb' => '/appenders/LoggerAppenderDb.php',
+ 'LoggerAppenderEcho' => '/appenders/LoggerAppenderEcho.php',
+ 'LoggerAppenderFile' => '/appenders/LoggerAppenderFile.php',
+ 'LoggerAppenderMail' => '/appenders/LoggerAppenderMail.php',
+ 'LoggerAppenderMailEvent' =>
'/appenders/LoggerAppenderMailEvent.php',
+ 'LoggerAppenderNull' => '/appenders/LoggerAppenderNull.php',
+ 'LoggerAppenderPhp' => '/appenders/LoggerAppenderPhp.php',
+ 'LoggerAppenderRollingFile' =>
'/appenders/LoggerAppenderRollingFile.php',
+ 'LoggerAppenderSocket' => '/appenders/LoggerAppenderSocket.php',
+ 'LoggerAppenderSyslog' => '/appenders/LoggerAppenderSyslog.php',
+ 'LoggerPropertyGetter' => '/config/LoggerPropertyGetter.php',
+ 'LoggerPropertySetter' => '/config/LoggerPropertySetter.php',
+ 'LoggerFormattingInfo' => '/helpers/LoggerFormattingInfo.php',
+ 'LoggerOptionConverter' => '/helpers/LoggerOptionConverter.php',
+ 'LoggerPatternConverter' =>
'/helpers/LoggerPatternConverter.php',
+ 'LoggerPatternParser' => '/helpers/LoggerPatternParser.php',
+ 'LoggerTransform' => '/helpers/LoggerTransform.php',
+ 'LoggerLayoutHtml' => '/layouts/LoggerLayoutHtml.php',
+ 'LoggerLayoutSimple' => '/layouts/LoggerLayoutSimple.php',
+ 'LoggerLayoutTTCC' => '/layouts/LoggerLayoutTTCC.php',
+ 'LoggerPatternLayout' => '/layouts/LoggerPatternLayout.php',
+ 'LoggerXmlLayout' => '/layouts/LoggerXmlLayout.php',
+ 'LoggerDefaultRenderer' => '/or/LoggerDefaultRenderer.php',
+ 'LoggerObjectRenderer' => '/or/LoggerObjectRenderer.php',
+ 'LoggerRendererMap' => '/or/LoggerRendererMap.php',
+ 'LoggerConfigurator' => '/spi/LoggerConfigurator.php',
+ 'LoggerFactory' => '/spi/LoggerFactory.php',
+ 'LoggerFilter' => '/spi/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',
+ 'LoggerDOMConfigurator' => '/xml/LoggerDOMConfigurator.php',
+ );
+
+ /**
+ * Class autoloader
+ * This method is provided to be invoked within an __autoload() magic
method.
+ * @param string class name
+ */
+ public static function autoload($className) {
+ if(isset(self::$_classes[$className])) {
+ include LOG4PHP_DIR.self::$_classes[$className];
+ }
+ }
+
/**
* check if a given logger exists.
*
Modified: incubator/log4php/trunk/src/main/php/LoggerNDC.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerNDC.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerNDC.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerNDC.php Tue Apr 28 14:05:21 2009
@@ -23,10 +23,6 @@
* @ignore
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__));
-
-/**
- */
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
define('LOGGER_NDC_HT_SIZE', 7);
Modified: incubator/log4php/trunk/src/main/php/LoggerPropertyConfigurator.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerPropertyConfigurator.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerPropertyConfigurator.php
(original)
+++ incubator/log4php/trunk/src/main/php/LoggerPropertyConfigurator.php Tue Apr
28 14:05:21 2009
@@ -24,18 +24,6 @@
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__));
-require_once(LOG4PHP_DIR . '/config/LoggerPropertySetter.php');
-require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php');
-require_once(LOG4PHP_DIR . '/or/LoggerObjectRenderer.php');
-require_once(LOG4PHP_DIR . '/or/LoggerRendererMap.php');
-require_once(LOG4PHP_DIR . '/spi/LoggerConfigurator.php');
-require_once(LOG4PHP_DIR . '/spi/LoggerFilter.php');
-require_once(LOG4PHP_DIR . '/LoggerAppender.php');
-require_once(LOG4PHP_DIR . '/LoggerDefaultCategoryFactory.php');
-require_once(LOG4PHP_DIR . '/LoggerLayout.php');
-require_once(LOG4PHP_DIR . '/LoggerLevel.php');
-require_once(LOG4PHP_DIR . '/LoggerManager.php');
-
define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_CATEGORY_PREFIX',
"log4php.category.");
define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_PREFIX',
"log4php.logger.");
define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_FACTORY_PREFIX',
"log4php.factory");
Modified: incubator/log4php/trunk/src/main/php/LoggerRoot.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerRoot.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerRoot.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerRoot.php Tue Apr 28 14:05:21 2009
@@ -23,11 +23,6 @@
* @ignore
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__));
-
-/**
- */
-require_once(LOG4PHP_DIR . '/Logger.php');
-require_once(LOG4PHP_DIR . '/LoggerLevel.php');
/**
* The root logger.
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=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderAdodb.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderAdodb.php Tue
Apr 28 14:05:21 2009
@@ -24,10 +24,6 @@
* @ignore
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-
-require_once(LOG4PHP_DIR . '/LoggerAppenderSkeleton.php');
-require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php');
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
require_once(ADODB_DIR . '/adodb.inc.php');
Modified:
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderConsole.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderConsole.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderConsole.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderConsole.php
Tue Apr 28 14:05:21 2009
@@ -22,12 +22,6 @@
/** @ignore */
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-
-/**
- */
-require_once(LOG4PHP_DIR . '/LoggerAppenderSkeleton.php');
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
-
/**
* ConsoleAppender appends log events to STDOUT or STDERR using a layout
specified by the user.
Modified:
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderDailyFile.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderDailyFile.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderDailyFile.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderDailyFile.php
Tue Apr 28 14:05:21 2009
@@ -24,8 +24,6 @@
* @ignore
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-
-require_once(LOG4PHP_DIR . '/appenders/LoggerAppenderFile.php');
/**
* LoggerAppenderDailyFile appends log events to a file ne.
Modified: incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderDb.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderDb.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderDb.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderDb.php Tue Apr
28 14:05:21 2009
@@ -25,9 +25,6 @@
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-require_once(LOG4PHP_DIR . '/LoggerAppenderSkeleton.php');
-require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php');
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
require_once('DB.php');
/**
Modified: incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderEcho.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderEcho.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderEcho.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderEcho.php Tue
Apr 28 14:05:21 2009
@@ -24,11 +24,6 @@
* @ignore
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-
-/**
- */
-require_once(LOG4PHP_DIR . '/LoggerAppenderSkeleton.php');
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
/**
* LoggerAppenderEcho uses {...@link PHP_MANUAL#echo echo} function to output
events.
Modified: incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderFile.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderFile.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderFile.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderFile.php Tue
Apr 28 14:05:21 2009
@@ -25,10 +25,6 @@
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-require_once(LOG4PHP_DIR . '/LoggerAppenderSkeleton.php');
-require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php');
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
-
/**
* FileAppender appends log events to a file.
*
@@ -66,10 +62,15 @@
LoggerLog::debug("LoggerAppenderFile::activateOptions() opening file
'{$fileName}'");
$this->fp = fopen($fileName, ($this->getAppend()? 'a':'w'));
if ($this->fp) {
- if ($this->getAppend())
- fseek($this->fp, 0, SEEK_END);
- fwrite($this->fp, $this->layout->getHeader());
- $this->closed = false;
+ if(flock($this->fp, LOCK_EX)) {
+ if ($this->getAppend())
+ fseek($this->fp, 0, SEEK_END);
+ fwrite($this->fp, $this->layout->getHeader());
+ $this->closed = false;
+ } else { // race condition, unable to lock file
+ // TODO: should we take some action in this
case?
+ $this->closed = true;
+ }
} else {
$this->closed = true;
}
Modified: incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderMail.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderMail.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderMail.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderMail.php Tue
Apr 28 14:05:21 2009
@@ -24,9 +24,6 @@
* @ignore
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-
-require_once(LOG4PHP_DIR . '/LoggerAppenderSkeleton.php');
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
/**
* Appends log events to mail using php function {...@link PHP_MANUAL#mail}.
Modified:
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderMailEvent.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderMailEvent.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderMailEvent.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderMailEvent.php
Tue Apr 28 14:05:21 2009
@@ -26,11 +26,6 @@
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
/**
- */
-require_once(LOG4PHP_DIR . '/LoggerAppenderSkeleton.php');
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
-
-/**
* Log events to an email address. It will be created an email for each event.
*
* <p>Parameters are
Modified: incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderNull.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderNull.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderNull.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderNull.php Tue
Apr 28 14:05:21 2009
@@ -22,9 +22,6 @@
/** @ignore */
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-
-require_once(LOG4PHP_DIR . '/LoggerAppenderSkeleton.php');
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
/**
* A NullAppender merely exists, it never outputs a message to any device.
Modified: incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderPhp.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderPhp.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderPhp.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderPhp.php Tue
Apr 28 14:05:21 2009
@@ -24,10 +24,6 @@
* @ignore
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-
-require_once(LOG4PHP_DIR . '/LoggerAppenderSkeleton.php');
-require_once(LOG4PHP_DIR . '/LoggerLevel.php');
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
/**
* Log events using php {...@link PHP_MANUAL#trigger_error} function and a
{...@link LoggerLayoutTTCC} default layout.
Modified:
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderRollingFile.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderRollingFile.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
---
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderRollingFile.php
(original)
+++
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderRollingFile.php
Tue Apr 28 14:05:21 2009
@@ -24,8 +24,6 @@
* @ignore
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-
-require_once(LOG4PHP_DIR . '/appenders/LoggerAppenderFile.php');
/**
* LoggerAppenderRollingFile extends LoggerAppenderFile to backup the log
files
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=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSocket.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSocket.php Tue
Apr 28 14:05:21 2009
@@ -28,11 +28,6 @@
define('LOG4PHP_LOGGER_APPENDER_SOCKET_DEFAULT_PORT', 4446);
define('LOG4PHP_LOGGER_APPENDER_SOCKET_DEFAULT_TIMEOUT', 30);
-require_once(LOG4PHP_DIR . '/LoggerAppenderSkeleton.php');
-require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php');
-require_once(LOG4PHP_DIR . '/LoggerLayout.php');
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
-
/**
* Serialize events and send them to a network socket.
*
Modified:
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSyslog.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSyslog.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSyslog.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSyslog.php Tue
Apr 28 14:05:21 2009
@@ -24,10 +24,6 @@
* @ignore
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-
-require_once(LOG4PHP_DIR . '/LoggerAppenderSkeleton.php');
-require_once(LOG4PHP_DIR . '/LoggerLevel.php');
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
/**
* Log events using php {...@link PHP_MANUAL#syslog} function.
Modified: incubator/log4php/trunk/src/main/php/config/LoggerPropertySetter.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/config/LoggerPropertySetter.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/config/LoggerPropertySetter.php
(original)
+++ incubator/log4php/trunk/src/main/php/config/LoggerPropertySetter.php Tue
Apr 28 14:05:21 2009
@@ -25,9 +25,6 @@
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
-require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php');
-
/**
* General purpose Object property setter. Clients repeatedly invokes
* {...@link setProperty()} in order to invoke setters
Modified: incubator/log4php/trunk/src/main/php/helpers/LoggerFormattingInfo.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/helpers/LoggerFormattingInfo.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/helpers/LoggerFormattingInfo.php
(original)
+++ incubator/log4php/trunk/src/main/php/helpers/LoggerFormattingInfo.php Tue
Apr 28 14:05:21 2009
@@ -24,10 +24,6 @@
* @ignore
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-
-/**
- */
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
/**
* This class encapsulates the information obtained when parsing
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=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/helpers/LoggerOptionConverter.php
(original)
+++ incubator/log4php/trunk/src/main/php/helpers/LoggerOptionConverter.php Tue
Apr 28 14:05:21 2009
@@ -25,8 +25,6 @@
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-require_once(LOG4PHP_DIR . '/LoggerLevel.php');
-
define('LOG4PHP_OPTION_CONVERTER_DELIM_START', '${');
define('LOG4PHP_OPTION_CONVERTER_DELIM_STOP', '}');
define('LOG4PHP_OPTION_CONVERTER_DELIM_START_LEN', 2);
Modified:
incubator/log4php/trunk/src/main/php/helpers/LoggerPatternConverter.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/helpers/LoggerPatternConverter.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/helpers/LoggerPatternConverter.php
(original)
+++ incubator/log4php/trunk/src/main/php/helpers/LoggerPatternConverter.php Tue
Apr 28 14:05:21 2009
@@ -26,10 +26,6 @@
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
/**
- */
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
-
-/**
* Array for fast space padding
* Used by {...@link LoggerPatternConverter::spacePad()}.
*/
Modified: incubator/log4php/trunk/src/main/php/helpers/LoggerPatternParser.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/helpers/LoggerPatternParser.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/helpers/LoggerPatternParser.php
(original)
+++ incubator/log4php/trunk/src/main/php/helpers/LoggerPatternParser.php Tue
Apr 28 14:05:21 2009
@@ -38,12 +38,6 @@
define('LOG4PHP_LINE_SEP', "\n");
}
}
-
-/**
- */
-require_once(LOG4PHP_DIR . '/helpers/LoggerFormattingInfo.php');
-require_once(LOG4PHP_DIR . '/helpers/LoggerPatternConverter.php');
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
define('LOG4PHP_LOGGER_PATTERN_PARSER_ESCAPE_CHAR', '%');
Modified: incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutHtml.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutHtml.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutHtml.php (original)
+++ incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutHtml.php Tue Apr
28 14:05:21 2009
@@ -38,11 +38,6 @@
define('LOG4PHP_LINE_SEP', "\n");
}
}
-
-/**
- */
-require_once(LOG4PHP_DIR . '/LoggerLayout.php');
-require_once(LOG4PHP_DIR . '/spi/LoggerLoggingEvent.php');
/**
* This layout outputs events in a HTML table.
Modified: incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutSimple.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutSimple.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutSimple.php
(original)
+++ incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutSimple.php Tue Apr
28 14:05:21 2009
@@ -36,11 +36,6 @@
}
}
-
-/**
- */
-require_once(LOG4PHP_DIR . '/LoggerLayout.php');
-
/**
* A simple layout.
*
Modified: incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutTTCC.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutTTCC.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutTTCC.php (original)
+++ incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutTTCC.php Tue Apr
28 14:05:21 2009
@@ -38,11 +38,7 @@
define('LOG4PHP_LINE_SEP', "\n");
}
}
-
-/**
- */
-require_once(LOG4PHP_DIR . '/LoggerLayout.php');
-
+
/**
* String constant designating no time information. Current value of
* this constant is <b>NULL</b>.
Modified: incubator/log4php/trunk/src/main/php/layouts/LoggerPatternLayout.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/layouts/LoggerPatternLayout.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/layouts/LoggerPatternLayout.php
(original)
+++ incubator/log4php/trunk/src/main/php/layouts/LoggerPatternLayout.php Tue
Apr 28 14:05:21 2009
@@ -24,12 +24,6 @@
* @ignore
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-
-/**
- */
-require_once(LOG4PHP_DIR . '/helpers/LoggerPatternParser.php');
-require_once(LOG4PHP_DIR . '/LoggerLayout.php');
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
/**
* Default conversion Pattern
Modified: incubator/log4php/trunk/src/main/php/layouts/LoggerXmlLayout.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/layouts/LoggerXmlLayout.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/layouts/LoggerXmlLayout.php (original)
+++ incubator/log4php/trunk/src/main/php/layouts/LoggerXmlLayout.php Tue Apr 28
14:05:21 2009
@@ -32,12 +32,6 @@
define('LOG4PHP_LOGGER_XML_LAYOUT_LOG4PHP_NS',
'http://logging.apache.org/log4php/');
/**
- */
-require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php');
-require_once(LOG4PHP_DIR . '/helpers/LoggerTransform.php');
-require_once(LOG4PHP_DIR . '/LoggerLayout.php');
-
-/**
* The output of the LoggerXmlLayout consists of a series of log4php:event
elements.
*
* <p>Parameters: {...@link $locationInfo}.</p>
Modified: incubator/log4php/trunk/src/main/php/or/LoggerDefaultRenderer.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/or/LoggerDefaultRenderer.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/or/LoggerDefaultRenderer.php (original)
+++ incubator/log4php/trunk/src/main/php/or/LoggerDefaultRenderer.php Tue Apr
28 14:05:21 2009
@@ -24,10 +24,6 @@
* @ignore
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-
-/**
- */
-require_once LOG4PHP_DIR.'/or/LoggerObjectRenderer.php';
/**
* The default Renderer renders objects by type casting
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=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/or/LoggerRendererMap.php (original)
+++ incubator/log4php/trunk/src/main/php/or/LoggerRendererMap.php Tue Apr 28
14:05:21 2009
@@ -24,12 +24,6 @@
* @ignore
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-
-/**
- */
-require_once(LOG4PHP_DIR . '/or/LoggerDefaultRenderer.php');
-require_once(LOG4PHP_DIR . '/or/LoggerObjectRenderer.php');
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
/**
* Map class objects to an {...@link LoggerObjectRenderer}.
Modified: incubator/log4php/trunk/src/main/php/spi/LoggerFactory.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/spi/LoggerFactory.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/spi/LoggerFactory.php (original)
+++ incubator/log4php/trunk/src/main/php/spi/LoggerFactory.php Tue Apr 28
14:05:21 2009
@@ -25,8 +25,6 @@
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__));
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
-
/**
* Extend and implement this abstract class to create new instances of
* {...@link Logger} or a sub-class of {...@link Logger}.
Modified: incubator/log4php/trunk/src/main/php/spi/LoggerLoggingEvent.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/spi/LoggerLoggingEvent.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/spi/LoggerLoggingEvent.php (original)
+++ incubator/log4php/trunk/src/main/php/spi/LoggerLoggingEvent.php Tue Apr 28
14:05:21 2009
@@ -24,13 +24,6 @@
* @ignore
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-
-/**
- */
-require_once(LOG4PHP_DIR . '/spi/LoggerLocationInfo.php');
-require_once(LOG4PHP_DIR . '/LoggerManager.php');
-require_once(LOG4PHP_DIR . '/LoggerMDC.php');
-require_once(LOG4PHP_DIR . '/LoggerNDC.php');
/**
* The internal representation of logging event.
Modified: incubator/log4php/trunk/src/main/php/varia/LoggerDenyAllFilter.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/varia/LoggerDenyAllFilter.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/varia/LoggerDenyAllFilter.php
(original)
+++ incubator/log4php/trunk/src/main/php/varia/LoggerDenyAllFilter.php Tue Apr
28 14:05:21 2009
@@ -24,10 +24,6 @@
* @ignore
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-
-/**
- */
-require_once(LOG4PHP_DIR . '/spi/LoggerFilter.php');
/**
* This filter drops all logging events.
Modified: incubator/log4php/trunk/src/main/php/varia/LoggerLevelMatchFilter.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/varia/LoggerLevelMatchFilter.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/varia/LoggerLevelMatchFilter.php
(original)
+++ incubator/log4php/trunk/src/main/php/varia/LoggerLevelMatchFilter.php Tue
Apr 28 14:05:21 2009
@@ -24,11 +24,6 @@
* @ignore
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-
-/**
- */
-require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php');
-require_once(LOG4PHP_DIR . '/spi/LoggerFilter.php');
/**
* This is a very simple filter based on level matching.
Modified: incubator/log4php/trunk/src/main/php/varia/LoggerLevelRangeFilter.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/varia/LoggerLevelRangeFilter.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/varia/LoggerLevelRangeFilter.php
(original)
+++ incubator/log4php/trunk/src/main/php/varia/LoggerLevelRangeFilter.php Tue
Apr 28 14:05:21 2009
@@ -24,11 +24,6 @@
* @ignore
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-
-/**
- */
-require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php');
-require_once(LOG4PHP_DIR . '/spi/LoggerFilter.php');
/**
* This is a very simple filter based on level matching, which can be
Modified: incubator/log4php/trunk/src/main/php/varia/LoggerStringMatchFilter.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/varia/LoggerStringMatchFilter.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/varia/LoggerStringMatchFilter.php
(original)
+++ incubator/log4php/trunk/src/main/php/varia/LoggerStringMatchFilter.php Tue
Apr 28 14:05:21 2009
@@ -24,10 +24,6 @@
* @ignore
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-
-/**
- */
-require_once(LOG4PHP_DIR . '/spi/LoggerFilter.php');
/**
* This is a very simple filter based on string matching.
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=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/xml/LoggerDOMConfigurator.php
(original)
+++ incubator/log4php/trunk/src/main/php/xml/LoggerDOMConfigurator.php Tue Apr
28 14:05:21 2009
@@ -24,14 +24,6 @@
* @ignore
*/
if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-
-require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php');
-require_once(LOG4PHP_DIR . '/or/LoggerObjectRenderer.php');
-require_once(LOG4PHP_DIR . '/spi/LoggerConfigurator.php');
-require_once(LOG4PHP_DIR . '/LoggerAppender.php');
-require_once(LOG4PHP_DIR . '/LoggerLayout.php');
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
-require_once(LOG4PHP_DIR . '/LoggerManager.php');
define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_APPENDER_STATE', 1000);
define('LOG4PHP_LOGGER_DOM_CONFIGURATOR_LAYOUT_STATE', 1010);
Modified: incubator/log4php/trunk/src/test/php/LoggerBasicConfiguratorTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/LoggerBasicConfiguratorTest.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/LoggerBasicConfiguratorTest.php
(original)
+++ incubator/log4php/trunk/src/test/php/LoggerBasicConfiguratorTest.php Tue
Apr 28 14:05:21 2009
@@ -23,8 +23,6 @@
* @link http://logging.apache.org/log4php
*/
-require_once LOG4PHP_DIR . '/LoggerBasicConfigurator.php';
-
class LoggerBasicConfiguratorTest extends PHPUnit_Framework_TestCase {
protected function setUp() {
Modified: incubator/log4php/trunk/src/test/php/LoggerHierarchyTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/LoggerHierarchyTest.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/LoggerHierarchyTest.php (original)
+++ incubator/log4php/trunk/src/test/php/LoggerHierarchyTest.php Tue Apr 28
14:05:21 2009
@@ -23,10 +23,6 @@
* @link http://logging.apache.org/log4php
*/
-require_once LOG4PHP_DIR . '/layouts/LoggerLayoutTTCC.php';
-require_once LOG4PHP_DIR . '/appenders/LoggerAppenderConsole.php';
-require_once LOG4PHP_DIR . '/LoggerHierarchy.php';
-
class LoggerHierarchyTest extends PHPUnit_Framework_TestCase {
private $hierarchy;
Modified: incubator/log4php/trunk/src/test/php/LoggerLevelTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/LoggerLevelTest.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/LoggerLevelTest.php (original)
+++ incubator/log4php/trunk/src/test/php/LoggerLevelTest.php Tue Apr 28
14:05:21 2009
@@ -23,8 +23,6 @@
* @link http://logging.apache.org/log4php
*/
-require_once LOG4PHP_DIR . '/LoggerLevel.php';
-
/**
* Tests the LoggerLevel
*/
Modified: incubator/log4php/trunk/src/test/php/LoggerLogTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/LoggerLogTest.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/LoggerLogTest.php (original)
+++ incubator/log4php/trunk/src/test/php/LoggerLogTest.php Tue Apr 28 14:05:21
2009
@@ -23,8 +23,6 @@
* @link http://logging.apache.org/log4php
*/
-require_once LOG4PHP_DIR . '/LoggerLog.php';
-
class LoggerLogTest extends PHPUnit_Framework_TestCase {
public function testInternalDebuggingIsInitallyFalse() {
Modified: incubator/log4php/trunk/src/test/php/LoggerManagerTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/LoggerManagerTest.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/LoggerManagerTest.php (original)
+++ incubator/log4php/trunk/src/test/php/LoggerManagerTest.php Tue Apr 28
14:05:21 2009
@@ -23,8 +23,6 @@
* @link http://logging.apache.org/log4php
*/
-require_once LOG4PHP_DIR . '/LoggerManager.php';
-
class LoggerManagerTest extends PHPUnit_Framework_TestCase {
}
Modified: incubator/log4php/trunk/src/test/php/LoggerRootTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/LoggerRootTest.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/LoggerRootTest.php (original)
+++ incubator/log4php/trunk/src/test/php/LoggerRootTest.php Tue Apr 28 14:05:21
2009
@@ -23,8 +23,6 @@
* @link http://logging.apache.org/log4php
*/
-require_once LOG4PHP_DIR . '/LoggerRoot.php';
-
class LoggerRootTest extends PHPUnit_Framework_TestCase {
private $loggerRoot;
Modified:
incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderConsoleTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderConsoleTest.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
---
incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderConsoleTest.php
(original)
+++
incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderConsoleTest.php
Tue Apr 28 14:05:21 2009
@@ -23,8 +23,6 @@
* @link http://logging.apache.org/log4php
*/
-require_once LOG4PHP_DIR . '/appenders/LoggerAppenderConsole.php';
-
class LoggerAppenderConsoleTest extends PHPUnit_Framework_TestCase {
public function testSetTarget() {
Modified:
incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderNullTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderNullTest.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderNullTest.php
(original)
+++ incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderNullTest.php
Tue Apr 28 14:05:21 2009
@@ -23,8 +23,6 @@
* @link http://logging.apache.org/log4php
*/
-require_once LOG4PHP_DIR . '/appenders/LoggerAppenderNull.php';
-
class LoggerAppenderNullTest extends PHPUnit_Framework_TestCase {
public function testActivateOptions() {
Modified: incubator/log4php/trunk/src/test/php/bootstrap.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/bootstrap.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/bootstrap.php (original)
+++ incubator/log4php/trunk/src/test/php/bootstrap.php Tue Apr 28 14:05:21 2009
@@ -30,7 +30,7 @@
define('LOG4PHP_DEFAULT_INIT_OVERRIDE', true);
}
-set_include_path(LOG4PHP_DIR.PATH_SEPARATOR.get_include_path());
+require_once LOG4PHP_DIR.'/LoggerManager.php';
require_once 'PHPUnit/Framework/TestCase.php';
require_once 'PHPUnit/Framework/TestSuite.php';
Modified: incubator/log4php/trunk/src/test/php/or/LoggerDefaultRendererTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/or/LoggerDefaultRendererTest.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/or/LoggerDefaultRendererTest.php
(original)
+++ incubator/log4php/trunk/src/test/php/or/LoggerDefaultRendererTest.php Tue
Apr 28 14:05:21 2009
@@ -23,8 +23,6 @@
* @link http://logging.apache.org/log4php
*/
-require_once LOG4PHP_DIR.'/or/LoggerDefaultRenderer.php';
-
class DefaultRendererMockObject {
private $a;
protected $b;
Modified: incubator/log4php/trunk/src/test/php/or/LoggerObjectRendererTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/or/LoggerObjectRendererTest.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/or/LoggerObjectRendererTest.php
(original)
+++ incubator/log4php/trunk/src/test/php/or/LoggerObjectRendererTest.php Tue
Apr 28 14:05:21 2009
@@ -23,8 +23,6 @@
* @link http://logging.apache.org/log4php
*/
-require_once LOG4PHP_DIR.'/or/LoggerObjectRenderer.php';
-
class LoggerObjectRendererTest extends PHPUnit_Framework_TestCase {
public function testFactory() {
Modified: incubator/log4php/trunk/src/test/php/or/LoggerRendererMapTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/or/LoggerRendererMapTest.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/or/LoggerRendererMapTest.php (original)
+++ incubator/log4php/trunk/src/test/php/or/LoggerRendererMapTest.php Tue Apr
28 14:05:21 2009
@@ -23,9 +23,6 @@
* @link http://logging.apache.org/log4php
*/
-require_once LOG4PHP_DIR.'/or/LoggerRendererMap.php';
-require_once LOG4PHP_DIR.'/LoggerHierarchy.php';
-
class LoggerRendererMapTest extends PHPUnit_Framework_TestCase {
public function testAddRenderer() {
Modified: incubator/log4php/trunk/src/test/php/spi/LoggerLoggingEventTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/spi/LoggerLoggingEventTest.php?rev=769408&r1=769407&r2=769408&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/spi/LoggerLoggingEventTest.php
(original)
+++ incubator/log4php/trunk/src/test/php/spi/LoggerLoggingEventTest.php Tue Apr
28 14:05:21 2009
@@ -25,11 +25,6 @@
* @link http://logging.apache.org/log4php
*/
-require_once LOG4PHP_DIR.'/appenders/LoggerAppenderNull.php';
-require_once LOG4PHP_DIR.'/spi/LoggerLoggingEvent.php';
-require_once LOG4PHP_DIR.'/LoggerHierarchy.php';
-require_once LOG4PHP_DIR.'/LoggerLayout.php';
-
class LoggerLoggingEventTestCaseAppender extends LoggerAppenderNull {
protected $requiresLayout = true;
