exception.php内で定義していた例外クラスをcommon.phpに移動し、exception.phpは削除しました。今のところ、必要無いので。

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/hirameki-note/trunk@7 a9a2e140-effa-41f6-bfbf-abe75ae75a30

diff --git a/hirameki-note/src/main/php/common/common.php b/hirameki-note/src/main/php/common/common.php
index e4a2eb8..5c24a1e 100644 (file)
--- a/hirameki-note/src/main/php/common/common.php
+++ b/hirameki-note/src/main/php/common/common.php
@@ -41,6 +41,18 @@
        }\r
        PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, "pear_error_handler");\r
        \r
+       class ArgumentException extends Exception {\r
+       }\r
+       \r
+       class SQLException extends Exception {\r
+       }\r
+       \r
+       class PEARException extends Exception {\r
+       }\r
+       \r
+       class PHPException extends Exception {\r
+       }\r
+       \r
        /*\r
         * HTTP関連処理。\r
         */\r

diff --git a/hirameki-note/src/main/php/common/exception.php b/hirameki-note/src/main/php/common/exception.php
deleted file mode 100644 (file)
index 1bc36e4..0000000
--- a/hirameki-note/src/main/php/common/exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php\r
-       // Copyright (c) 2008, u6k.yu1@gmail.com\r
-       // All rights reserved.\r
-       // \r
-       // Redistribution and use in source and binary forms, with or without\r
-       // modification, are permitted provided that the following conditions are met:\r
-       //     * Redistributions of source code must retain the above copyright\r
-       //       notice, this list of conditions and the following disclaimer.\r
-       //     * Redistributions in binary form must reproduce the above copyright\r
-       //       notice, this list of conditions and the following disclaimer in the\r
-       //       documentation and/or other materials provided with the distribution.\r
-       //     * Neither the name of the u6k nor the\r
-       //       names of its contributors may be used to endorse or promote products\r
-       //       derived from this software without specific prior written permission.\r
-       // \r
-       // THIS SOFTWARE IS PROVIDED BY u6k.yu1@gmail.com ``AS IS'' AND ANY\r
-       // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\r
-       // WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\r
-       // DISCLAIMED. IN NO EVENT SHALL u6k.yu1@gmail.com BE LIABLE FOR ANY\r
-       // DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\r
-       // (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\r
-       // LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\r
-       // ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\r
-       // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\r
-       // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
-       \r
-       class ArgumentException extends Exception {\r
-       }\r
-       \r
-       class SQLException extends Exception {\r
-       }\r
-       \r
-       class PEARException extends Exception {\r
-       }\r
-       \r
-       class PHPException extends Exception {\r
-       }\r
-?>\r