Changeset 806

Show
Ignore:
Timestamp:
08/13/07 18:14:48 (1 year ago)
Author:
mikey
Message:

added net.stubbles.util.xjconf.stubXJConfAbstractInitializer
added net.stubbles.util.xjconf.stubXJConfInitializer::getAdditionalDefinitions() that allows to add additional definitions to the proxy

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r777 r806  
    1717 * @subpackage  ipo_interceptors 
    1818 */ 
    19 class stubInterceptorXJConfInitializer extends stubBaseObject implements stubInterceptorInitializer, stubXJConfInitializer 
     19class stubInterceptorXJConfInitializer extends stubXJConfAbstractInitializer implements stubInterceptorInitializer 
    2020{ 
    2121    /** 
    …… 
    136136 
    137137    /** 
    138      * returns a list of extensions for the parser 
    139      * 
    140      * @return  array<Extension> 
    141      */ 
    142     public function getExtensions() 
    143     { 
    144         return array(); 
    145     } 
    146  
    147     /** 
    148138     * will be called in case the stubXJConfProxy did not find the data in the 
    149139     * cache and the initializer has to load values from the facade 

  • trunk/src/main/php/net/stubbles/ipo/request/stubRequestValueErrorXJConfFactory.php

    r737 r806  
    1818 * @uses        http://php.xjconf.net/ 
    1919 */ 
    20 class stubRequestValueErrorXJConfFactory extends stubBaseObject implements stubRequestValueErrorFactory, stubXJConfInitializer 
     20class stubRequestValueErrorXJConfFactory extends stubXJConfAbstractInitializer implements stubRequestValueErrorFactory 
    2121{ 
    2222    /** 
    …… 
    7979 
    8080    /** 
    81      * returns a list of extensions for the parser 
    82      * 
    83      * @return  array<Extension> 
    84      */ 
    85     public function getExtensions() 
    86     { 
    87         return array(); 
    88     } 
    89  
    90     /** 
    9181     * will be called in case the stubXJConfProxy did not found the data in the 
    9282     * cache and the initializer has to load values from the facade 

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

    r737 r806  
    1717 * @subpackage  rdbms 
    1818 */ 
    19 class stubDatabaseInitializer extends stubBaseObject implements stubPreInterceptor, stubXJConfInitializer 
     19class stubDatabaseInitializer extends stubXJConfAbstractInitializer implements stubPreInterceptor 
    2020{ 
    2121    /** 
    …… 
    5858 
    5959    /** 
    60      * returns a list of extensions for the parser 
    61      * 
    62      * @return  array<Extension> 
    63      */ 
    64     public function getExtensions() 
    65     { 
    66         return array(); 
    67     } 
    68  
    69     /** 
    7060     * will be called in case the stubXJConfProxy did not found the data in the 
    7161     * cache and the initializer has to load values from the facade 

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

    r742 r806  
    1717 * @subpackage  util_cache 
    1818 */ 
    19 class stubCacheXJConfInitializer extends stubBaseObject implements stubCacheInitializer, stubXJConfInitializer 
     19class stubCacheXJConfInitializer extends stubXJConfAbstractInitializer implements stubCacheInitializer 
    2020{ 
    2121    /** 
    …… 
    5858 
    5959    /** 
    60      * returns a list of extensions for the parser 
    61      * 
    62      * @return  array<Extension> 
    63      */ 
    64     public function getExtensions() 
    65     { 
    66         return array(new stubConfigXJConfExtension()); 
    67     } 
    68  
    69     /** 
    7060     * will be called in case the stubXJConfProxy did not found the data in the 
    7161     * cache and the initializer has to load values from the facade 

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

    r737 r806  
    1818 * @uses        http://php.xjconf.net/ 
    1919 */ 
    20 class stubLoggerXJConfFactory extends stubBaseObject implements stubXJConfInitializer 
     20class stubLoggerXJConfFactory extends stubXJConfAbstractInitializer 
    2121{ 
    2222    /** 
    …… 
    7676 
    7777    /** 
    78      * returns a list of extensions for the parser 
    79      * 
    80      * @return  array<Extension> 
    81      */ 
    82     public function getExtensions() 
    83     { 
    84         return array(new stubConfigXJConfExtension()); 
    85     } 
    86  
    87     /** 
    8878     * will be called in case the stubXJConfProxy did not found the data in the 
    8979     * cache and the initializer has to load values from the facade 

  • trunk/src/main/php/net/stubbles/util/stubRegistryXJConfInitializer.php

    r737 r806  
    1717 * @subpackage  util 
    1818 */ 
    19 class stubRegistryXJConfInitializer extends stubBaseObject implements stubRegistryInitializer, stubXJConfInitializer 
     19class stubRegistryXJConfInitializer extends stubXJConfAbstractInitializer implements stubRegistryInitializer 
    2020{ 
    2121    /** 
    …… 
    8484 
    8585    /** 
    86      * returns a list of extensions for the parser 
    87      * 
    88      * @return  array<Extension> 
    89      */ 
    90     public function getExtensions() 
    91     { 
    92         return array(); 
    93     } 
    94  
    95     /** 
    9686     * will be called in case the stubXJConfProxy did not found the data in the 
    9787     * cache and the initializer has to load values from the facade 

  • trunk/src/main/php/net/stubbles/util/xjconf/stubXJConfInitializer.php

    r737 r806  
    5555 
    5656    /** 
     57     * returns definitions that are additionally required beyond the default definition 
     58     * 
     59     * @return  array<string> 
     60     */ 
     61    public function getAdditionalDefinitions(); 
     62 
     63    /** 
    5764     * returns a list of extensions for the parser 
    5865     * 

  • trunk/src/main/php/net/stubbles/util/xjconf/stubXJConfProxy.php

    r737 r806  
    8787        $xjconf = new stubXJConfFacade(new XJConfFacade(array('__default' => stubXJConfLoader::getInstance()))); 
    8888        $xjconf->addDefinitions(stubFactory::getResourceURIs('xjconf/' . $this->initializer->getDescriptor(stubXJConfInitializer::DESCRIPTOR_DEFINITION) . '.xml')); 
     89        foreach ($this->initializer->getAdditionalDefinitions() as $definition) { 
     90            $xjconf->addDefinitions(stubFactory::getResourceURIs($definition)); 
     91        } 
     92         
    8993        $xjconf->enableXIncludes(); 
    9094        foreach ($this->initializer->getExtensions() as $extension) { 

  • trunk/src/main/php/net/stubbles/util/xjconf/xjconf.php

    r580 r806  
    1010                      'net.stubbles.util.xjconf.stubXJConfFacade', 
    1111                      'net.stubbles.util.xjconf.stubXJConfInitializer', 
     12                      'net.stubbles.util.xjconf.stubXJConfAbstractInitializer', 
    1213                      'net.stubbles.util.xjconf.stubXJConfProxy' 
    1314); 

  • trunk/src/main/php/net/stubbles/websites/processors/stubProcessorResolverXJConfFactory.php

    r737 r806  
    1616 * @subpackage  websites_processors 
    1717 */ 
    18 class stubProcessorResolverXJConfFactory extends stubBaseObject implements stubProcessorResolverFactory, stubXJConfInitializer 
     18class stubProcessorResolverXJConfFactory extends stubXJConfAbstractInitializer implements stubProcessorResolverFactory 
    1919{ 
    2020    /** 
    …… 
    5555    { 
    5656        $this->resolver = $cacheData['resolver']->getUnserialized(); 
    57     } 
    58  
    59     /** 
    60      * returns a list of extensions for the parser 
    61      * 
    62      * @return  array<Extension> 
    63      */ 
    64     public function getExtensions() 
    65     { 
    66         return array(); 
    6757    } 
    6858 

  • trunk/src/main/php/net/stubbles/websites/variantmanager/stubVariantXJConfFactory.php

    r737 r806  
    7373 
    7474    /** 
     75     * returns definitions that are additionally required beyond the default definition 
     76     * 
     77     * @return  array<string> 
     78     */ 
     79    public function getAdditionalDefinitions() 
     80    { 
     81        return array(); 
     82    } 
     83 
     84    /** 
    7585     * returns a list of extensions for the parser 
    7686     * 

  • trunk/src/test/php/net/stubbles/util/xjconf/stubXJConfProxyTestCase.php

    r584 r806  
    6969        $this->xjConfInitializer = new MockstubXJConfInitializer(); 
    7070        $this->xjConfInitializer->setReturnValue('getDescriptor', 'config'); 
     71        $this->xjConfInitializer->setReturnValue('getAdditionalDefinitions', array()); 
    7172        $this->dir               = dirname(__FILE__); 
    7273        $this->configFile        = $this->dir . '/config.xml';