logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ihabu...@apache.org
Subject [22/43] LOG4PHP-121: Reorganized classes into namespaces
Date Thu, 28 Nov 2013 16:03:52 GMT
http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/examples/resources/appender_null.properties
----------------------------------------------------------------------
diff --git a/src/examples/resources/appender_null.properties b/src/examples/resources/appender_null.properties
deleted file mode 100644
index b5f4df8..0000000
--- a/src/examples/resources/appender_null.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-;
-; 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.
-;
-; START SNIPPET: doxia
-log4php.appender.default = LoggerAppenderNull
-log4php.rootLogger = DEBUG, default

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/examples/resources/appender_pdo.properties
----------------------------------------------------------------------
diff --git a/src/examples/resources/appender_pdo.properties b/src/examples/resources/appender_pdo.properties
deleted file mode 100644
index 8d3d778..0000000
--- a/src/examples/resources/appender_pdo.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-;
-; 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.
-;
-; START SNIPPET: doxia
-log4php.rootLogger = DEBUG, a1, a2, a3
-
-; The table is created if necessary and filled using prepared statements.  
-log4php.appender.a1 = LoggerAppenderPDO
-log4php.appender.a1.dsn = "sqlite:target/appender_pdo.sqlite"
-
-; The following shows an appender with customized INSERT statment and table name. 
-log4php.appender.a2 = LoggerAppenderPDO
-log4php.appender.a2.user = root
-log4php.appender.a2.password = secret
-log4php.appender.a2.dsn = "mysql:host=localhost;dbname=test"
-log4php.appender.a2.table = log2
-log4php.appender.a2.insertSql = "INSERT INTO log2 (timestamp, logger, level, message, thread, file, line) VALUES (?,?,?,?,?,?,?)"
-log4php.appender.a2.insertPattern = "%d,%c,%p,%m, %t,%F,%L"
-
-; DEPRECATED: Using old style LoggerPatternLayout is considered unsafe as %m can contain quotes that mess up the SQL! 
-log4php.appender.a3 = LoggerAppenderPDO
-log4php.appender.a3.dsn = "sqlite:target/appender_pdo.sqlite"
-log4php.appender.a3.table = log3
-log4php.appender.a3.sql = "INSERT INTO log3 (timestamp, level, message) VALUES ('%t', '%p', '%m')"

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/examples/resources/appender_php.properties
----------------------------------------------------------------------
diff --git a/src/examples/resources/appender_php.properties b/src/examples/resources/appender_php.properties
deleted file mode 100644
index 00d0673..0000000
--- a/src/examples/resources/appender_php.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-;
-; 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.
-;
-; START SNIPPET: doxia
-log4php.appender.default = LoggerAppenderPhp
-log4php.appender.default.layout = LoggerLayoutPattern
-log4php.appender.default.layout.conversionPattern = "%d{Y-m-d H:i:s.u} %-5p [%t] %c: %m%n"
-log4php.rootLogger = DEBUG, default

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/examples/resources/appender_rollingfile.properties
----------------------------------------------------------------------
diff --git a/src/examples/resources/appender_rollingfile.properties b/src/examples/resources/appender_rollingfile.properties
deleted file mode 100644
index 87405c0..0000000
--- a/src/examples/resources/appender_rollingfile.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-;
-; 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.
-;
-; START SNIPPET: doxia
-log4php.appender.default = LoggerAppenderRollingFile
-log4php.appender.default.layout = LoggerLayoutTTCC
-log4php.appender.default.file = target/examples/appender_rollingfile.log
-log4php.appender.default.MaxFileSize = 100
-log4php.appender.default.MaxBackupIndex = 3
-log4php.rootLogger = DEBUG, default

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/examples/resources/appender_socket.properties
----------------------------------------------------------------------
diff --git a/src/examples/resources/appender_socket.properties b/src/examples/resources/appender_socket.properties
deleted file mode 100644
index 66cfce7..0000000
--- a/src/examples/resources/appender_socket.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-;
-; 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.
-;
-; START SNIPPET: doxia
-log4php.appender.default = LoggerAppenderSocket
-log4php.appender.default.layout = LoggerLayoutSimple
-log4php.appender.default.remoteHost = localhost
-log4php.appender.default.port = 4242
-log4php.appender.default.useXml = true
-log4php.appender.default.locationInfo = false
-log4php.rootLogger = DEBUG, default

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/examples/resources/appender_socket_server.properties
----------------------------------------------------------------------
diff --git a/src/examples/resources/appender_socket_server.properties b/src/examples/resources/appender_socket_server.properties
deleted file mode 100644
index 652b923..0000000
--- a/src/examples/resources/appender_socket_server.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-;
-; 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.
-;
-; START SNIPPET: doxia
-log4php.debug = true
-log4php.appender.file = LoggerAppenderFile
-log4php.appender.file.file = server.log
-log4php.appender.file.layout = LoggerLayoutTTCC
-log4php.appender.console = LoggerAppenderEcho
-log4php.appender.console.layout = LoggerLayoutSimple
-log4php.rootLogger = INFO, file, console

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/examples/resources/appender_syslog.properties
----------------------------------------------------------------------
diff --git a/src/examples/resources/appender_syslog.properties b/src/examples/resources/appender_syslog.properties
deleted file mode 100644
index 67c2352..0000000
--- a/src/examples/resources/appender_syslog.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-;
-; 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.
-;
-; START SNIPPET: doxia
-log4php.appender.default = LoggerAppenderSyslog
-log4php.appender.default.layout = LoggerLayoutSimple
-log4php.appender.default.ident = log4php-test
-log4php.appender.default.facility = USER
-log4php.appender.default.option = "PID|CONS|NDELAY"
-log4php.rootLogger = DEBUG, default

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/examples/resources/cache.properties
----------------------------------------------------------------------
diff --git a/src/examples/resources/cache.properties b/src/examples/resources/cache.properties
deleted file mode 100644
index ea2948f..0000000
--- a/src/examples/resources/cache.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-;
-; 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.
-;
-; START SNIPPET: doxia
-log4php.appender.default = LoggerAppenderEcho
-log4php.appender.default.layout = LoggerLayoutSimple
-log4php.rootLogger = DEBUG, default

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/examples/resources/configurator_php.php
----------------------------------------------------------------------
diff --git a/src/examples/resources/configurator_php.php b/src/examples/resources/configurator_php.php
deleted file mode 100644
index 893f83a..0000000
--- a/src/examples/resources/configurator_php.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-#
-# 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.
-#
-return array(
-        'threshold' => 'ALL',
-        'rootLogger' => array(
-            'level' => 'INFO',
-            'appenders' => array('default'),
-        ),
-        'loggers' => array(
-            'dev' => array(
-                'level' => 'DEBUG',
-                'appenders' => array('default'),
-            ),
-        ),
-        'appenders' => array(
-            'default' => array(
-                'class' => 'LoggerAppenderEcho',
-                'layout' => array(
-                    'class' => 'LoggerLayoutPattern',
-                    'conversionPattern' => "%d{Y-m-d H:i:s} %-5p %c %X{username}: %m in %F at %L%n",
-                ),
-            ),
-        ),
-    );

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/examples/resources/configurator_xml.xml
----------------------------------------------------------------------
diff --git a/src/examples/resources/configurator_xml.xml b/src/examples/resources/configurator_xml.xml
deleted file mode 100644
index 1e1c714..0000000
--- a/src/examples/resources/configurator_xml.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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:configuration xmlns:log4php="http://logging.apache.org/log4php/" threshold="all">
-	<appender name="default" class="LoggerAppenderEcho">
-		<layout class="LoggerLayoutTTCC" />
-	</appender>
-	<root>
-		<level value="DEBUG" />
-		<appender_ref ref="default" />
-	</root>
-</log4php:configuration>

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/examples/resources/filter_denyall.xml
----------------------------------------------------------------------
diff --git a/src/examples/resources/filter_denyall.xml b/src/examples/resources/filter_denyall.xml
deleted file mode 100644
index d1091da..0000000
--- a/src/examples/resources/filter_denyall.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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:configuration xmlns:log4php="http://logging.apache.org/log4php/" threshold="all">
-    <appender name="default" class="LoggerAppenderEcho">
-        <layout class="LoggerLayoutTTCC"/>
-        <filter class="LoggerFilterDenyAll"/>
-    </appender>
-    <root>
-        <level value="DEBUG" />
-        <appender_ref ref="default" />
-    </root>
-</log4php:configuration>

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/examples/resources/filter_levelmatch.xml
----------------------------------------------------------------------
diff --git a/src/examples/resources/filter_levelmatch.xml b/src/examples/resources/filter_levelmatch.xml
deleted file mode 100644
index 0ebfe38..0000000
--- a/src/examples/resources/filter_levelmatch.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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:configuration xmlns:log4php="http://logging.apache.org/log4php/" threshold="all">
-	<appender name="default" class="LoggerAppenderEcho">
-		<layout class="LoggerLayoutTTCC" />
-		<filter class="LoggerFilterLevelMatch">
-			<param name="LevelToMatch" value="DEBUG" />
-			<param name="AcceptOnMatch" value="false" />
-		</filter>
-	</appender>
-	<root>
-		<level value="DEBUG" />
-		<appender_ref ref="default" />
-	</root>
-</log4php:configuration>

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/examples/resources/filter_levelrange.xml
----------------------------------------------------------------------
diff --git a/src/examples/resources/filter_levelrange.xml b/src/examples/resources/filter_levelrange.xml
deleted file mode 100644
index 6509c14..0000000
--- a/src/examples/resources/filter_levelrange.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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:configuration xmlns:log4php="http://logging.apache.org/log4php/" threshold="all">
-	<appender name="default" class="LoggerAppenderEcho">
-		<layout class="LoggerLayoutTTCC" />
-		<filter class="LoggerFilterLevelRange">
-			<param name="levelMin" value="ERROR" />
-			<param name="levelMax" value="FATAL" />
-			<param name="acceptOnMatch" value="false" />
-		</filter>
-	</appender>
-	<root>
-		<level value="DEBUG" />
-		<appender_ref ref="default" />
-	</root>
-</log4php:configuration>

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/examples/resources/filter_stringmatch.xml
----------------------------------------------------------------------
diff --git a/src/examples/resources/filter_stringmatch.xml b/src/examples/resources/filter_stringmatch.xml
deleted file mode 100644
index 02fbbe9..0000000
--- a/src/examples/resources/filter_stringmatch.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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:configuration xmlns:log4php="http://logging.apache.org/log4php/" threshold="all">
-	<appender name="default" class="LoggerAppenderEcho">
-		<layout class="LoggerLayoutTTCC" />
-		<filter class="LoggerFilterStringMatch">
-			<param name="StringToMatch" value="match" />
-			<param name="AcceptOnMatch" value="false" />
-		</filter>
-	</appender>
-	<root>
-		<level value="DEBUG" />
-		<appender_ref ref="default" />
-	</root>
-</log4php:configuration>

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/examples/resources/layout_html.properties
----------------------------------------------------------------------
diff --git a/src/examples/resources/layout_html.properties b/src/examples/resources/layout_html.properties
deleted file mode 100644
index 2055122..0000000
--- a/src/examples/resources/layout_html.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-;
-; 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.
-;
-; START SNIPPET: doxia
-log4php.appender.default = LoggerAppenderEcho
-log4php.appender.default.layout = LoggerLayoutHtml
-log4php.rootLogger = DEBUG, default

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/examples/resources/layout_pattern.properties
----------------------------------------------------------------------
diff --git a/src/examples/resources/layout_pattern.properties b/src/examples/resources/layout_pattern.properties
deleted file mode 100644
index e95d95b..0000000
--- a/src/examples/resources/layout_pattern.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-;
-; 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.
-;
-; START SNIPPET: doxia
-log4php.appender.default = LoggerAppenderEcho
-log4php.appender.default.layout = LoggerLayoutPattern
-log4php.appender.default.layout.ConversionPattern = "%d{ISO8601} [%p] %c: %m (at %F line %L)%n"
-log4php.rootLogger = DEBUG, default

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/examples/resources/layout_simple.properties
----------------------------------------------------------------------
diff --git a/src/examples/resources/layout_simple.properties b/src/examples/resources/layout_simple.properties
deleted file mode 100644
index ea2948f..0000000
--- a/src/examples/resources/layout_simple.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-;
-; 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.
-;
-; START SNIPPET: doxia
-log4php.appender.default = LoggerAppenderEcho
-log4php.appender.default.layout = LoggerLayoutSimple
-log4php.rootLogger = DEBUG, default

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/examples/resources/layout_ttcc.properties
----------------------------------------------------------------------
diff --git a/src/examples/resources/layout_ttcc.properties b/src/examples/resources/layout_ttcc.properties
deleted file mode 100644
index a7ae686..0000000
--- a/src/examples/resources/layout_ttcc.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-;
-; 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.
-;
-; START SNIPPET: doxia
-log4php.appender.default = LoggerAppenderEcho
-log4php.appender.default.layout = LoggerLayoutTTCC
-log4php.appender.default.layout.MicroSecondsPrinting = false
-log4php.appender.default.layout.categoryPrefixing = true
-log4php.appender.default.layout.dateFormat = "%H:%M"
-log4php.rootLogger = DEBUG, default

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/examples/resources/layout_xml.properties
----------------------------------------------------------------------
diff --git a/src/examples/resources/layout_xml.properties b/src/examples/resources/layout_xml.properties
deleted file mode 100644
index 0fbd153..0000000
--- a/src/examples/resources/layout_xml.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-;
-; 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.
-;
-; START SNIPPET: doxia
-log4php.appender.default = LoggerAppenderEcho
-log4php.appender.default.layout = LoggerLayoutXml
-log4php.rootLogger = DEBUG, default

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/examples/resources/mdc.properties
----------------------------------------------------------------------
diff --git a/src/examples/resources/mdc.properties b/src/examples/resources/mdc.properties
deleted file mode 100644
index fa2baa8..0000000
--- a/src/examples/resources/mdc.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-;
-; 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.
-;
-; START SNIPPET: doxia
-log4php.appender.default = LoggerAppenderEcho
-log4php.appender.default.layout = LoggerLayoutPattern
-log4php.appender.default.layout.conversionPattern="%d{Y-m-d H:i:s} %-5p %c %X{username}: %m in %F at %L%n"
-log4php.rootLogger = DEBUG, default
-

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/examples/resources/ndc.properties
----------------------------------------------------------------------
diff --git a/src/examples/resources/ndc.properties b/src/examples/resources/ndc.properties
deleted file mode 100644
index 4758589..0000000
--- a/src/examples/resources/ndc.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-;
-; 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.
-;
-; START SNIPPET: doxia
-log4php.appender.default = LoggerAppenderEcho
-log4php.appender.default.layout = LoggerLayoutPattern
-log4php.appender.default.layout.conversionPattern="%d{Y-m-d H:i:s} %-5p %c %x: %m in %F at %L%n"
-log4php.rootLogger = DEBUG, default

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/examples/resources/renderer_default.properties
----------------------------------------------------------------------
diff --git a/src/examples/resources/renderer_default.properties b/src/examples/resources/renderer_default.properties
deleted file mode 100644
index ea2948f..0000000
--- a/src/examples/resources/renderer_default.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-;
-; 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.
-;
-; START SNIPPET: doxia
-log4php.appender.default = LoggerAppenderEcho
-log4php.appender.default.layout = LoggerLayoutSimple
-log4php.rootLogger = DEBUG, default

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/examples/resources/renderer_map.properties
----------------------------------------------------------------------
diff --git a/src/examples/resources/renderer_map.properties b/src/examples/resources/renderer_map.properties
deleted file mode 100644
index 13a2d8a..0000000
--- a/src/examples/resources/renderer_map.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-;
-; 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.
-;
-; START SNIPPET: doxia
-log4php.renderer.Person = PersonRenderer
-
-log4php.appender.default = LoggerAppenderEcho
-log4php.appender.default.layout = LoggerLayoutSimple
-log4php.rootLogger = DEBUG, default

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/main/php/Logger.php
----------------------------------------------------------------------
diff --git a/src/main/php/Logger.php b/src/main/php/Logger.php
deleted file mode 100644
index 9751f59..0000000
--- a/src/main/php/Logger.php
+++ /dev/null
@@ -1,596 +0,0 @@
-<?php
-/**
- * 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.
- * 
- * @package log4php
- */
-
-require dirname(__FILE__) . '/LoggerAutoloader.php';
-
-/**
- * This is the central class in the log4php package. All logging operations 
- * are done through this class.
- * 
- * The main logging methods are:
- * 	<ul>
- * 		<li>{@link trace()}</li>
- * 		<li>{@link debug()}</li>
- * 		<li>{@link info()}</li>
- * 		<li>{@link warn()}</li>
- * 		<li>{@link error()}</li>
- * 		<li>{@link fatal()}</li>
- * 	</ul>
- * 
- * @package    log4php
- * @license	   http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version	   SVN: $Id$
- * @link	   http://logging.apache.org/log4php
- */
-class Logger {
-	
-	/**
-	 * Logger additivity. If set to true then child loggers will inherit
-	 * the appenders of their ancestors by default.
-	 * @var boolean
-	 */
-	private $additive = true;
-	
-	/** 
-	 * The Logger's fully qualified class name.
-	 * TODO: Determine if this is useful. 
-	 */
-	private $fqcn = 'Logger';
-
-	/** The assigned Logger level. */
-	private $level;
-	
-	/** The name of this Logger instance. */
-	private $name;
-	
-	/** The parent logger. Set to null if this is the root logger. */
-	private $parent;
-	
-	/** A collection of appenders linked to this logger. */
-	private $appenders = array();
-
-	/**
-	 * Constructor.
-	 * @param string $name Name of the logger.	  
-	 */
-	public function __construct($name) {
-		$this->name = $name;
-	}
-	
-	/**
-	 * Returns the logger name.
-	 * @return string
-	 */
-	public function getName() {
-		return $this->name;
-	} 
-
-	/**
-	 * Returns the parent Logger. Can be null if this is the root logger.
-	 * @return Logger
-	 */
-	public function getParent() {
-		return $this->parent;
-	}
-	
-	// ******************************************
-	// *** Logging methods                    ***
-	// ******************************************
-	
-	/**
-	 * Log a message object with the TRACE level.
-	 *
-	 * @param mixed $message message
- 	 * @param Exception $throwable Optional throwable information to include 
-	 *   in the logging event.
-	 */
-	public function trace($message, $throwable = null) {
-		$this->log(LoggerLevel::getLevelTrace(), $message, $throwable);
-	} 		
-	
-	/**
-	 * Log a message object with the DEBUG level.
-	 *
-	 * @param mixed $message message
- 	 * @param Exception $throwable Optional throwable information to include 
-	 *   in the logging event.
-	 */
-	public function debug($message, $throwable = null) {
-		$this->log(LoggerLevel::getLevelDebug(), $message, $throwable);
-	} 
-
-	/**
-	 * Log a message object with the INFO Level.
-	 *
-	 * @param mixed $message message
- 	 * @param Exception $throwable Optional throwable information to include 
-	 *   in the logging event.
-	 */
-	public function info($message, $throwable = null) {
-		$this->log(LoggerLevel::getLevelInfo(), $message, $throwable);
-	}
-
-	/**
-	 * Log a message with the WARN level.
-	 *
-	 * @param mixed $message message
-  	 * @param Exception $throwable Optional throwable information to include 
-	 *   in the logging event.
-	 */
-	public function warn($message, $throwable = null) {
-		$this->log(LoggerLevel::getLevelWarn(), $message, $throwable);
-	}
-	
-	/**
-	 * Log a message object with the ERROR level.
-	 *
-	 * @param mixed $message message
-	 * @param Exception $throwable Optional throwable information to include 
-	 *   in the logging event.
-	 */
-	public function error($message, $throwable = null) {
-		$this->log(LoggerLevel::getLevelError(), $message, $throwable);
-	}
-	
-	/**
-	 * Log a message object with the FATAL level.
-	 *
-	 * @param mixed $message message
-	 * @param Exception $throwable Optional throwable information to include 
-	 *   in the logging event.
-	 */
-	public function fatal($message, $throwable = null) {
-		$this->log(LoggerLevel::getLevelFatal(), $message, $throwable);
-	}
-
-	/**
-	 * Log a message using the provided logging level.
-	 *
-	 * @param LoggerLevel $level The logging level.
-	 * @param mixed $message Message to log.
- 	 * @param Exception $throwable Optional throwable information to include 
-	 *   in the logging event.
-	 */
-	public function log(LoggerLevel $level, $message, $throwable = null) {
-		if($this->isEnabledFor($level)) {
-			$event = new LoggerLoggingEvent($this->fqcn, $this, $level, $message, null, $throwable);
-			$this->callAppenders($event);
-		}
-		
-		// Forward the event upstream if additivity is turned on
-		if(isset($this->parent) && $this->getAdditivity()) {
-			
-			// Use the event if already created
-			if (isset($event)) {
-				$this->parent->logEvent($event);
-			} else {
-				$this->parent->log($level, $message, $throwable);
-			}
-		}
-	}
-	
-	/**
-	 * Logs an already prepared logging event object. 
-	 * @param LoggerLoggingEvent $event
-	 */
-	public function logEvent(LoggerLoggingEvent $event) {
-		if($this->isEnabledFor($event->getLevel())) {
-			$this->callAppenders($event);
-		}
-		
-		// Forward the event upstream if additivity is turned on
-		if(isset($this->parent) && $this->getAdditivity()) {
-			$this->parent->logEvent($event);
-		}
-	}
-	
-	/**
-	 * If assertion parameter evaluates as false, then logs the message 
-	 * using the ERROR level.
-	 *
-	 * @param bool $assertion
-	 * @param string $msg message to log
-	 */
-	public function assertLog($assertion = true, $msg = '') {
-		if($assertion == false) {
-			$this->error($msg);
-		}
-	}
-	
-	/**
-	 * This method creates a new logging event and logs the event without 
-	 * further checks.
-	 *
-	 * It should not be called directly. Use {@link trace()}, {@link debug()},
-	 * {@link info()}, {@link warn()}, {@link error()} and {@link fatal()} 
-	 * wrappers.
-	 *
-	 * @param string $fqcn Fully qualified class name of the Logger
-	 * @param Exception $throwable Optional throwable information to include 
-	 *   in the logging event.
-	 * @param LoggerLevel $level log level	   
-	 * @param mixed $message message to log
-	 */
-	public function forcedLog($fqcn, $throwable, LoggerLevel $level, $message) {
-		$event = new LoggerLoggingEvent($fqcn, $this, $level, $message, null, $throwable);
-		$this->callAppenders($event);
-		
-		// Forward the event upstream if additivity is turned on
-		if(isset($this->parent) && $this->getAdditivity()) {
-			$this->parent->logEvent($event);
-		}
-	}
-
-	/**
-	 * Forwards the given logging event to all linked appenders.
-	 * @param LoggerLoggingEvent $event
-	 */
-	public function callAppenders($event) {
-		foreach($this->appenders as $appender) {
-			$appender->doAppend($event);
-		}
-	}
-	
-	// ******************************************
-	// *** Checker methods                    ***
-	// ******************************************
-	
-	/**
-	 * Check whether this Logger is enabled for a given Level passed as parameter.
-	 *
-	 * @param LoggerLevel level
-	 * @return boolean
-	 */
-	public function isEnabledFor(LoggerLevel $level) {
-		return $level->isGreaterOrEqual($this->getEffectiveLevel());
-	}
-	
-	/**
-	 * Check whether this Logger is enabled for the TRACE Level.
-	 * @return boolean
-	 */
-	public function isTraceEnabled() {
-		return $this->isEnabledFor(LoggerLevel::getLevelTrace());
-	}
-	
-	/**
-	 * Check whether this Logger is enabled for the DEBUG Level.
-	 * @return boolean
-	 */
-	public function isDebugEnabled() {
-		return $this->isEnabledFor(LoggerLevel::getLevelDebug());
-	}
-
-	/**
-	 * Check whether this Logger is enabled for the INFO Level.
-	 * @return boolean
-	 */
-	public function isInfoEnabled() {
-		return $this->isEnabledFor(LoggerLevel::getLevelInfo());
-	}
-	
-	/**
-	 * Check whether this Logger is enabled for the WARN Level.
-	 * @return boolean
-	 */
-	public function isWarnEnabled() {
-		return $this->isEnabledFor(LoggerLevel::getLevelWarn());
-	}
-	
-	/**
-	 * Check whether this Logger is enabled for the ERROR Level.
-	 * @return boolean
-	 */
-	public function isErrorEnabled() {
-		return $this->isEnabledFor(LoggerLevel::getLevelError());
-	}
-	
-	/**
-	 * Check whether this Logger is enabled for the FATAL Level.
-	 * @return boolean
-	 */
-	public function isFatalEnabled() {
-		return $this->isEnabledFor(LoggerLevel::getLevelFatal());
-	}
-	
-	// ******************************************
-	// *** Configuration methods              ***
-	// ******************************************
-	
-	/**
-	 * Adds a new appender to the Logger.
-	 * @param LoggerAppender $appender The appender to add.
-	 */
-	public function addAppender($appender) {
-		$appenderName = $appender->getName();
-		$this->appenders[$appenderName] = $appender;
-	}
-	
-	/** Removes all appenders from the Logger. */
-	public function removeAllAppenders() {
-		foreach($this->appenders as $name => $appender) {
-			$this->removeAppender($name);
-		}
-	} 
-			
-	/**
-	 * Remove the appender passed as parameter form the Logger.
-	 * @param mixed $appender an appender name or a {@link LoggerAppender} instance.
-	 */
-	public function removeAppender($appender) {
-		if($appender instanceof LoggerAppender) {
-			$appender->close();
-			unset($this->appenders[$appender->getName()]);
-		} else if (is_string($appender) and isset($this->appenders[$appender])) {
-			$this->appenders[$appender]->close();
-			unset($this->appenders[$appender]);
-		}
-	}
-	
-	/**
-	 * Returns the appenders linked to this logger as an array.
-	 * @return array collection of appender names
-	 */
-	public function getAllAppenders() {
-		return $this->appenders;
-	}
-	
-	/**
-	 * Returns a linked appender by name.
-	 * @return LoggerAppender
-	 */
-	public function getAppender($name) {
-		return $this->appenders[$name];
-	}
-
-	/**
-	 * Sets the additivity flag.
-	 * @param boolean $additive
-	 */
-	public function setAdditivity($additive) {
-		$this->additive = (bool)$additive;
-	}
-	
-	/**
-	 * Returns the additivity flag.
-	 * @return boolean
-	 */
-	public function getAdditivity() {
-		return $this->additive;
-	}
- 
-	/**
-	 * Starting from this Logger, search the Logger hierarchy for a non-null level and return it.
-	 * @see LoggerLevel
-	 * @return LoggerLevel or null
-	 */
-	public function getEffectiveLevel() {
-		for($logger = $this; $logger !== null; $logger = $logger->getParent()) {
-			if($logger->getLevel() !== null) {
-				return $logger->getLevel();
-			}
-		}
-	}
-  
-	/**
-	 * Get the assigned Logger level.
-	 * @return LoggerLevel The assigned level or null if none is assigned. 
-	 */
-	public function getLevel() {
-		return $this->level;
-	}
-	
-	/**
-	 * Set the Logger level.
-	 *
-	 * Use LoggerLevel::getLevelXXX() methods to get a LoggerLevel object, e.g.
-	 * <code>$logger->setLevel(LoggerLevel::getLevelInfo());</code>
-	 *
-	 * @param LoggerLevel $level The level to set, or NULL to clear the logger level.
-	 */
-	public function setLevel(LoggerLevel $level = null) {
-		$this->level = $level;
-	}
-	
-	/**
-	 * Checks whether an appender is attached to this logger instance.
-	 *
-	 * @param LoggerAppender $appender
-	 * @return boolean
-	 */
-	public function isAttached(LoggerAppender $appender) {
-		return isset($this->appenders[$appender->getName()]);
-	}
-	
-	/**
-	 * Sets the parent logger.
-	 * @param Logger $logger
-	 */
-	public function setParent(Logger $logger) {
-		$this->parent = $logger;
-	} 
-	
-	// ******************************************
-	// *** Static methods and properties      ***
-	// ******************************************
-	
-	/** The logger hierarchy used by log4php. */
-	private static $hierarchy;
-	
-	/** Inidicates if log4php has been initialized */
-	private static $initialized = false;
-	
-	/**
-	 * Returns the hierarchy used by this Logger.
-	 *
-	 * Caution: do not use this hierarchy unless you have called initialize().
-	 * To get Loggers, use the Logger::getLogger and Logger::getRootLogger
-	 * methods instead of operating on on the hierarchy directly.
-	 *
-	 * @return LoggerHierarchy
-	 */
-	public static function getHierarchy() {
-		if(!isset(self::$hierarchy)) {
-			self::$hierarchy = new LoggerHierarchy(new LoggerRoot());
-		}
-		return self::$hierarchy;
-	}
-	
-	/**
-	 * Returns a Logger by name. If it does not exist, it will be created.
-	 *
-	 * @param string $name The logger name
-	 * @return Logger
-	 */
-	public static function getLogger($name) {
-		if(!self::isInitialized()) {
-			self::configure();
-		}
-		return self::getHierarchy()->getLogger($name);
-	}
-	
-	/**
-	 * Returns the Root Logger.
-	 * @return LoggerRoot
-	 */
-	public static function getRootLogger() {
-		if(!self::isInitialized()) {
-			self::configure();
-		}
-		return self::getHierarchy()->getRootLogger();
-	}
-	
-	/**
-	 * Clears all Logger definitions from the logger hierarchy.
-	 * @return boolean
-	 */
-	public static function clear() {
-		return self::getHierarchy()->clear();
-	}
-	
-	/**
-	 * Destroy configurations for logger definitions
-	 */
-	public static function resetConfiguration() {
-		self::getHierarchy()->resetConfiguration();
-		self::getHierarchy()->clear(); // TODO: clear or not?
-		self::$initialized = false;
-	}
-	
-	/**
-	 * Safely close all appenders.
-	 * @deprecated This is no longer necessary due the appenders shutdown via
-	 * destructors.
-	 */
-	public static function shutdown() {
-		return self::getHierarchy()->shutdown();
-	}
-	
-	/**
-	 * check if a given logger exists.
-	 *
-	 * @param string $name logger name
-	 * @return boolean
-	 */
-	public static function exists($name) {
-		return self::getHierarchy()->exists($name);
-	}
-	
-	/**
-	 * Returns an array this whole Logger instances.
-	 * @see Logger
-	 * @return array
-	 */
-	public static function getCurrentLoggers() {
-		return self::getHierarchy()->getCurrentLoggers();
-	}
-	
-	/**
-	 * Configures log4php.
-	 * 
-	 * This method needs to be called before the first logging event has 
-	 * occured. If this method is not called before then the default
-	 * configuration will be used.
-	 *
-	 * @param string|array $configuration Either a path to the configuration
-	 *   file, or a configuration array.
-	 *   
-	 * @param string|LoggerConfigurator $configurator A custom 
-	 * configurator class: either a class name (string), or an object which 
-	 * implements the LoggerConfigurator interface. If left empty, the default
-	 * configurator implementation will be used. 
-	 */
-	public static function configure($configuration = null, $configurator = null) {
-		self::resetConfiguration();
-		$configurator = self::getConfigurator($configurator);
-		$configurator->configure(self::getHierarchy(), $configuration);
-		self::$initialized = true;
-	}
-	
-	/**
-	 * Creates a logger configurator instance based on the provided 
-	 * configurator class. If no class is given, returns an instance of
-	 * the default configurator.
-	 * 
-	 * @param string|LoggerConfigurator $configurator The configurator class 
-	 * or LoggerConfigurator instance.
-	 */
-	private static function getConfigurator($configurator = null) {
-		if ($configurator === null) {
-			return new LoggerConfiguratorDefault();
-		}
-		
-		if (is_object($configurator)) {
-			if ($configurator instanceof LoggerConfigurator) {
-				return $configurator;
-			} else {
-				trigger_error("log4php: Given configurator object [$configurator] does not implement the LoggerConfigurator interface. Reverting to default configurator.", E_USER_WARNING);
-				return new LoggerConfiguratorDefault();
-			}
-		}
-		
-		if (is_string($configurator)) {
-			if (!class_exists($configurator)) {
-				trigger_error("log4php: Specified configurator class [$configurator] does not exist. Reverting to default configurator.", E_USER_WARNING);
-				return new LoggerConfiguratorDefault();
-			}
-			
-			$instance = new $configurator();
-				
-			if (!($instance instanceof LoggerConfigurator)) {
-				trigger_error("log4php: Specified configurator class [$configurator] does not implement the LoggerConfigurator interface. Reverting to default configurator.", E_USER_WARNING);
-				return new LoggerConfiguratorDefault();
-			}
-			
-			return $instance;
-		}
-		
-		trigger_error("log4php: Invalid configurator specified. Expected either a string or a LoggerConfigurator instance. Reverting to default configurator.", E_USER_WARNING);
-		return new LoggerConfiguratorDefault();
-	}
-	
-	/**
-	 * Returns true if the log4php framework has been initialized.
-	 * @return boolean 
-	 */
-	private static function isInitialized() {
-		return self::$initialized;
-	}
-}

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/main/php/LoggerAppender.php
----------------------------------------------------------------------
diff --git a/src/main/php/LoggerAppender.php b/src/main/php/LoggerAppender.php
deleted file mode 100644
index bff9f54..0000000
--- a/src/main/php/LoggerAppender.php
+++ /dev/null
@@ -1,286 +0,0 @@
-<?php
-/**
- * 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.
- *
- * @package log4php
- */
-
-/**
- * Abstract class that defines output logs strategies.
- *
- * @version $Revision$
- * @package log4php
- */
-abstract class LoggerAppender extends LoggerConfigurable {
-	
-	/**
-	 * Set to true when the appender is closed. A closed appender will not 
-	 * accept any logging requests. 
-	 * @var boolean 
-	 */
-	protected $closed = false;
-	
-	/**
-	 * The first filter in the filter chain.
-	 * @var LoggerFilter
-	 */
-	protected $filter;
-			
-	/**
-	 * The appender's layout. Can be null if the appender does not use 
-	 * a layout.
-	 * @var LoggerLayout
-	 */
-	protected $layout; 
-	
-	/**
-	 * Appender name. Used by other components to identify this appender.
-	 * @var string
-	 */
-	protected $name;
-	
-	/**
-	 * Appender threshold level. Events whose level is below the threshold 
-	 * will not be logged.
-	 * @var LoggerLevel
-	 */
-	protected $threshold;
-	
-	/**
-	 * Set to true if the appender requires a layout.
-	 * 
-	 * True by default, appenders which do not use a layout should override 
-	 * this property to false.
-	 * 
-	 * @var boolean
-	 */
-	protected $requiresLayout = true;
-	
-	/**
-	 * Default constructor.
-	 * @param string $name Appender name
-	 */
-	public function __construct($name = '') {
-		$this->name = $name;
-
-		if ($this->requiresLayout) {
-			$this->layout = $this->getDefaultLayout();
-		}
-	}
-	
-	public function __destruct() {
-		$this->close();
-	}
-	
-	/**
-	 * Returns the default layout for this appender. Can be overriden by 
-	 * derived appenders.
-	 * 
-	 * @return LoggerLayout
-	 */
-	public function getDefaultLayout() {
-		return new LoggerLayoutSimple();
-	}
-	
-	/**
-	 * Adds a filter to the end of the filter chain.
-	 * @param LoggerFilter $filter add a new LoggerFilter
-	 */
-	public function addFilter($filter) {
-		if($this->filter === null) {
-			$this->filter = $filter;
-		} else {
-			$this->filter->addNext($filter);
-		}
-	}
-	
-	/**
-	 * Clears the filter chain by removing all the filters in it.
-	 */
-	public function clearFilters() {
-		$this->filter = null;
-	}
-
-	/**
-	 * Returns the first filter in the filter chain. 
-	 * The return value may be <i>null</i> if no is filter is set.
-	 * @return LoggerFilter
-	 */
-	public function getFilter() {
-		return $this->filter;
-	} 
-	
-	/** 
-	 * Returns the first filter in the filter chain. 
-	 * The return value may be <i>null</i> if no is filter is set.
-	 * @return LoggerFilter
-	 */
-	public function getFirstFilter() {
-		return $this->filter;
-	}
-	
-	/**
-	 * Performs threshold checks and invokes filters before delegating logging 
-	 * to the subclass' specific <i>append()</i> method.
-	 * @see LoggerAppender::append()
-	 * @param LoggerLoggingEvent $event
-	 */
-	public function doAppend(LoggerLoggingEvent $event) {
-		if($this->closed) {
-			return;
-		}
-		
-		if(!$this->isAsSevereAsThreshold($event->getLevel())) {
-			return;
-		}
-
-		$filter = $this->getFirstFilter();
-		while($filter !== null) {
-			switch ($filter->decide($event)) {
-				case LoggerFilter::DENY: return;
-				case LoggerFilter::ACCEPT: return $this->append($event);
-				case LoggerFilter::NEUTRAL: $filter = $filter->getNext();
-			}
-		}
-		$this->append($event);
-	}	 
-
-	/**
-	 * Sets the appender layout.
-	 * @param LoggerLayout $layout
-	 */
-	public function setLayout($layout) {
-		if($this->requiresLayout()) {
-			$this->layout = $layout;
-		}
-	} 
-	
-	/**
-	 * Returns the appender layout.
-	 * @return LoggerLayout
-	 */
-	public function getLayout() {
-		return $this->layout;
-	}
-	
-	/**
-	 * Configurators call this method to determine if the appender
-	 * requires a layout. 
-	 *
-	 * <p>If this method returns <i>true</i>, meaning that layout is required, 
-	 * then the configurator will configure a layout using the configuration 
-	 * information at its disposal.	 If this method returns <i>false</i>, 
-	 * meaning that a layout is not required, then layout configuration will be
-	 * skipped even if there is available layout configuration
-	 * information at the disposal of the configurator.</p>
-	 *
-	 * <p>In the rather exceptional case, where the appender
-	 * implementation admits a layout but can also work without it, then
-	 * the appender should return <i>true</i>.</p>
-	 * 
-	 * @return boolean
-	 */
-	public function requiresLayout() {
-		return $this->requiresLayout;
-	}
-	
-	/**
-	 * Retruns the appender name.
-	 * @return string
-	 */
-	public function getName() {
-		return $this->name;
-	}
-	
-	/**
-	 * Sets the appender name.
-	 * @param string $name
-	 */
-	public function setName($name) {
-		$this->name = $name;	
-	}
-	
-	/**
-	 * Returns the appender's threshold level. 
-	 * @return LoggerLevel
-	 */
-	public function getThreshold() { 
-		return $this->threshold;
-	}
-	
-	/**
-	 * Sets the appender threshold.
-	 * 
-	 * @param LoggerLevel|string $threshold Either a {@link LoggerLevel} 
-	 *   object or a string equivalent.
-	 * @see LoggerOptionConverter::toLevel()
-	 */
-	public function setThreshold($threshold) {
-		$this->setLevel('threshold', $threshold);
-	}
-	
-	/**
-	 * Checks whether the message level is below the appender's threshold. 
-	 *
-	 * If there is no threshold set, then the return value is always <i>true</i>.
-	 * 
-	 * @param LoggerLevel $level
-	 * @return boolean Returns true if level is greater or equal than 
-	 *   threshold, or if the threshold is not set. Otherwise returns false.
-	 */
-	public function isAsSevereAsThreshold($level) {
-		if($this->threshold === null) {
-			return true;
-		}
-		return $level->isGreaterOrEqual($this->getThreshold());
-	}
-
-	/**
-	 * Prepares the appender for logging.
-	 * 
-	 * Derived appenders should override this method if option structure
-	 * requires it.
-	 */
-	public function activateOptions() {
-		$this->closed = false;
-	}
-	
-	/**
-	 * Forwards the logging event to the destination.
-	 * 
-	 * Derived appenders should implement this method to perform actual logging.
-	 * 
-	 * @param LoggerLoggingEvent $event
-	 */
-	abstract protected function append(LoggerLoggingEvent $event); 
-
-	/**
-	 * Releases any resources allocated by the appender.
-	 * 
-	 * Derived appenders should override this method to perform proper closing
-	 * procedures.
-	 */
-	public function close() {
-		$this->closed = true;
-	}
-	
-	/** Triggers a warning for this logger with the given message. */
-	protected function warn($message) {
-		$id = get_class($this) . (empty($this->name) ? '' : ":{$this->name}");
-		trigger_error("log4php: [$id]: $message", E_USER_WARNING);
-	}
-	
-}

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/main/php/LoggerAppenderPool.php
----------------------------------------------------------------------
diff --git a/src/main/php/LoggerAppenderPool.php b/src/main/php/LoggerAppenderPool.php
deleted file mode 100644
index 0092b41..0000000
--- a/src/main/php/LoggerAppenderPool.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * 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.
- *
- * @package log4php
- */
-
-/**
- * Pool implmentation for LoggerAppender instances.
- * 
- * The pool is used when configuring log4php. First all appender instances 
- * are created in the pool. Afterward, they are linked to loggers, each 
- * appender can be linked to multiple loggers. This makes sure duplicate 
- * appenders are not created.
- *
- * @version $Revision$
- * @package log4php
- */
-class LoggerAppenderPool {
-	
-	/** Holds appenders indexed by their name */
-	public static $appenders =  array();
-
-	/**
-	 * Adds an appender to the pool. 
-	 * The appender must be named for this operation. 
-	 * @param LoggerAppender $appender
-	 */
-	public static function add(LoggerAppender $appender) {
-		$name = $appender->getName();
-		
-		if(empty($name)) {
-			trigger_error('log4php: Cannot add unnamed appender to pool.', E_USER_WARNING);
-			return;
-		}
-		
-		if (isset(self::$appenders[$name])) {
-			trigger_error("log4php: Appender [$name] already exists in pool. Overwriting existing appender.", E_USER_WARNING);
-		}
-		
-		self::$appenders[$name] = $appender;
-	}
-	
-	/** 
-	 * Retrieves an appender from the pool by name. 
-	 * @param string $name Name of the appender to retrieve.
-	 * @return LoggerAppender The named appender or NULL if no such appender 
-	 *  exists in the pool.
-	 */
-	public static function get($name) {
-		return isset(self::$appenders[$name]) ? self::$appenders[$name] : null;
-	}
-	
-	/**
-	* Removes an appender from the pool by name.
-	* @param string $name Name of the appender to remove.
-	*/
-	public static function delete($name) {
-		unset(self::$appenders[$name]);
-	}
-	
-	/**
-	 * Returns all appenders from the pool.
-	 * @return array Array of LoggerAppender objects.
-	 */
-	public static function getAppenders() {
-		return self::$appenders;
-	}
-	
-	/**
-	 * Checks whether an appender exists in the pool.
-	 * @param string $name Name of the appender to look for.
-	 * @return boolean TRUE if the appender with the given name exists.
-	 */
-	public static function exists($name) {
-		return isset(self::$appenders[$name]);
-	}
-
-	/**
-	 * Clears all appenders from the pool.
-	 */
-	public static function clear() {
-		 self::$appenders =  array();
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/main/php/LoggerAutoloader.php
----------------------------------------------------------------------
diff --git a/src/main/php/LoggerAutoloader.php b/src/main/php/LoggerAutoloader.php
deleted file mode 100644
index 87a87c7..0000000
--- a/src/main/php/LoggerAutoloader.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
- * 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.
- * 
- * @package log4php
- */
-
-if (function_exists('__autoload')) {
-	trigger_error("log4php: It looks like your code is using an __autoload() function. log4php uses spl_autoload_register() which will bypass your __autoload() function and may break autoloading.", E_USER_WARNING);
-}
-
-spl_autoload_register(array('LoggerAutoloader', 'autoload'));
-
-/**
- * Class autoloader.
- * 
- * @package log4php
- * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version $Revision$
- */
-class LoggerAutoloader {
-	
-	/** Maps classnames to files containing the class. */
-	private static $classes = array(
-	
-		// Base
-		'LoggerAppender' => '/LoggerAppender.php',
-		'LoggerAppenderPool' => '/LoggerAppenderPool.php',
-		'LoggerConfigurable' => '/LoggerConfigurable.php',
-		'LoggerConfigurator' => '/LoggerConfigurator.php',
-		'LoggerException' => '/LoggerException.php',
-		'LoggerFilter' => '/LoggerFilter.php',
-		'LoggerHierarchy' => '/LoggerHierarchy.php',
-		'LoggerLevel' => '/LoggerLevel.php',
-		'LoggerLocationInfo' => '/LoggerLocationInfo.php',
-		'LoggerLoggingEvent' => '/LoggerLoggingEvent.php',
-		'LoggerMDC' => '/LoggerMDC.php',
-		'LoggerNDC' => '/LoggerNDC.php',
-		'LoggerLayout' => '/LoggerLayout.php',
-		'LoggerReflectionUtils' => '/LoggerReflectionUtils.php',
-		'LoggerRoot' => '/LoggerRoot.php',
-		'LoggerThrowableInformation' => '/LoggerThrowableInformation.php',
-		
-		// Appenders
-		'LoggerAppenderConsole' => '/appenders/LoggerAppenderConsole.php',
-		'LoggerAppenderDailyFile' => '/appenders/LoggerAppenderDailyFile.php',
-		'LoggerAppenderEcho' => '/appenders/LoggerAppenderEcho.php',
-		'LoggerAppenderFile' => '/appenders/LoggerAppenderFile.php',
-		'LoggerAppenderMail' => '/appenders/LoggerAppenderMail.php',
-		'LoggerAppenderMailEvent' => '/appenders/LoggerAppenderMailEvent.php',
-		'LoggerAppenderMongoDB' => '/appenders/LoggerAppenderMongoDB.php',
-		'LoggerAppenderNull' => '/appenders/LoggerAppenderNull.php',
-		'LoggerAppenderFirePHP' => '/appenders/LoggerAppenderFirePHP.php',
-		'LoggerAppenderPDO' => '/appenders/LoggerAppenderPDO.php',
-		'LoggerAppenderPhp' => '/appenders/LoggerAppenderPhp.php',
-		'LoggerAppenderRollingFile' => '/appenders/LoggerAppenderRollingFile.php',
-		'LoggerAppenderSocket' => '/appenders/LoggerAppenderSocket.php',
-		'LoggerAppenderSyslog' => '/appenders/LoggerAppenderSyslog.php',
-		
-		// Configurators
-		'LoggerConfigurationAdapter' => '/configurators/LoggerConfigurationAdapter.php',
-		'LoggerConfigurationAdapterINI' => '/configurators/LoggerConfigurationAdapterINI.php',
-		'LoggerConfigurationAdapterPHP' => '/configurators/LoggerConfigurationAdapterPHP.php',
-		'LoggerConfigurationAdapterXML' => '/configurators/LoggerConfigurationAdapterXML.php',
-		'LoggerConfiguratorDefault' => '/configurators/LoggerConfiguratorDefault.php',
-
-		// Filters
-		'LoggerFilterDenyAll' => '/filters/LoggerFilterDenyAll.php',
-		'LoggerFilterLevelMatch' => '/filters/LoggerFilterLevelMatch.php',
-		'LoggerFilterLevelRange' => '/filters/LoggerFilterLevelRange.php',
-		'LoggerFilterStringMatch' => '/filters/LoggerFilterStringMatch.php',
-
-		// Helpers
-		'LoggerFormattingInfo' => '/helpers/LoggerFormattingInfo.php',
-		'LoggerOptionConverter' => '/helpers/LoggerOptionConverter.php',
-		'LoggerPatternParser' => '/helpers/LoggerPatternParser.php',
-		'LoggerUtils' => '/helpers/LoggerUtils.php',
-	
-		// Pattern converters
-		'LoggerPatternConverter' => '/pattern/LoggerPatternConverter.php',
-		'LoggerPatternConverterClass' => '/pattern/LoggerPatternConverterClass.php',
-		'LoggerPatternConverterCookie' => '/pattern/LoggerPatternConverterCookie.php',
-		'LoggerPatternConverterDate' => '/pattern/LoggerPatternConverterDate.php',
-		'LoggerPatternConverterEnvironment' => '/pattern/LoggerPatternConverterEnvironment.php',
-		'LoggerPatternConverterFile' => '/pattern/LoggerPatternConverterFile.php',
-		'LoggerPatternConverterLevel' => '/pattern/LoggerPatternConverterLevel.php',
-		'LoggerPatternConverterLine' => '/pattern/LoggerPatternConverterLine.php',
-		'LoggerPatternConverterLiteral' => '/pattern/LoggerPatternConverterLiteral.php',
-		'LoggerPatternConverterLocation' => '/pattern/LoggerPatternConverterLocation.php',
-		'LoggerPatternConverterLogger' => '/pattern/LoggerPatternConverterLogger.php',
-		'LoggerPatternConverterMDC' => '/pattern/LoggerPatternConverterMDC.php',
-		'LoggerPatternConverterMessage' => '/pattern/LoggerPatternConverterMessage.php',
-		'LoggerPatternConverterMethod' => '/pattern/LoggerPatternConverterMethod.php',
-		'LoggerPatternConverterNDC' => '/pattern/LoggerPatternConverterNDC.php',
-		'LoggerPatternConverterNewLine' => '/pattern/LoggerPatternConverterNewLine.php',
-		'LoggerPatternConverterProcess' => '/pattern/LoggerPatternConverterProcess.php',
-		'LoggerPatternConverterRelative' => '/pattern/LoggerPatternConverterRelative.php',
-		'LoggerPatternConverterRequest' => '/pattern/LoggerPatternConverterRequest.php',
-		'LoggerPatternConverterServer' => '/pattern/LoggerPatternConverterServer.php',
-		'LoggerPatternConverterSession' => '/pattern/LoggerPatternConverterSession.php',
-		'LoggerPatternConverterSessionID' => '/pattern/LoggerPatternConverterSessionID.php',
-		'LoggerPatternConverterSuperglobal' => '/pattern/LoggerPatternConverterSuperglobal.php',
-		'LoggerPatternConverterThrowable' => '/pattern/LoggerPatternConverterThrowable.php',
-		
-		// Layouts
-		'LoggerLayoutHtml' => '/layouts/LoggerLayoutHtml.php',
-		'LoggerLayoutPattern' => '/layouts/LoggerLayoutPattern.php',
-		'LoggerLayoutSerialized' => '/layouts/LoggerLayoutSerialized.php',
-		'LoggerLayoutSimple' => '/layouts/LoggerLayoutSimple.php',
-		'LoggerLayoutTTCC' => '/layouts/LoggerLayoutTTCC.php',
-		'LoggerLayoutXml' => '/layouts/LoggerLayoutXml.php',
-		
-		// Renderers
-		'LoggerRendererDefault' => '/renderers/LoggerRendererDefault.php',
-		'LoggerRendererException' => '/renderers/LoggerRendererException.php',
-		'LoggerRendererMap' => '/renderers/LoggerRendererMap.php',
-		'LoggerRenderer' => '/renderers/LoggerRenderer.php',
-	);
-	
-	/**
-	 * Loads a class.
-	 * @param string $className The name of the class to load.
-	 */
-	public static function autoload($className) {
-		if(isset(self::$classes[$className])) {
-			include dirname(__FILE__) . self::$classes[$className];
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/main/php/LoggerConfigurable.php
----------------------------------------------------------------------
diff --git a/src/main/php/LoggerConfigurable.php b/src/main/php/LoggerConfigurable.php
deleted file mode 100644
index 675037f..0000000
--- a/src/main/php/LoggerConfigurable.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
-* 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.
-*
-* @package log4php
-*/
-
-/** 
- * A base class from which all classes which have configurable properties are 
- * extended. Provides a generic setter with integrated validation.  
- * 
- * @package log4php
- * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version $Revision $
- * @since 2.2
- */
-abstract class LoggerConfigurable {
-	
-	/** Setter function for boolean type. */
-	protected function setBoolean($property, $value) {
-		try {
-			$this->$property = LoggerOptionConverter::toBooleanEx($value);
-		} catch (Exception $ex) {
-			$value = var_export($value, true);
-			$this->warn("Invalid value given for '$property' property: [$value]. Expected a boolean value. Property not changed.");
-		}
-	}
-	
-	/** Setter function for integer type. */
-	protected function setInteger($property, $value) {
-		try {
-			$this->$property = LoggerOptionConverter::toIntegerEx($value);
-		} catch (Exception $ex) {
-			$value = var_export($value, true);
-			$this->warn("Invalid value given for '$property' property: [$value]. Expected an integer. Property not changed.");
-		}
-	}
-	
-	/** Setter function for LoggerLevel values. */
-	protected function setLevel($property, $value) {
-		try {
-			$this->$property = LoggerOptionConverter::toLevelEx($value);
-		} catch (Exception $ex) {
-			$value = var_export($value, true);
-			$this->warn("Invalid value given for '$property' property: [$value]. Expected a level value. Property not changed.");
-		}
-	}
-	
-	/** Setter function for integer type. */
-	protected function setPositiveInteger($property, $value) {
-		try {
-			$this->$property = LoggerOptionConverter::toPositiveIntegerEx($value);
-		} catch (Exception $ex) {
-			$value = var_export($value, true);
-			$this->warn("Invalid value given for '$property' property: [$value]. Expected a positive integer. Property not changed.");
-		}
-	}
-	
-	/** Setter for file size. */
-	protected function setFileSize($property, $value) {
-		try {
-			$this->$property = LoggerOptionConverter::toFileSizeEx($value);
-		} catch (Exception $ex) {
-			$value = var_export($value, true);
-			$this->warn("Invalid value given for '$property' property: [$value]. Expected a file size value.  Property not changed.");
-		}
-	}
-	
-	/** Setter function for numeric type. */
-	protected function setNumeric($property, $value) {
-		try {
-			$this->$property = LoggerOptionConverter::toNumericEx($value);
-		} catch (Exception $ex) {
-			$value = var_export($value, true);
-			$this->warn("Invalid value given for '$property' property: [$value]. Expected a number. Property not changed.");
-		}
-	}
-	
-	/** Setter function for string type. */
-	protected function setString($property, $value, $nullable = false) {
-		if ($value === null) {
-			if($nullable) {
-				$this->$property= null;
-			} else {
-				$this->warn("Null value given for '$property' property. Expected a string. Property not changed.");
-			}
-		} else {
-			try {
-				$value = LoggerOptionConverter::toStringEx($value);
-				$this->$property = LoggerOptionConverter::substConstants($value);
-			} catch (Exception $ex) {
-				$value = var_export($value, true);
-				$this->warn("Invalid value given for '$property' property: [$value]. Expected a string. Property not changed.");
-			}
-		}
-	}
-	
-	/** Triggers a warning. */
-	protected function warn($message) {
-		$class = get_class($this);
-		trigger_error("log4php: $class: $message", E_USER_WARNING);
-	}
-}

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/main/php/LoggerConfigurator.php
----------------------------------------------------------------------
diff --git a/src/main/php/LoggerConfigurator.php b/src/main/php/LoggerConfigurator.php
deleted file mode 100644
index a01ec3e..0000000
--- a/src/main/php/LoggerConfigurator.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * 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.
- *
- * @package log4php
- */
-
-/**
- * Interface for logger configurators.
- * 
- * @package log4php
- * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version $Revision$
- * @since 2.2
- */
-interface LoggerConfigurator
-{
-	/**
-	 * Configures log4php based on the given configuration. 
-	 * 
-	 * All configurators implementations must implement this interface.
-	 * 
-	 * @param LoggerHierarchy $hierarchy The hierarchy on which to perform 
-	 * 		the configuration. 
-	 * @param mixed $input Either path to the config file or the 
-	 * 		configuration as an array.
-	 */
-	public function configure(LoggerHierarchy $hierarchy, $input = null);
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/main/php/LoggerException.php
----------------------------------------------------------------------
diff --git a/src/main/php/LoggerException.php b/src/main/php/LoggerException.php
deleted file mode 100644
index 6989aca..0000000
--- a/src/main/php/LoggerException.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * 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.
- *
- * @package log4php
- */
-
-/**
- * LoggerException class
- *
- * @version $Revision$
- * @package log4php
- */
-class LoggerException extends Exception {
-}

http://git-wip-us.apache.org/repos/asf/logging-log4php/blob/79ed2d0d/src/main/php/LoggerFilter.php
----------------------------------------------------------------------
diff --git a/src/main/php/LoggerFilter.php b/src/main/php/LoggerFilter.php
deleted file mode 100644
index 5df5174..0000000
--- a/src/main/php/LoggerFilter.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/**
- * 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.
- *
- * @package log4php
- */
-
-/**
- * Users should extend this class to implement customized logging
- * event filtering. Note that {@link LoggerCategory} and {@link LoggerAppender}, 
- * the parent class of all standard
- * appenders, have built-in filtering rules. It is suggested that you
- * first use and understand the built-in rules before rushing to write
- * your own custom filters.
- * 
- * <p>This abstract class assumes and also imposes that filters be
- * organized in a linear chain. The {@link #decide
- * decide(LoggerLoggingEvent)} method of each filter is called sequentially,
- * in the order of their addition to the chain.
- * 
- * <p>The {@link decide()} method must return one
- * of the integer constants {@link LoggerFilter::DENY}, 
- * {@link LoggerFilter::NEUTRAL} or {@link LoggerFilter::ACCEPT}.
- * 
- * <p>If the value {@link LoggerFilter::DENY} is returned, then the log event is
- * dropped immediately without consulting with the remaining
- * filters. 
- * 
- * <p>If the value {@link LoggerFilter::NEUTRAL} is returned, then the next filter
- * in the chain is consulted. If there are no more filters in the
- * chain, then the log event is logged. Thus, in the presence of no
- * filters, the default behaviour is to log all logging events.
- * 
- * <p>If the value {@link LoggerFilter::ACCEPT} is returned, then the log
- * event is logged without consulting the remaining filters. 
- * 
- * <p>The philosophy of log4php filters is largely inspired from the
- * Linux ipchains. 
- * 
- * @version $Revision$
- * @package log4php
- */
-abstract class LoggerFilter extends LoggerConfigurable {
-
-	/**
-	 * The log event must be logged immediately without consulting with
-	 * the remaining filters, if any, in the chain.	 
-	 */
-	const ACCEPT = 1;
-	
-	/**
-	 * This filter is neutral with respect to the log event. The
-	 * remaining filters, if any, should be consulted for a final decision.
-	 */
-	const NEUTRAL = 0;
-	
-	/**
-	 * The log event must be dropped immediately without consulting
-	 * with the remaining filters, if any, in the chain.
-	 */
-	const DENY = -1;
-
-	/**
-	 * @var LoggerFilter Points to the next {@link LoggerFilter} in the filter chain.
-	 */
-	protected $next;
-
-	/**
-	 * Usually filters options become active when set. We provide a
-	 * default do-nothing implementation for convenience.
-	*/
-	public function activateOptions() {
-	}
-
-	/**
-	 * Decide what to do.
-	 * <p>If the decision is {@link LoggerFilter::DENY}, then the event will be
-	 * dropped. If the decision is {@link LoggerFilter::NEUTRAL}, then the next
-	 * filter, if any, will be invoked. If the decision is {@link LoggerFilter::ACCEPT} then
-	 * the event will be logged without consulting with other filters in
-	 * the chain.
-	 *
-	 * @param LoggerLoggingEvent $event The {@link LoggerLoggingEvent} to decide upon.
-	 * @return integer {@link LoggerFilter::NEUTRAL} or {@link LoggerFilter::DENY}|{@link LoggerFilter::ACCEPT}
-	 */
-	public function decide(LoggerLoggingEvent $event) {
-		return self::NEUTRAL;
-	}
-
-	/**
-	 * Adds a new filter to the filter chain this filter is a part of.
-	 * If this filter has already and follow up filter, the param filter
-	 * is passed on until it is the last filter in chain.
-	 * 
-	 * @param $filter - the filter to add to this chain
-	 */
-	public function addNext($filter) {
-		if($this->next !== null) {
-			$this->next->addNext($filter);
-		} else {
-			$this->next = $filter;
-		}
-	}
-	
-	/**
-	 * Returns the next filter in this chain
-	 * @return the next filter
-	 */
-	public function getNext() {
-		return $this->next;
-	}
-
-}


Mime
View raw message