Changeset 1406

Show
Ignore:
Timestamp:
03/10/08 11:35:15 (5 months ago)
Author:
mikey
Message:

removed logging initializer, is not a feature of websites only

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/examples/docroot/websites-memphis/index.php

    r1402 r1406  
    2121    public static function main() 
    2222    { 
    23         $controller = new stubFrontController(new stubDefaultWebsiteInitializer(false)); 
     23        $controller = new stubFrontController(new stubDefaultWebsiteInitializer()); 
    2424        $controller->process(); 
    2525    } 

  • trunk/examples/docroot/websites-xml/index.php

    r1402 r1406  
    2121    public static function main() 
    2222    { 
    23         $controller = new stubFrontController(new stubDefaultWebsiteInitializer(false)); 
     23        $controller = new stubFrontController(new stubDefaultWebsiteInitializer()); 
    2424        $controller->process(); 
    2525    } 

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

    r1402 r1406  
    1010                      'net::stubbles::ipo::interceptors::stubInterceptorXJConfInitializer', 
    1111                      'net::stubbles::util::stubRegistryXJConfInitializer', 
    12                       'net::stubbles::util::log::stubLoggerXJConfFactory', 
    1312                      'net::stubbles::websites::stubWebsiteInitializer', 
    1413                      'net::stubbles::websites::processors::stubProcessorResolverXJConfFactory' 
    …… 
    2221class stubDefaultWebsiteInitializer extends stubBaseObject implements stubWebsiteInitializer 
    2322{ 
    24     /** 
    25      * switch whether logging is enabled or not 
    26      * 
    27      * @var  bool 
    28      */ 
    29     protected $loggingEnabled; 
    3023    /** 
    3124     * default mode to be used 
    …… 
    4134     * @param  stubMode  $defaultMode     optional  default mode to be used 
    4235     */ 
    43     public function __construct($loggingEnabled = true, stubMode $defaultMode = null) 
     36    public function __construct(stubMode $defaultMode = null) 
    4437    { 
    45         $this->loggingEnabled = $loggingEnabled; 
    46         $this->defaultMode    = $defaultMode; 
     38        $this->defaultMode = $defaultMode; 
    4739    } 
    4840 
    …… 
    10193        return new stubProcessorResolverXJConfFactory(); 
    10294    } 
    103  
    104     /** 
    105      * checks whether logging is enabled or not 
    106      * 
    107      * @return  bool 
    108      */ 
    109     public function isLoggingEnabled() 
    110     { 
    111         return $this->loggingEnabled; 
    112     } 
    113  
    114     /** 
    115      * returns the logger factory to be used 
    116      * 
    117      * @return  stubLoggerInitializer 
    118      */ 
    119     public function getLoggerInitializer() 
    120     { 
    121         if (true === $this->loggingEnabled) { 
    122             return new stubLoggerXJConfFactory(); 
    123         } 
    124          
    125         return null; 
    126     } 
    12795} 
    12896?> 

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

    r1402 r1406  
    6262        $websiteInitializer->init(); 
    6363        $websiteInitializer->getRegistryInitializer()->init(); 
    64         if ($websiteInitializer->isLoggingEnabled() === true) { 
    65             $websiteInitializer->getLoggerInitializer()->init(); 
    66         } 
    67          
    6864        $this->websiteInitializer = $websiteInitializer; 
    6965        $this->createInstances(); 

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

    r1402 r1406  
    1010                      'net::stubbles::ipo::interceptors::stubInterceptorInitializer', 
    1111                      'net::stubbles::util::stubRegistryInitializer', 
    12                       'net::stubbles::util::log::stubLoggerInitializer', 
    1312                      'net::stubbles::websites::processors::stubProcessorResolverFactory' 
    1413); 
    …… 
    4140     */ 
    4241    public function getProcessorResolverFactory(); 
    43  
    44     /** 
    45      * checks whether logging is enabled or not 
    46      * 
    47      * @return  bool 
    48      */ 
    49     public function isLoggingEnabled(); 
    50  
    51     /** 
    52      * returns the logger factory to be used 
    53      * 
    54      * @return  stubLoggerInitializer 
    55      */ 
    56     public function getLoggerInitializer(); 
    5742} 
    5843?> 

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

    r1402 r1406  
    3737    public function initShouldSetCurrentModeToGivenDefaultMode() 
    3838    { 
    39         $websiteInitializer = new stubDefaultWebsiteInitializer(false, stubMode::$DEV); 
     39        $websiteInitializer = new stubDefaultWebsiteInitializer(stubMode::$DEV); 
    4040        $websiteInitializer->init(); 
    4141        $this->assertSame(stubMode::$DEV, stubMode::$CURRENT); 
    …… 
    6262     * @test 
    6363     */ 
    64     public function loggingEnabled() 
     64    /*public function loggingEnabled() 
    6565    { 
    6666        $websiteInitializer = new stubDefaultWebsiteInitializer(); 
    6767        $this->assertTrue($websiteInitializer->isLoggingEnabled()); 
    6868        $this->assertType('stubLoggerInitializer', $websiteInitializer->getLoggerInitializer()); 
    69     } 
     69    }*/ 
    7070 
    7171    /** 
    …… 
    7474     * @test 
    7575     */ 
    76     public function loggingDisabled() 
     76    /*public function loggingDisabled() 
    7777    { 
    7878        $websiteInitializer = new stubDefaultWebsiteInitializer(false); 
    7979        $this->assertFalse($websiteInitializer->isLoggingEnabled()); 
    8080        $this->assertNull($websiteInitializer->getLoggerInitializer()); 
    81     } 
     81    }*/ 
    8282} 
    8383?> 

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

    r1402 r1406  
    130130        stubRegistry::setConfig(stubSession::CLASS_REGISTRY_KEY, get_class($this->getMock('stubSession'))); 
    131131        $mockWebsiteInitializer->expects($this->once())->method('getRegistryInitializer')->will($this->returnValue($this->getMock('stubRegistryInitializer'))); 
    132         $mockWebsiteInitializer->expects($this->once())->method('isLoggingEnabled')->will($this->returnValue(true)); 
    133         $mockWebsiteInitializer->expects($this->once())->method('getLoggerInitializer')->will($this->returnValue($this->getMock('stubLoggerInitializer'))); 
    134132        $this->frontController = new TeststubFrontController($mockWebsiteInitializer); 
    135133