Changeset 385

Show
Ignore:
Timestamp:
03/15/07 19:20:33 (1 year ago)
Author:
mikey
Message:

rewrote initialization of net.stubbles.util.stubRegistry via net.stubbles.util.stubRegistryInitializer

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/config/xml/interceptors.xml

    r357 r385  
    44    xmlns="http://stubbles.net/ipo/interceptors"> 
    55  <preInterceptors> 
    6     <preInterceptor type="net.stubbles.util.stubRegistryInitializer" /> 
    76    <preInterceptor type="net.stubbles.websites.xml.stubShowLastXMLInterceptor" /> 
    87  </preInterceptors> 

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

    r374 r385  
    1616                      'net.stubbles.websites.processors.stubProcessorResolver', 
    1717                      'net.stubbles.util.stubRegistry', 
     18                      'net.stubbles.util.stubRegistryInitializer', 
    1819                      'net.stubbles.util.xjconf.xjconf' 
    1920); 
    …… 
    7273     * constructor 
    7374     *  
     75     * The stubRegistryInitializer parameter is required so that the  
     76     * initializing of the stubRegistry can not be forgotten. 
     77     *  
     78     * @param   stubRegistryInitializer  $registryInitializer 
    7479     * @throws  stubXJConfException 
    7580     */ 
    76     public function __construct() 
     81    public function __construct(stubRegistryInitializer $registryInitializer) 
    7782    { 
     83        $registryInitializer->init(); 
    7884        $xjconf = $this->createXJConfFacade(); 
    7985        $xjconf->setDefinitionFile(stubFactory::getResourceURI('xjconf/interceptors.xml')); 

  • trunk/src/test/php/net/stubbles/websites/stubFrontControllerInjectionMapTestCase.php

    r374 r385  
    1212Mock::generate('stubRequest'); 
    1313Mock::generate('stubSession'); 
     14Mock::generate('stubRegistryInitializer'); 
    1415Mock::generate('stubXJConfFacade'); 
    1516require_once dirname(__FILE__) . '/TeststubFrontController.php'; 
    …… 
    5960    public function setUp() 
    6061    { 
    61         $this->frontController = new TeststubFrontController(); 
     62        $this->frontController = new TeststubFrontController(new MockstubRegistryInitializer()); 
    6263        stubRegistry::setConfig('net.stubbles.ipo.request.class', 'MockstubRequest'); 
    6364        stubRegistry::setConfig('net.stubbles.ipo.session.class', 'MockstubSession'); 

  • trunk/src/test/php/net/stubbles/websites/stubFrontControllerProcessTestCase.php

    r344 r385  
    1616Mock::generate('stubProcessorResolver'); 
    1717Mock::generate('stubXJConfFacade'); 
     18Mock::generate('stubRegistryInitializer'); 
    1819require_once dirname(__FILE__) . '/TeststubFrontController.php'; 
    1920/** 
    …… 
    7980    public function setUp() 
    8081    { 
    81         $this->frontController = new TeststubFrontController(); 
     82        $this->frontController = new TeststubFrontController(new MockstubRegistryInitializer()); 
    8283        $this->mockRequest     = new MockstubRequest(); 
    8384        $this->frontController->setRequest($this->mockRequest);