<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>application/models/Base/Post.php</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,21 +1,20 @@
 # Doctrine ORM with Zend Framedwork and ZFDebug
 
-This is a proof of concept to have Doctrine data in a ZFDebug panel. My Doctrine plugin for ZFDebug is:
+This is a proof of concept to have Doctrine data in a ZFDebug panel. My Doctrine plugin for ZFDebug is at:
   
     library/Danceric/Controller/Plugin/Debug/Plugin/Doctrine.php 
 
-To try this demo project, you need to put these libs in the `library` folder
+To try this demo project, you need to put these libs in the `library` folder (or in your php include path)
 
-- [Zend Framework](http://framework.zend.com/) 1.8.x
+- [Zend Framework](http://framework.zend.com/) 1.9.x
 - [ZFDebug](http://code.google.com/p/zfdebug/) 1.5.x
-- [Doctrine](http://www.doctrine-project.org/) 1.1.x
+- [Doctrine](http://www.doctrine-project.org/) 1.2.x
 
 It should look like:
 
     library/
       Danceric/
       Doctrine/
-      Doctrine.php
       ZFDebug/
       Zend/
 </diff>
      <filename>README.markdown</filename>
    </modified>
    <modified>
      <diff>@@ -2,25 +2,29 @@
 
 class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 {
+	/**
+     * Autoload stuff from the default module (which is not in a `modules` subfolder in this project)
+     * (Api_, Form_, Model_, Model_DbTable, Plugin_)
+     * */
+    protected function _initAutoload()
+    {
+        $moduleLoader = new Zend_Application_Module_Autoloader(array(
+            'namespace' =&gt; '',
+            'basePath'  =&gt; APPLICATION_PATH));
+
+        return $moduleLoader;
+    }
+
     public function _initDoctrine()
     {
         $doctrineConfig = $this-&gt;getOption('doctrine');
-            
-        $loader = Zend_Loader_Autoloader::getInstance();
-        
-        require_once 'Doctrine.php';
-        $loader-&gt;pushAutoloader(array('Doctrine', 'autoload'));
 
         $manager = Doctrine_Manager::getInstance();
-        $manager-&gt;setAttribute(Doctrine::ATTR_MODEL_LOADING, Doctrine::MODEL_LOADING_CONSERVATIVE);
         
         // Creating 2 named connections, to test ZFDebug doctrine plugin
         $manager-&gt;openConnection($doctrineConfig['connection_string'], 'one');
         $manager-&gt;openConnection($doctrineConfig['connection_string'], 'two');
                 
-        // Add model and generated base class to doctrine autoloader
-        Doctrine::loadModels($doctrineConfig['models_path']);
-        
         return $manager;
     }
     
@@ -39,8 +43,9 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
         $this-&gt;bootstrap('Doctrine');
         $doctrine = $this-&gt;getResource('Doctrine');
 
+		// not in the .ini because we don't always need it
         $autoloader = Zend_Loader_Autoloader::getInstance();
-        $autoloader-&gt;registerNamespace('ZFDebug');
+        $autoloader-&gt;registerNamespace('ZFDebug_');
 
         $options = array(
             'plugins' =&gt; array('Variables',</diff>
      <filename>application/Bootstrap.php</filename>
    </modified>
    <modified>
      <diff>@@ -2,6 +2,7 @@
 phpSettings.display_startup_errors = 0
 phpSettings.display_errors = 0
 includePaths.library = APPLICATION_PATH &quot;/../library&quot;
+autoloaderNamespaces[] = &quot;Doctrine_&quot;
 bootstrap.path = APPLICATION_PATH &quot;/Bootstrap.php&quot;
 bootstrap.class = &quot;Bootstrap&quot;
 resources.frontController.controllerDirectory = APPLICATION_PATH &quot;/controllers&quot;
@@ -18,6 +19,7 @@ doctrine.migrations_path = APPLICATION_PATH &quot;/../doctrine/migrations&quot;
 doctrine.sql_path = APPLICATION_PATH &quot;/../doctrine/data/sql&quot;
 doctrine.yaml_schema_path = APPLICATION_PATH &quot;/../doctrine/schema&quot;
 
+
 [staging : production]
 
 [testing : production]</diff>
      <filename>application/configs/application.ini</filename>
    </modified>
    <modified>
      <diff>@@ -15,13 +15,13 @@ class IndexController extends Zend_Controller_Action
         // Using 2 different connection to test ZFDebug Doctrine plugin
         $conn1 = Doctrine_Manager::getInstance()-&gt;getConnection('one');
         $posts = Doctrine_Query::create($conn1)
-                     -&gt;from('Post p')
+                     -&gt;from('Model_Post p')
                      -&gt;orderBy('p.created_at DESC')
                      -&gt;execute();
                      
         $conn2 = Doctrine_Manager::getInstance()-&gt;getConnection('two');
         $dummy = Doctrine_Query::create($conn2)
-                    -&gt;from('Post p')
+                    -&gt;from('Model_Post p')
                     -&gt;select('p.content')
                     -&gt;where('p.author = ?', 'danceric')
                     -&gt;execute();</diff>
      <filename>application/controllers/IndexController.php</filename>
    </modified>
    <modified>
      <diff>@@ -1,16 +1,16 @@
 &lt;?php
 
 /**
- * Post
+ * Model_Post
  * 
  * This class has been auto-generated by the Doctrine ORM Framework
  * 
  * @package    ##PACKAGE##
  * @subpackage ##SUBPACKAGE##
  * @author     ##NAME## &lt;##EMAIL##&gt;
- * @version    SVN: $Id: Builder.php 5441 2009-01-30 22:58:43Z jwage $
+ * @version    SVN: $Id: Builder.php 6508 2009-10-14 06:28:49Z jwage $
  */
-class Post extends BasePost
+class Model_Post extends Model_Base_Post
 {
 
 }
\ No newline at end of file</diff>
      <filename>application/models/Post.php</filename>
    </modified>
    <modified>
      <diff>@@ -5,6 +5,19 @@ define('APPLICATION_ENV', 'development');
 require realpath(dirname(__FILE__) . '/../application/cli_bootstrap.php');
 
 $application-&gt;getBootstrap()-&gt;bootstrap('doctrine');
+$options = $application-&gt;getOption('doctrine');
 
-$cli = new Doctrine_Cli($application-&gt;getOption('doctrine'));
+
+// Config to have `generate-models-yaml` generate &quot;PEAR Style Model Loading and Generation&quot;
+// That could be set in application.ini too (doctrine.generate_models_options.pearStyle = 1),
+// but if you put it here, you can copy/paste from the doctrine documentation :)
+$options['generate_models_options'] = array(
+    'pearStyle' =&gt; true,
+    'baseClassesDirectory' =&gt; null,
+    'baseClassPrefix' =&gt; 'Base_',
+    'classPrefix' =&gt; 'Model_',
+    'classPrefixFiles' =&gt; false
+);
+
+$cli = new Doctrine_Cli($options);
 $cli-&gt;run($_SERVER['argv']);
\ No newline at end of file</diff>
      <filename>scripts/doctrine-cli</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>application/models/generated/BasePost.php</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>b718567fc0ac3995bf67c9adc4c1cc24e7eb2e1c</id>
    </parent>
  </parents>
  <author>
    <name>Eric Leclerc</name>
    <email>eric.leclerc@gmail.com</email>
  </author>
  <url>http://github.com/danceric/zfdebugdoctrine/commit/591e7ad2fa4494b9d6b442ebdecd95fbba13ac20</url>
  <id>591e7ad2fa4494b9d6b442ebdecd95fbba13ac20</id>
  <committed-date>2009-10-29T17:08:27-07:00</committed-date>
  <authored-date>2009-10-25T06:14:19-07:00</authored-date>
  <message>getting ready for Doctrine 1.2</message>
  <tree>d4c2aa3ebdc5575541e1bc58c8e38caabc5eacc1</tree>
  <committer>
    <name>Eric Leclerc</name>
    <email>eric.leclerc@gmail.com</email>
  </committer>
</commit>
