Changeset 359

Show
Ignore:
Timestamp:
03/10/07 00:22:52 (1 year ago)
Author:
mikey
Message:

simplified usage of net.stubbles.util.stubRegistry due to its new optional default parameter in get() and getConfig()

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main/php/net/stubbles/util/log/stubLogDataFactory.php

    r149 r359  
    2626    public static function create(stubSession $session, $target, $level = stubLogger::LEVEL_INFO) 
    2727    { 
    28         $class = 'net.stubbles.util.log.stubBaseLogData'; 
    29         if (stubRegistry::hasConfig('core.log.LogDataClass') == true) { 
    30             $class = stubRegistry::getConfig('core.log.LogDataClass'); 
    31         } 
    32          
     28        $class = stubRegistry::getConfig('net.stubbles.util.log.class', 'net.stubbles.util.log.stubBaseLogData'); 
    3329        stubClassLoader::load($class); 
    3430        $className = stubClassLoader::getNonQualifiedClassName($class); 
    35          
    36         $logData = new $className($session, $target, $level); 
     31        $logData   = new $className($session, $target, $level); 
    3732        return $logData; 
    3833    } 

  • trunk/src/main/php/net/stubbles/websites/stubFrontController.php

    r344 r359  
    1111                      'net.stubbles.ipo.interceptors.stubPostInterceptor', 
    1212                      'net.stubbles.ipo.interceptors.stubPreInterceptor', 
    13                       'net.stubbles.ipo.request.stubWebRequest', 
    14                       'net.stubbles.ipo.session.stubPHPSession', 
     13                      'net.stubbles.ipo.request.stubRequest', 
     14                      'net.stubbles.ipo.session.stubSession', 
    1515                      'net.stubbles.ipo.response.stubBaseResponse', 
    1616                      'net.stubbles.websites.processors.stubProcessorResolver', 
    …… 
    9595    { 
    9696        $this->injectionMap = new stubInjectionMap(); 
    97         if (stubRegistry::hasConfig('net.stubbles.ipo.request.class') == true) { 
    98             $fqClassName = stubRegistry::getConfig('net.stubbles.ipo.request.class'); 
    99             $className   = stubClassLoader::getNonQualifiedClassName($fqClassName); 
    100             if (class_exists($className, false) == false) { 
    101                 stubClassLoader::load($fqClassName); 
    102             } 
     97        $fqClassName = stubRegistry::getConfig('net.stubbles.ipo.request.class', 'net.stubbles.ipo.request.stubWebRequest'); 
     98        $className   = stubClassLoader::getNonQualifiedClassName($fqClassName); 
     99        if (class_exists($className, false) == false) { 
     100            stubClassLoader::load($fqClassName); 
     101        } 
     102         
     103        $this->request = new $className(); 
     104        if (($this->request instanceof stubRequest) == false) { 
     105            throw new stubException('Configured request class is not an instance of stubRequest.'); 
     106        } 
    103107 
    104             $this->request = new $className(); 
    105             if (($this->request instanceof stubRequest) == false) { 
    106                 throw new stubException('Configured request class is not an instance of stubRequest.'); 
    107             } 
    108         } else { 
    109             $this->request = new stubWebRequest(); 
    110         } 
    111108        $this->injectionMap->addInjection('stubRequest', $this->request); 
    112109         
    113         if (stubRegistry::hasConfig('net.stubbles.ipo.session.name') == true) { 
    114             $sessionName = stubRegistry::getConfig('net.stubbles.ipo.session.name'); 
    115         } else { 
    116             $sessionName = 'SID'; 
     110        $fqClassName = stubRegistry::getConfig('net.stubbles.ipo.session.class', 'net.stubbles.ipo.session.stubPHPSession'); 
     111        $className   = stubClassLoader::getNonQualifiedClassName($fqClassName); 
     112        if (class_exists($className, false) == false) { 
     113            stubClassLoader::load($fqClassName); 
    117114        } 
    118         if (stubRegistry::hasConfig('net.stubbles.ipo.session.class') == true) { 
    119             $fqClassName = stubRegistry::getConfig('net.stubbles.ipo.session.class'); 
    120             $className   = stubClassLoader::getNonQualifiedClassName($fqClassName); 
    121             if (class_exists($className, false) == false) { 
    122                 stubClassLoader::load($fqClassName); 
    123             } 
    124              
    125             $this->session = new $className($sessionName); 
    126             if (($this->session instanceof stubSession) == false) { 
    127                 throw new stubException('Configured session class is not an instance of stubSession.'); 
    128             } 
    129         } else { 
    130             $this->session = new stubPHPSession($sessionName); 
     115         
     116        $this->session = new $className(stubRegistry::getConfig('net.stubbles.ipo.session.name', 'SID')); 
     117        if (($this->session instanceof stubSession) == false) { 
     118            throw new stubException('Configured session class is not an instance of stubSession.'); 
    131119        } 
     120         
    132121        $this->injectionMap->addInjection('stubSession', $this->session); 
    133122