Changeset 1404

Show
Ignore:
Timestamp:
03/07/08 17:30:22 (6 months ago)
Author:
mikey
Message:

added new marker interface for database initializers
removed mode initializer (should be done in your own website initializer implementation)
added possibility to set the descriptor of the xjconf initializer

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main/php/net/stubbles/rdbms/stubDatabaseXJConfInitializer.php

    r1403 r1404  
    77 * @subpackage  rdbms 
    88 */ 
    9 stubClassLoader::load('net::stubbles::ipo::interceptors::stubPreInterceptor', 
    10                       'net::stubbles::rdbms::stubDatabaseConnectionPool', 
     9stubClassLoader::load('net::stubbles::rdbms::stubDatabaseConnectionPool', 
     10                      'net::stubbles::rdbms::stubDatabaseInitializer', 
    1111                      'net::stubbles::util::xjconf::xjconf' 
    1212); 
    …… 
    1717 * @subpackage  rdbms 
    1818 */ 
    19 class stubDatabaseXJConfInitializer extends stubXJConfAbstractInitializer implements stubPreInterceptor 
     19class stubDatabaseXJConfInitializer extends stubXJConfAbstractInitializer implements stubDatabaseInitializer 
    2020{ 
     21    /** 
     22     * descriptor to be used 
     23     * 
     24     * @var  string 
     25     */ 
     26    protected $descriptor = 'rdbms'; 
     27 
     28    /** 
     29     * sets the descriptor to be used 
     30     * 
     31     * @param  string  $descriptor 
     32     */ 
     33    public function setDescriptor($descriptor) 
     34    { 
     35        $this->descriptor = $descriptor; 
     36    } 
     37 
    2138    /** 
    2239     * returns the descriptor that identifies the initializer 
    …… 
    2744    public function getDescriptor($type) 
    2845    { 
    29         return 'rdbms'; 
     46        switch ($type) { 
     47            case stubXJConfInitializer::DESCRIPTOR_CONFIG: 
     48                return $this->descriptor; 
     49             
     50            case stubXJConfInitializer::DESCRIPTOR_DEFINITION: 
     51                // break ommitted 
     52 
     53            default: 
     54                return 'rdbms'; 
     55        } 
    3056    } 
    3157 
    …… 
    6793        // intentionally empty 
    6894    } 
    69  
    70     /** 
    71      * does the preprocessing stuff 
    72      * 
    73      * @param   stubRequest   $request   access to request data 
    74      * @param   stubSession   $session   access to session data 
    75      * @param   stubResponse  $response  access to response data 
    76      * @throws  stubXJConfException 
    77      */ 
    78     public function preProcess(stubRequest $request, stubSession $session, stubResponse $response) 
    79     { 
    80         $this->init(); 
    81     } 
    8295} 
    8396?> 

  • trunk/src/main/php/net/stubbles/util/cache/stubCacheInitializer.php

    r1395 r1404  
    1616 * @subpackage  util_cache 
    1717 */ 
    18 interface stubCacheInitializer extends stubPreInterceptor, stubInitializer 
     18interface stubCacheInitializer extends stubInitializer 
    1919{ 
    2020    // intentionally empty 

  • trunk/src/main/php/net/stubbles/util/cache/stubCacheXJConfInitializer.php

    r1395 r1404  
    6767        // intentionally empty 
    6868    } 
    69  
    70     /** 
    71      * does the preprocessing stuff 
    72      * 
    73      * @param  stubRequest   $request   access to request data 
    74      * @param  stubSession   $session   access to session data 
    75      * @param  stubResponse  $response  access to response data 
    76      */ 
    77     public function preProcess(stubRequest $request, stubSession $session, stubResponse $response) 
    78     { 
    79         $this->init(); 
    80     } 
    8169} 
    8270?> 

  • trunk/src/test/php/net/stubbles/integration/DatabaseTestCase.php

    r1308 r1404  
    77 * @subpackage  test_integration 
    88 */ 
    9 stubClassLoader::load('net::stubbles::rdbms::stubDatabaseInitializer'); 
     9stubClassLoader::load('net::stubbles::rdbms::stubDatabaseXJConfInitializer'); 
    1010/** 
    1111 * Integration test for database. 
    …… 
    2121    protected function initInitializer() 
    2222    { 
    23         $dbInitializer = new stubDatabaseInitializer(); 
     23        $dbInitializer = new stubDatabaseXJConfInitializer(); 
    2424        $dbInitializer->init(); 
    2525    } 

  • trunk/src/test/php/net/stubbles/rdbms/stubDatabaseXJConfInitializerTestCase.php

    r1403 r1404  
    6161        $this->assertEquals('rdbms', $this->dbXJConfInitializer->getDescriptor(stubXJConfInitializer::DESCRIPTOR_CONFIG)); 
    6262        $this->assertEquals('rdbms', $this->dbXJConfInitializer->getDescriptor(stubXJConfInitializer::DESCRIPTOR_DEFINITION)); 
     63        $this->dbXJConfInitializer->setDescriptor('foo'); 
     64        $this->assertEquals('foo', $this->dbXJConfInitializer->getDescriptor(stubXJConfInitializer::DESCRIPTOR_CONFIG)); 
     65        $this->assertEquals('rdbms', $this->dbXJConfInitializer->getDescriptor(stubXJConfInitializer::DESCRIPTOR_DEFINITION)); 
     66        $this->assertEquals('rdbms', $this->dbXJConfInitializer->getDescriptor('invalid')); 
    6367    } 
    6468