You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4php-dev@logging.apache.org by ku...@apache.org on 2009/04/30 14:05:24 UTC
svn commit: r770180 - in /incubator/log4php/trunk/src/examples: php/
resources/
Author: kurdalen
Date: Thu Apr 30 12:05:23 2009
New Revision: 770180
URL: http://svn.apache.org/viewvc?rev=770180&view=rev
Log:
reorganized example configurations as suggested by Curt Arnold
Added:
incubator/log4php/trunk/src/examples/resources/
incubator/log4php/trunk/src/examples/resources/cache.properties
- copied unchanged from r770176, incubator/log4php/trunk/src/examples/php/cache.properties
incubator/log4php/trunk/src/examples/resources/client.properties
- copied unchanged from r770176, incubator/log4php/trunk/src/examples/php/client.properties
incubator/log4php/trunk/src/examples/resources/console.properties
- copied unchanged from r770176, incubator/log4php/trunk/src/examples/php/console.properties
incubator/log4php/trunk/src/examples/resources/dailyfile.properties
- copied unchanged from r770176, incubator/log4php/trunk/src/examples/php/dailyfile.properties
incubator/log4php/trunk/src/examples/resources/echo.properties
- copied unchanged from r770176, incubator/log4php/trunk/src/examples/php/echo.properties
incubator/log4php/trunk/src/examples/resources/file.properties
incubator/log4php/trunk/src/examples/resources/levelmatchfilter.xml
- copied unchanged from r770176, incubator/log4php/trunk/src/examples/php/levelmatchfilter.xml
incubator/log4php/trunk/src/examples/resources/levelrangefilter.xml
- copied unchanged from r770176, incubator/log4php/trunk/src/examples/php/levelrangefilter.xml
incubator/log4php/trunk/src/examples/resources/mail.properties
- copied unchanged from r770176, incubator/log4php/trunk/src/examples/php/mail.properties
incubator/log4php/trunk/src/examples/resources/mdc.properties
- copied unchanged from r770176, incubator/log4php/trunk/src/examples/php/mdc.properties
incubator/log4php/trunk/src/examples/resources/ndc.properties
- copied unchanged from r770176, incubator/log4php/trunk/src/examples/php/ndc.properties
incubator/log4php/trunk/src/examples/resources/php.properties
- copied, changed from r770176, incubator/log4php/trunk/src/examples/php/php.properties
incubator/log4php/trunk/src/examples/resources/server.properties
- copied unchanged from r770176, incubator/log4php/trunk/src/examples/php/server.properties
incubator/log4php/trunk/src/examples/resources/stringmatchfilter.xml
- copied unchanged from r770176, incubator/log4php/trunk/src/examples/php/stringmatchfilter.xml
incubator/log4php/trunk/src/examples/resources/syslog.properties
- copied unchanged from r770176, incubator/log4php/trunk/src/examples/php/syslog.properties
Removed:
incubator/log4php/trunk/src/examples/php/cache.properties
incubator/log4php/trunk/src/examples/php/client.properties
incubator/log4php/trunk/src/examples/php/console.properties
incubator/log4php/trunk/src/examples/php/dailyfile.properties
incubator/log4php/trunk/src/examples/php/echo.properties
incubator/log4php/trunk/src/examples/php/file.properties
incubator/log4php/trunk/src/examples/php/levelmatchfilter.xml
incubator/log4php/trunk/src/examples/php/levelrangefilter.xml
incubator/log4php/trunk/src/examples/php/mail.properties
incubator/log4php/trunk/src/examples/php/mdc.properties
incubator/log4php/trunk/src/examples/php/ndc.properties
incubator/log4php/trunk/src/examples/php/php.properties
incubator/log4php/trunk/src/examples/php/server.properties
incubator/log4php/trunk/src/examples/php/stringmatchfilter.xml
incubator/log4php/trunk/src/examples/php/syslog.properties
Modified:
incubator/log4php/trunk/src/examples/php/cache.php
incubator/log4php/trunk/src/examples/php/client.php
incubator/log4php/trunk/src/examples/php/console.php
incubator/log4php/trunk/src/examples/php/dailyfile.php
incubator/log4php/trunk/src/examples/php/echo.php
incubator/log4php/trunk/src/examples/php/file.php
incubator/log4php/trunk/src/examples/php/levelmatchfilter.php
incubator/log4php/trunk/src/examples/php/levelrangefilter.php
incubator/log4php/trunk/src/examples/php/mail.php
incubator/log4php/trunk/src/examples/php/mdc.php
incubator/log4php/trunk/src/examples/php/ndc.php
incubator/log4php/trunk/src/examples/php/php.php
incubator/log4php/trunk/src/examples/php/server.php
incubator/log4php/trunk/src/examples/php/stringmatchfilter.php
incubator/log4php/trunk/src/examples/php/syslog.php
Modified: incubator/log4php/trunk/src/examples/php/cache.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/cache.php?rev=770180&r1=770179&r2=770180&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/cache.php (original)
+++ incubator/log4php/trunk/src/examples/php/cache.php Thu Apr 30 12:05:23 2009
@@ -16,7 +16,7 @@
* limitations under the License.
*/
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
-define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/cache.properties');
+define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/../resources/cache.properties');
require_once LOG4PHP_DIR.'/LoggerManager.php';
Modified: incubator/log4php/trunk/src/examples/php/client.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/client.php?rev=770180&r1=770179&r2=770180&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/client.php (original)
+++ incubator/log4php/trunk/src/examples/php/client.php Thu Apr 30 12:05:23 2009
@@ -16,7 +16,7 @@
* limitations under the License.
*/
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
-define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/client.properties');
+define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/../resources/client.properties');
require_once LOG4PHP_DIR.'/LoggerManager.php';
$logger = LoggerManager::getRootLogger();
Modified: incubator/log4php/trunk/src/examples/php/console.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/console.php?rev=770180&r1=770179&r2=770180&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/console.php (original)
+++ incubator/log4php/trunk/src/examples/php/console.php Thu Apr 30 12:05:23 2009
@@ -16,7 +16,7 @@
* limitations under the License.
*/
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
-define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/console.properties');
+define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/../resources/console.properties');
require_once LOG4PHP_DIR.'/LoggerManager.php';
$logger = LoggerManager::getRootLogger();
Modified: incubator/log4php/trunk/src/examples/php/dailyfile.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/dailyfile.php?rev=770180&r1=770179&r2=770180&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/dailyfile.php (original)
+++ incubator/log4php/trunk/src/examples/php/dailyfile.php Thu Apr 30 12:05:23 2009
@@ -16,7 +16,7 @@
* limitations under the License.
*/
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
-define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/dailyfile.properties');
+define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/../resources/dailyfile.properties');
require_once LOG4PHP_DIR.'/LoggerManager.php';
$logger = LoggerManager::getRootLogger();
Modified: incubator/log4php/trunk/src/examples/php/echo.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/echo.php?rev=770180&r1=770179&r2=770180&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/echo.php (original)
+++ incubator/log4php/trunk/src/examples/php/echo.php Thu Apr 30 12:05:23 2009
@@ -16,7 +16,7 @@
* limitations under the License.
*/
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
-define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/echo.properties');
+define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/../resources/echo.properties');
require_once LOG4PHP_DIR.'/LoggerManager.php';
$logger = LoggerManager::getRootLogger();
Modified: incubator/log4php/trunk/src/examples/php/file.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/file.php?rev=770180&r1=770179&r2=770180&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/file.php (original)
+++ incubator/log4php/trunk/src/examples/php/file.php Thu Apr 30 12:05:23 2009
@@ -16,7 +16,7 @@
* limitations under the License.
*/
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
-define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/file.properties');
+define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/../resources/file.properties');
require_once LOG4PHP_DIR.'/LoggerManager.php';
$logger = LoggerManager::getRootLogger();
Modified: incubator/log4php/trunk/src/examples/php/levelmatchfilter.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/levelmatchfilter.php?rev=770180&r1=770179&r2=770180&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/levelmatchfilter.php (original)
+++ incubator/log4php/trunk/src/examples/php/levelmatchfilter.php Thu Apr 30 12:05:23 2009
@@ -17,7 +17,7 @@
*/
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
define('LOG4PHP_CONFIGURATOR_CLASS', LOG4PHP_DIR.'/xml/LoggerDOMConfigurator');
-define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/levelmatchfilter.xml');
+define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/../resources/levelmatchfilter.xml');
require_once LOG4PHP_DIR.'/LoggerManager.php';
$logger = LoggerManager::getRootLogger();
Modified: incubator/log4php/trunk/src/examples/php/levelrangefilter.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/levelrangefilter.php?rev=770180&r1=770179&r2=770180&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/levelrangefilter.php (original)
+++ incubator/log4php/trunk/src/examples/php/levelrangefilter.php Thu Apr 30 12:05:23 2009
@@ -17,7 +17,7 @@
*/
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
define('LOG4PHP_CONFIGURATOR_CLASS', LOG4PHP_DIR.'/xml/LoggerDOMConfigurator');
-define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/levelrangefilter.xml');
+define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/../resources/levelrangefilter.xml');
require_once LOG4PHP_DIR.'/LoggerManager.php';
$logger = LoggerManager::getRootLogger();
Modified: incubator/log4php/trunk/src/examples/php/mail.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/mail.php?rev=770180&r1=770179&r2=770180&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/mail.php (original)
+++ incubator/log4php/trunk/src/examples/php/mail.php Thu Apr 30 12:05:23 2009
@@ -16,7 +16,7 @@
* limitations under the License.
*/
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
-define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/mail.properties');
+define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/../resources/mail.properties');
require_once LOG4PHP_DIR.'/LoggerManager.php';
$logger = LoggerManager::getRootLogger();
Modified: incubator/log4php/trunk/src/examples/php/mdc.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/mdc.php?rev=770180&r1=770179&r2=770180&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/mdc.php (original)
+++ incubator/log4php/trunk/src/examples/php/mdc.php Thu Apr 30 12:05:23 2009
@@ -16,7 +16,7 @@
* limitations under the License.
*/
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
-define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/mdc.properties');
+define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/../resources/mdc.properties');
require_once LOG4PHP_DIR.'/LoggerManager.php';
Modified: incubator/log4php/trunk/src/examples/php/ndc.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/ndc.php?rev=770180&r1=770179&r2=770180&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/ndc.php (original)
+++ incubator/log4php/trunk/src/examples/php/ndc.php Thu Apr 30 12:05:23 2009
@@ -16,7 +16,7 @@
* limitations under the License.
*/
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
-define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/mdc.properties');
+define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/../resources/mdc.properties');
require_once LOG4PHP_DIR.'/LoggerManager.php';
Modified: incubator/log4php/trunk/src/examples/php/php.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/php.php?rev=770180&r1=770179&r2=770180&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/php.php (original)
+++ incubator/log4php/trunk/src/examples/php/php.php Thu Apr 30 12:05:23 2009
@@ -16,7 +16,7 @@
* limitations under the License.
*/
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
-define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/php.properties');
+define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/../resources/php.properties');
require_once LOG4PHP_DIR.'/LoggerManager.php';
$logger = LoggerManager::getRootLogger();
Modified: incubator/log4php/trunk/src/examples/php/server.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/server.php?rev=770180&r1=770179&r2=770180&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/server.php (original)
+++ incubator/log4php/trunk/src/examples/php/server.php Thu Apr 30 12:05:23 2009
@@ -16,7 +16,7 @@
* limitations under the License.
*/
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
-define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/server.properties');
+define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/../resources/server.properties');
require_once LOG4PHP_DIR.'/LoggerManager.php';
require_once 'Net/Server.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=770180&r1=770179&r2=770180&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/stringmatchfilter.php (original)
+++ incubator/log4php/trunk/src/examples/php/stringmatchfilter.php Thu Apr 30 12:05:23 2009
@@ -17,7 +17,7 @@
*/
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
define('LOG4PHP_CONFIGURATOR_CLASS', LOG4PHP_DIR.'/xml/LoggerDOMConfigurator');
-define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/stringmatchfilter.xml');
+define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/../resources/stringmatchfilter.xml');
require_once LOG4PHP_DIR.'/LoggerManager.php';
$logger = LoggerManager::getRootLogger();
Modified: incubator/log4php/trunk/src/examples/php/syslog.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/php/syslog.php?rev=770180&r1=770179&r2=770180&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/syslog.php (original)
+++ incubator/log4php/trunk/src/examples/php/syslog.php Thu Apr 30 12:05:23 2009
@@ -16,7 +16,7 @@
* limitations under the License.
*/
define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
-define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/syslog.properties');
+define('LOG4PHP_CONFIGURATION', dirname(__FILE__).'/../resources/syslog.properties');
require_once LOG4PHP_DIR.'/LoggerManager.php';
$logger = LoggerManager::getRootLogger();
Added: incubator/log4php/trunk/src/examples/resources/file.properties
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/resources/file.properties?rev=770180&view=auto
==============================================================================
--- incubator/log4php/trunk/src/examples/resources/file.properties (added)
+++ incubator/log4php/trunk/src/examples/resources/file.properties Thu Apr 30 12:05:23 2009
@@ -0,0 +1,21 @@
+; file.properties
+;
+; Licensed to the Apache Software Foundation (ASF) under one or more
+; contributor license agreements. See the NOTICE file distributed with
+; this work for additional information regarding copyright ownership.
+; The ASF licenses this file to You under the Apache License, Version 2.0
+; (the "License"); you may not use this file except in compliance with
+; the License. You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+log4php.appender.default = LoggerAppenderFile
+log4php.appender.default.file = ../../../target/examples/file.log
+log4php.appender.default.layout = LoggerLayoutTTCC
+log4php.rootLogger = DEBUG, default
Copied: incubator/log4php/trunk/src/examples/resources/php.properties (from r770176, incubator/log4php/trunk/src/examples/php/php.properties)
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/examples/resources/php.properties?p2=incubator/log4php/trunk/src/examples/resources/php.properties&p1=incubator/log4php/trunk/src/examples/php/php.properties&r1=770176&r2=770180&rev=770180&view=diff
==============================================================================
--- incubator/log4php/trunk/src/examples/php/php.properties (original)
+++ incubator/log4php/trunk/src/examples/resources/php.properties Thu Apr 30 12:05:23 2009
@@ -17,5 +17,5 @@
;
log4php.appender.default = LoggerAppenderPhp
log4php.appender.default.layout = LoggerPatternLayout
-log4php.appender.default.layout.conversionPattern = "%-5p [%t] %c: %m%n"
+log4php.appender.default.layout.conversionPattern = "%d{Y-m-d H:i:s.u} %-5p [%t] %c: %m%n"
log4php.rootLogger = DEBUG, default