Changeset 399

Show
Ignore:
Timestamp:
03/18/07 19:47:24 (1 year ago)
Author:
mikey
Message:

added net.stubbles.websites.processors.stubProcessorResolverFactory, net.stubbles.websites.processors.stubProcessorResolverXJConfFactory
removed all dependencies of net.stubbles.websites.stubFrontController to XJConf

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main/php/net/stubbles/ipo/interceptors/stubInterceptorXJConfInitializer.php

    r398 r399  
    88 */ 
    99stubClassLoader::load('net.stubbles.ipo.interceptors.stubInterceptorInitializer', 
    10                       'net.stubbles.util.stubFactory',                       
     10                      'net.stubbles.util.stubFactory', 
    1111                      'net.stubbles.util.xjconf.xjconf' 
    1212); 

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

    r398 r399  
    1212                      'net.stubbles.ipo.response.stubBaseResponse', 
    1313                      'net.stubbles.ipo.session.stubSession', 
    14                       'net.stubbles.util.stubFactory', 
    1514                      'net.stubbles.util.stubRegistry', 
    1615                      'net.stubbles.util.stubRegistryInitializer', 
    17                       'net.stubbles.util.xjconf.xjconf', 
    18                       'net.stubbles.websites.processors.stubProcessorResolver' 
     16                      'net.stubbles.websites.processors.stubProcessorResolverFactory' 
     17                       
    1918); 
    2019/** 
    …… 
    7271     * constructor 
    7372     *  
    74      * The stubRegistryInitializer parameter is required so that the  
    75      * initializing of the stubRegistry can not be forgotten. 
    76      *  
    77      * @param   stubRegistryInitializer     $registryInitializer 
    78      * @param   stubInterceptorInitializer  $interceptorInitializer 
     73     * @param   stubRegistryInitializer       $registryInitializer       initializer for the registry 
     74     * @param   stubInterceptorInitializer    $interceptorInitializer    initializer for the interceptors 
     75     * @param   stubProcessorResolverFactory  $processorResolverFactory  factory to create the processor resolver 
    7976     * @throws  stubException 
    8077     */ 
    81     public function __construct(stubRegistryInitializer $registryInitializer, stubInterceptorInitializer $interceptorInitializer) 
     78    public function __construct(stubRegistryInitializer $registryInitializer, stubInterceptorInitializer $interceptorInitializer, stubProcessorResolverFactory $processorResolverFactory) 
    8279    { 
    8380        $registryInitializer->init(); 
    …… 
    8582        $this->preInterceptors  = $interceptorInitializer->getPreInterceptors(); 
    8683        $this->postInterceptors = $interceptorInitializer->getPostInterceptors(); 
    87          
    88         $xjconf = $this->createXJConfFacade(); 
    89         $xjconf->setDefinitionFile(stubFactory::getResourceURI('xjconf/processors.xml')); 
    90         $xjconf->parse(stubConfig::getConfigPath() . '/xml/processors.xml'); 
    91         $this->resolver     = $xjconf->getConfigValue('resolver'); 
    92          
     84        $processorResolverFactory->init(); 
     85        $this->resolver = $processorResolverFactory->getResolver(); 
    9386        $this->createInjectionMap(); 
    9487    } 
    …… 
    159152        $this->response->send(); 
    160153    } 
    161      
    162     /** 
    163      * creates the stubXJConfFacade 
    164      * 
    165      * @return  stubXJConfFacade 
    166      */ 
    167     protected function createXJConfFacade() 
    168     { 
    169         $xjconf = new stubXJConfFacade(array('http://stubbles.net/ipo/interceptors' => stubXJConfLoader::getInstance(), 
    170                                              'http://stubbles.net/websites'         => stubXJConfLoader::getInstance() 
    171                                        ) 
    172                   ); 
    173          
    174         return $xjconf; 
    175     } 
    176154} 
    177155?> 

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

    r344 r399  
    1515class TeststubFrontController extends stubFrontController 
    1616{ 
    17     public function __construct() 
    18     { 
    19         // intentionally empty 
    20     } 
    21      
    2217    public function setPreInterceptors(array $preInterceptors) 
    2318    { 
    …… 
    2924        $this->postInterceptors = $postInterceptors; 
    3025    } 
    31      
    32     public function setProcessorResolver(stubProcessorResolver $resolver) 
    33     { 
    34         $this->resolver = $resolver; 
    35     } 
    36      
     26 
    3727    public function setRequest(stubRequest $request) 
    3828    { 
    …… 
    6353        return $this->injectionMap; 
    6454    } 
    65      
    66     protected function createXJConfFacade() 
    67     { 
    68         return new MockstubXJConfFacade(); 
    69     } 
    7055} 
    7156?> 

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

    r398 r399  
    1313Mock::generate('stubSession'); 
    1414Mock::generate('stubInterceptorInitializer'); 
     15Mock::generate('stubProcessorResolverFactory'); 
    1516Mock::generate('stubRegistryInitializer'); 
    1617Mock::generate('stubXJConfFacade'); 
    …… 
    6162    public function setUp() 
    6263    { 
    63         $this->frontController = new TeststubFrontController(new MockstubRegistryInitializer(), new MockstubInterceptorInitializer()); 
    6464        stubRegistry::setConfig('net.stubbles.ipo.request.class', 'MockstubRequest'); 
    6565        stubRegistry::setConfig('net.stubbles.ipo.session.class', 'MockstubSession'); 
     66        $mockInterceptorInitializer = new MockstubInterceptorInitializer(); 
     67        $mockInterceptorInitializer->setReturnValue('getPreInterceptors', array()); 
     68        $mockInterceptorInitializer->setReturnValue('getPostInterceptors', array()); 
     69        $this->frontController = new TeststubFrontController(new MockstubRegistryInitializer(), $mockInterceptorInitializer, new MockstubProcessorResolverFactory()); 
    6670    } 
    6771 

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

    r398 r399  
    1717Mock::generate('stubXJConfFacade'); 
    1818Mock::generate('stubInterceptorInitializer'); 
     19Mock::generate('stubProcessorResolverFactory'); 
    1920Mock::generate('stubRegistryInitializer'); 
    2021require_once dirname(__FILE__) . '/TeststubFrontController.php'; 
    …… 
    8182    public function setUp() 
    8283    { 
    83         $this->frontController = new TeststubFrontController(new MockstubRegistryInitializer(), new MockstubInterceptorInitializer()); 
     84        $mockProcessorResolverFactory = new MockstubProcessorResolverFactory(); 
     85        $this->mockProcessorResolver  = new MockstubProcessorResolver(); 
     86        $mockProcessorResolverFactory->setReturnValue('getResolver', $this->mockProcessorResolver); 
     87        $mockInterceptorInitializer = new MockstubInterceptorInitializer(); 
     88        $mockInterceptorInitializer->setReturnValue('getPreInterceptors', array()); 
     89        $mockInterceptorInitializer->setReturnValue('getPostInterceptors', array()); 
     90        $this->frontController = new TeststubFrontController(new MockstubRegistryInitializer(), $mockInterceptorInitializer, $mockProcessorResolverFactory); 
    8491        $this->mockRequest     = new MockstubRequest(); 
    8592        $this->frontController->setRequest($this->mockRequest); 
    …… 
    8895        $this->mockResponse    = new MockstubResponse(); 
    8996        $this->frontController->setResponse($this->mockResponse); 
    90         $this->mockProcessorResolver = new MockstubProcessorResolver(); 
    91         $this->frontController->setProcessorResolver($this->mockProcessorResolver); 
    9297        $this->mockProcessor   = new MockstubProcessor(); 
    9398        $this->mockProcessorResolver->setReturnValue('resolve', $this->mockProcessor);