Changeset 447

Show
Ignore:
Timestamp:
03/29/07 23:40:36 (1 year ago)
Author:
mikey
Message:

renamed xjconf related classes to fit into naming scheme

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/config/xml/processors.xml

    r427 r447  
    44    xmlns="http://stubbles.net/websites"> 
    55  <defaultResolver default="xml"> 
    6     <pageFactory type="net.stubbles.websites.stubXJConfPageFactory" /> 
     6    <pageFactory type="net.stubbles.websites.stubPageXJConfFactory" /> 
    77    <processor name="xml" type="net.stubbles.websites.xml.stubXMLProcessor" /> 
    88    <processor name="page" type="net.stubbles.websites.memphis.stubMemphisProcessor" /> 
  • trunk/docroot/variants.php

    r328 r447  
    22require '../config/php/config.php'; 
    33require '../lib/stubbles.php'; 
    4 stubClassLoader::load('net.stubbles.websites.variantmanager.stubVariantFactory', 
     4stubClassLoader::load('net.stubbles.websites.variantmanager.stubVariantXJConfFactory', 
    55                      'net.stubbles.ipo.request.stubWebRequest', 
    66                      'net.stubbles.ipo.session.stubPHPSession' 
     
    88class Bootstrap 
    99{ 
    10    public static function main() 
    11    
    12        echo '<pre>'; 
    13        $factory = new stubVariantFactory(stubConfig::getConfigPath() . '/xml/variantmanager.xml'); 
    14        $request = new stubWebRequest(); 
    15        $session = new stubPHPSession('web'); 
    16        var_dump($factory->getVariantsMap()->getVariant($session, $request)->getName()); 
    17    
     10    public static function main() 
     11   
     12        echo '<pre>'; 
     13        $factory = new stubVariantXJConfFactory(stubConfig::getConfigPath() . '/xml/variantmanager.xml'); 
     14        $request = new stubWebRequest(); 
     15        $session = new stubPHPSession($request, 'web'); 
     16        var_dump($factory->getVariantsMap()->getVariant($session, $request)->getName()); 
     17   
    1818} 
    1919Bootstrap::main(); 
  • trunk/docroot/xml.php

    r374 r447  
    55                      'net.stubbles.websites.xml.stubXMLPostInterceptor', 
    66                      'net.stubbles.websites.xml.stubXMLPreInterceptor', 
    7                       'net.stubbles.websites.stubXJConfPageFactory', 
     7                      'net.stubbles.websites.stubPageXJConfFactory', 
    88                      'net.stubbles.ipo.request.stubWebRequest', 
    99                      'net.stubbles.ipo.request.filters.stubAbstractFilter', 
     
    3737        $request->getFilteredValue(new TestFilter(), 'foo_bar'); 
    3838        $request->getFilteredValue(new TestFilter(), 'foo_bar'); 
    39         $pageFactory = new stubXJConfPageFactory(stubXJConfLoader::getInstance()); 
     39        $pageFactory = new stubPageXJConfFactory(stubXJConfLoader::getInstance()); 
    4040        $processor   = new stubXMLProcessor($request, $session, $response, $pageFactory); 
    4141        $postInterceptor = new stubXMLPostInterceptor(); 
  • trunk/src/main/php/net/stubbles/websites/stubPageXJConfFactory.php

    r443 r447  
    1818 * @subpackage  websites 
    1919 */ 
    20 class stubXJConfPageFactory extends stubBaseObject implements stubPageFactory 
     20class stubPageXJConfFactory extends stubBaseObject implements stubPageFactory 
    2121{ 
    2222    /** 
  • trunk/src/main/php/net/stubbles/websites/variantmanager/stubVariantXJConfFactory.php

    r443 r447  
    1818 * @subpackage  websites_variantmanager 
    1919 */ 
    20 class stubXJConfVariantFactory extends stubAbstractVariantFactory 
     20class stubVariantXJConfFactory extends stubAbstractVariantFactory 
    2121{ 
    2222    /** 
  • trunk/src/main/php/net/stubbles/websites/variantmanager/stubVariantsPreInterceptor.php

    r382 r447  
    105105        } 
    106106         
    107         $fqClassname = stubRegistry::getConfig('net.stubbles.websites.variantmanager.variantfactory.class', 'net.stubbles.websites.variantmanager.stubXJConfVariantFactory'); 
     107        $fqClassname = stubRegistry::getConfig('net.stubbles.websites.variantmanager.variantfactory.class', 'net.stubbles.websites.variantmanager.stubVariantXJConfFactory'); 
    108108        $nqClassname = stubClassLoader::getNonQualifiedClassName($fqClassname); 
    109109        if (class_exists($nqClassname, false) == false) { 
  • trunk/src/test/php/net/stubbles/integration/VariantManagerTestCase.php

    r400 r447  
    11<?php 
    22/** 
    3  * Integration test for database
     3 * Integration test for variant manager
    44 * 
    55 * @author      Frank Kleine <mikey@stubbles.net> 
     
    77 * @subpackage  test_integration 
    88 */ 
    9 stubClassLoader::load('net.stubbles.websites.variantmanager.stubXJConfVariantFactory'); 
     9stubClassLoader::load('net.stubbles.websites.variantmanager.stubVariantXJConfFactory'); 
    1010/** 
    11  * Integration test for database
     11 * Integration test for variant manager
    1212 * 
    1313 * @package     stubbles 
     
    2121    public function testXJConfVariantFactory() 
    2222    { 
    23         $variantFactory = new stubXJConfVariantFactory(); 
     23        $variantFactory = new stubVariantXJConfFactory(); 
    2424        $variantsMap    = $variantFactory->getVariantsMap(); 
    2525        $this->assertIsA($variantsMap, 'stubVariantsMap');