Changeset 1742

Show
Ignore:
Timestamp:
03/06/2007 07:42:50 AM (23 months ago)
Author:
xue
Message:

Modified component inclusion method in bootstrap code.
Fixed a bug about using page configuration.

Location:
trunk/framework
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/framework/PradoBase.php

    r1699 r1742  
    2424if(!defined('PRADO_CHMOD')) 
    2525        define('PRADO_CHMOD',0777); 
    26  
    27 /** 
    28  * Includes the classes essential for PradoBase class 
    29  */ 
    30 require_once(PRADO_DIR.'/TComponent.php'); 
    31 require_once(PRADO_DIR.'/Exceptions/TException.php'); 
    32 require_once(PRADO_DIR.'/Util/TLogger.php'); 
    3326 
    3427/** 
    … …  
    602595} 
    603596 
     597/** 
     598 * Includes the classes essential for PradoBase class 
     599 */ 
     600PradoBase::using('System.TComponent'); 
     601PradoBase::using('System.Exceptions.TException'); 
     602PradoBase::using('System.Util.TLogger'); 
     603 
    604604?> 

  • trunk/framework/TApplication.php

    r1699 r1742  
    1919 * Includes core classes essential for TApplication class 
    2020 */ 
    21 require_once(PRADO_DIR.'/TApplicationComponent.php'); 
    22 require_once(PRADO_DIR.'/TModule.php'); 
    23 require_once(PRADO_DIR.'/TService.php'); 
    24 require_once(PRADO_DIR.'/Exceptions/TErrorHandler.php'); 
    25 require_once(PRADO_DIR.'/Caching/TCache.php'); 
    26 require_once(PRADO_DIR.'/IO/TTextWriter.php'); 
    27 require_once(PRADO_DIR.'/Collections/TList.php'); 
    28 require_once(PRADO_DIR.'/Collections/TMap.php'); 
    29 require_once(PRADO_DIR.'/Collections/TStack.php'); 
    30 require_once(PRADO_DIR.'/Xml/TXmlDocument.php'); 
    31 require_once(PRADO_DIR.'/Security/TAuthorizationRule.php'); 
    32 require_once(PRADO_DIR.'/Security/TSecurityManager.php'); 
    33 require_once(PRADO_DIR.'/Web/THttpUtility.php'); 
    34 require_once(PRADO_DIR.'/Web/Javascripts/TJavaScript.php'); 
    35 require_once(PRADO_DIR.'/Web/THttpRequest.php'); 
    36 require_once(PRADO_DIR.'/Web/THttpResponse.php'); 
    37 require_once(PRADO_DIR.'/Web/THttpSession.php'); 
    38 require_once(PRADO_DIR.'/Web/Services/TPageService.php'); 
    39 require_once(PRADO_DIR.'/Web/TAssetManager.php'); 
    40 require_once(PRADO_DIR.'/I18N/TGlobalization.php'); 
    41  
     21Prado::using('System.TApplicationComponent'); 
     22Prado::using('System.TModule'); 
     23Prado::using('System.TService'); 
     24Prado::using('System.Exceptions.TErrorHandler'); 
     25Prado::using('System.Caching.TCache'); 
     26Prado::using('System.IO.TTextWriter'); 
     27Prado::using('System.Collections.TList'); 
     28Prado::using('System.Collections.TMap'); 
     29Prado::using('System.Collections.TStack'); 
     30Prado::using('System.Xml.TXmlDocument'); 
     31Prado::using('System.Security.TAuthorizationRule'); 
     32Prado::using('System.Security.TSecurityManager'); 
     33Prado::using('System.Web.THttpUtility'); 
     34Prado::using('System.Web.Javascripts.TJavaScript'); 
     35Prado::using('System.Web.THttpRequest'); 
     36Prado::using('System.Web.THttpResponse'); 
     37Prado::using('System.Web.THttpSession'); 
     38Prado::using('System.Web.Services.TPageService'); 
     39Prado::using('System.Web.TAssetManager'); 
     40Prado::using('System.I18N.TGlobalization'); 
    4241 
    4342/** 

  • trunk/framework/Web/Services/TPageService.php

    r1734 r1742  
    239239                                $pageConfig=new TPageConfiguration; 
    240240                                if($config!==null) 
    241                                         $pageConfig->loadFromXml($config,$application->getBasePath()); 
     241                                        $pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath()); 
    242242                                $pageConfig->loadFromFiles($pagePath,$this->getBasePath()); 
    243243                                $cache->set(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath,array($pageConfig,$currentTimestamp));