Changeset 447
- Timestamp:
- 03/29/07 23:40:36 (1 year ago)
- Files:
-
- trunk/config/xml/processors.xml (modified) (1 diff)
- trunk/docroot/variants.php (modified) (2 diffs)
- trunk/docroot/xml.php (modified) (2 diffs)
- trunk/src/main/php/net/stubbles/websites/stubPageXJConfFactory.php (moved) (moved from trunk/src/main/php/net/stubbles/websites/stubXJConfPageFactory.php) (1 diff)
- trunk/src/main/php/net/stubbles/websites/variantmanager/stubVariantXJConfFactory.php (moved) (moved from trunk/src/main/php/net/stubbles/websites/variantmanager/stubXJConfVariantFactory.php) (1 diff)
- trunk/src/main/php/net/stubbles/websites/variantmanager/stubVariantsPreInterceptor.php (modified) (1 diff)
- trunk/src/test/php/net/stubbles/integration/VariantManagerTestCase.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/config/xml/processors.xml
r427 r447 4 4 xmlns="http://stubbles.net/websites"> 5 5 <defaultResolver default="xml"> 6 <pageFactory type="net.stubbles.websites.stub XJConfPageFactory" />6 <pageFactory type="net.stubbles.websites.stubPageXJConfFactory" /> 7 7 <processor name="xml" type="net.stubbles.websites.xml.stubXMLProcessor" /> 8 8 <processor name="page" type="net.stubbles.websites.memphis.stubMemphisProcessor" /> trunk/docroot/variants.php
r328 r447 2 2 require '../config/php/config.php'; 3 3 require '../lib/stubbles.php'; 4 stubClassLoader::load('net.stubbles.websites.variantmanager.stubVariant Factory',4 stubClassLoader::load('net.stubbles.websites.variantmanager.stubVariantXJConfFactory', 5 5 'net.stubbles.ipo.request.stubWebRequest', 6 6 'net.stubbles.ipo.session.stubPHPSession' … … 8 8 class Bootstrap 9 9 { 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 } 18 18 } 19 19 Bootstrap::main(); trunk/docroot/xml.php
r374 r447 5 5 'net.stubbles.websites.xml.stubXMLPostInterceptor', 6 6 'net.stubbles.websites.xml.stubXMLPreInterceptor', 7 'net.stubbles.websites.stub XJConfPageFactory',7 'net.stubbles.websites.stubPageXJConfFactory', 8 8 'net.stubbles.ipo.request.stubWebRequest', 9 9 'net.stubbles.ipo.request.filters.stubAbstractFilter', … … 37 37 $request->getFilteredValue(new TestFilter(), 'foo_bar'); 38 38 $request->getFilteredValue(new TestFilter(), 'foo_bar'); 39 $pageFactory = new stub XJConfPageFactory(stubXJConfLoader::getInstance());39 $pageFactory = new stubPageXJConfFactory(stubXJConfLoader::getInstance()); 40 40 $processor = new stubXMLProcessor($request, $session, $response, $pageFactory); 41 41 $postInterceptor = new stubXMLPostInterceptor(); trunk/src/main/php/net/stubbles/websites/stubPageXJConfFactory.php
r443 r447 18 18 * @subpackage websites 19 19 */ 20 class stub XJConfPageFactory extends stubBaseObject implements stubPageFactory20 class stubPageXJConfFactory extends stubBaseObject implements stubPageFactory 21 21 { 22 22 /** trunk/src/main/php/net/stubbles/websites/variantmanager/stubVariantXJConfFactory.php
r443 r447 18 18 * @subpackage websites_variantmanager 19 19 */ 20 class stub XJConfVariantFactory extends stubAbstractVariantFactory20 class stubVariantXJConfFactory extends stubAbstractVariantFactory 21 21 { 22 22 /** trunk/src/main/php/net/stubbles/websites/variantmanager/stubVariantsPreInterceptor.php
r382 r447 105 105 } 106 106 107 $fqClassname = stubRegistry::getConfig('net.stubbles.websites.variantmanager.variantfactory.class', 'net.stubbles.websites.variantmanager.stub XJConfVariantFactory');107 $fqClassname = stubRegistry::getConfig('net.stubbles.websites.variantmanager.variantfactory.class', 'net.stubbles.websites.variantmanager.stubVariantXJConfFactory'); 108 108 $nqClassname = stubClassLoader::getNonQualifiedClassName($fqClassname); 109 109 if (class_exists($nqClassname, false) == false) { trunk/src/test/php/net/stubbles/integration/VariantManagerTestCase.php
r400 r447 1 1 <?php 2 2 /** 3 * Integration test for database.3 * Integration test for variant manager. 4 4 * 5 5 * @author Frank Kleine <mikey@stubbles.net> … … 7 7 * @subpackage test_integration 8 8 */ 9 stubClassLoader::load('net.stubbles.websites.variantmanager.stub XJConfVariantFactory');9 stubClassLoader::load('net.stubbles.websites.variantmanager.stubVariantXJConfFactory'); 10 10 /** 11 * Integration test for database.11 * Integration test for variant manager. 12 12 * 13 13 * @package stubbles … … 21 21 public function testXJConfVariantFactory() 22 22 { 23 $variantFactory = new stub XJConfVariantFactory();23 $variantFactory = new stubVariantXJConfFactory(); 24 24 $variantsMap = $variantFactory->getVariantsMap(); 25 25 $this->assertIsA($variantsMap, 'stubVariantsMap');
