ZF-7940

- added ZendMonitor support to controller & app config file
- Fixed issue with controller naming in profile

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@19538 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Tool/Project/Context/Zf/ApplicationConfigFile.php

@@ -92,6 +92,7 @@ bootstrap.path = APPLICATION_PATH "/Bootstrap.php"
 bootstrap.class = "Bootstrap"
 resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers"
 resources.frontController.params.displayExceptions = 0
+resources.zendmonitor[] =
 
 [staging : production]
 

library/Zend/Tool/Project/Context/Zf/ControllerFile.php

@@ -100,11 +100,8 @@ class Zend_Tool_Project_Context_Zf_ControllerFile extends Zend_Tool_Project_Cont
      */
     public function getContents()
     {
-
-        //$filter = new Zend_Filter_Word_DashToCamelCase();
-
         $className = ($this->_moduleName) ? ucfirst($this->_moduleName) . '_' : '';
-        $className .= $this->_controllerName . 'Controller';
+        $className .= ucfirst($this->_controllerName) . 'Controller';
         
         $codeGenFile = new Zend_CodeGenerator_Php_File(array(
             'fileName' => $this->getPath(),
@@ -159,7 +156,18 @@ if (\$this->getInvokeArg('displayExceptions') == true) {
 
 \$this->view->request   = \$errors->request;
 EOS
-                                ))
+                                )),
+                            new Zend_CodeGenerator_Php_Method(array(
+                                'name' => 'getMonitorLog',
+                                'body' => <<<EOS
+\$bootstrap = \$this->getInvokeArg('bootstrap');
+if (!\$bootstrap->hasPluginResource('ZendMonitor')) {
+    return false;
+}
+\$log = \$bootstrap->getResource('ZendMonitor');
+return \$log;
+EOS
+                                )),
                             )
                         ))
                     )

library/Zend/Tool/Project/Context/Zf/ViewScriptFile.php

@@ -146,7 +146,7 @@ class Zend_Tool_Project_Context_Zf_ViewScriptFile extends Zend_Tool_Project_Cont
 </html>
 
 EOS;
-        } elseif ($this->_forActionName == 'index' && $this->_resource->getParentResource()->getAttribute('forControllerName') == 'index') {
+        } elseif ($this->_forActionName == 'index' && $this->_resource->getParentResource()->getAttribute('forControllerName') == 'Index') {
 
             $contents =<<<EOS
 <style>

library/Zend/Tool/Project/Provider/Controller.php

@@ -21,31 +21,6 @@
  */
 
 /**
- * @see Zend_Tool_Project_Provider_Abstract
- */
-require_once 'Zend/Tool/Project/Provider/Abstract.php';
-
-/**
- * @see Zend_Tool_Framework_Registry
- */
-require_once 'Zend/Tool/Framework/Registry.php';
-
-/**
- * @see Zend_Tool_Project_Provider_View
- */
-require_once 'Zend/Tool/Project/Provider/View.php';
-
-/**
- * @see Zend_Tool_Project_Provider_Exception
- */
-require_once 'Zend/Tool/Project/Provider/Exception.php';
-
-/**
- * @see Zend_Tool_Framework_Provider_Pretendable
- */
-require_once 'Zend/Tool/Framework/Provider/Pretendable.php';
-
-/**
  * @category   Zend
  * @package    Zend_Tool
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)

library/Zend/Tool/Project/Provider/Project.php

@@ -125,20 +125,20 @@ class Zend_Tool_Project_Provider_Project
                     <applicationConfigFile type="ini" />
                 </configsDirectory>
                 <controllersDirectory>
-                    <controllerFile controllerName="index">
+                    <controllerFile controllerName="Index">
                         <actionMethod actionName="index" />
                     </controllerFile>
-                    <controllerFile controllerName="error" />
+                    <controllerFile controllerName="Error" />
                 </controllersDirectory>
                 <layoutsDirectory enabled="false" />
                 <modelsDirectory />
                 <modulesDirectory enabled="false" />
                 <viewsDirectory>
                     <viewScriptsDirectory>
-                        <viewControllerScriptsDirectory forControllerName="index">
+                        <viewControllerScriptsDirectory forControllerName="Index">
                             <viewScriptFile forActionName="index" />
                         </viewControllerScriptsDirectory>
-                        <viewControllerScriptsDirectory forControllerName="error">
+                        <viewControllerScriptsDirectory forControllerName="Error">
                             <viewScriptFile forActionName="error" />
                         </viewControllerScriptsDirectory>
                     </viewScriptsDirectory>