class dependency fix

Doctrine.php

@@ -226,7 +226,8 @@ final class Doctrine {
         if(! self::$path)
             self::$path = dirname(__FILE__);
 
-        $dir = dir(self::$path);
+        $path = self::$path.DIRECTORY_SEPARATOR."Doctrine";
+        $dir = dir($path);
         $a   = array();
         while (false !== ($entry = $dir->read())) {
             switch($entry):
@@ -243,11 +244,11 @@ final class Doctrine {
                 case "DQL":
                 case "Sensei":
                 case "Iterator":
-                    $a[]  = self::$path.DIRECTORY_SEPARATOR.$entry;
+                    $a[]  = $path.DIRECTORY_SEPARATOR.$entry;
                 break;
                 default:
-                    if(is_file(self::$path.DIRECTORY_SEPARATOR.$entry) && substr($entry,-4) == ".php") {
-                        require_once($entry);
+                    if(is_file($path.DIRECTORY_SEPARATOR.$entry) && substr($entry,-4) == ".php") {
+                        require_once($path.DIRECTORY_SEPARATOR.$entry);
                     }
             endswitch;
         }

Doctrine/Exception/Naming.class.php

 <?php
-require_once(Doctrine::getPath().DIRECTORY_SEPARATOR."Exception.php");
+Doctrine::autoload('Doctrine_Exception');
 /**
  * thrown when user defined Doctrine_Table is badly named
  */

Doctrine/Record/Exception.php

 <?php
-require_once(Doctrine::getPath().DIRECTORY_SEPARATOR."Exception.php");
+Doctrine::autoload('Doctrine_Exception');
 /**
  * thrown when Doctrine_Record is refreshed and the refreshed primary key doens't match the old one
  */

Doctrine/Session/Exception.php

 <?php
-require_once(Doctrine::getPath().DIRECTORY_SEPARATOR."Exception.php");
+Doctrine::autoload('Doctrine_Exception');
 /**
  * thrown when user tries to get the current 
  * session and there are no open sessions

Doctrine/Table/Exception.php

 <?php
-require_once(Doctrine::getPath().DIRECTORY_SEPARATOR."Exception.php");
+Doctrine::autoload('Doctrine_Exception');
 /**
  * thrown when user tries to initialize a new instance of Doctrine_Table, 
  * while there already exists an instance of that table