Changeset 152
- Timestamp:
- 01/25/07 16:25:34 (2 years ago)
- Files:
-
- trunk/config/xml/config.xml (modified) (1 diff)
- trunk/docroot/index.php (modified) (1 diff)
- trunk/src/main/php/net/stubbles/helper (deleted)
- trunk/src/main/php/net/stubbles/ipo/request/filters/stubFloatFilter.php (modified) (1 diff)
- trunk/src/main/php/net/stubbles/util/Binford.php (copied) (copied from trunk/src/main/php/net/stubbles/helper/Binford.php) (3 diffs)
- trunk/src/main/php/net/stubbles/util/stubRegistry.php (copied) (copied from trunk/src/main/php/net/stubbles/helper/stubRegistry.php) (2 diffs)
- trunk/src/main/php/net/stubbles/util/stubRegistryFactory.php (copied) (copied from trunk/src/main/php/net/stubbles/helper/stubRegistryFactory.php) (3 diffs)
- trunk/src/main/resources/xjconf/registry.xml (modified) (1 diff)
- trunk/src/test/php/net/stubbles/helper (deleted)
- trunk/src/test/php/net/stubbles/util/BinfordTestCase.php (copied) (copied from trunk/src/test/php/net/stubbles/helper/BinfordTestCase.php) (1 diff)
- trunk/src/test/php/net/stubbles/util/UtilTestSuite.php (modified) (1 diff)
- trunk/src/test/php/net/stubbles/util/stubRegistryTestCase.php (copied) (copied from trunk/src/test/php/net/stubbles/helper/stubRegistryTestCase.php) (1 diff)
- trunk/src/test/run.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/config/xml/config.xml
r2 r152 2 2 <xj:configuration 3 3 xmlns:xj="http://xjconf.net/XJConf" 4 xmlns:registry="http://stubbles.net/ registry">4 xmlns:registry="http://stubbles.net/util/registry"> 5 5 <registry:config name="core.number.decimals" value="4" /> 6 6 <registry:config name="core.date.format.datetime" value="%a, %d. %b %Y, %H:%M:%S" /> trunk/docroot/index.php
r131 r152 4 4 require '../src/main/php/net/stubbles/stubClassLoader.php'; 5 5 stubClassLoader::load('net.stubbles.websites.PageFactory', 6 'net.stubbles. helper.stubRegistryFactory',7 'net.stubbles. helper.stubXJConfLoader'6 'net.stubbles.util.stubRegistryFactory', 7 'net.stubbles.util.xjconf.stubXJConfLoader' 8 8 ); 9 9 class Bootstrap trunk/src/main/php/net/stubbles/ipo/request/filters/stubFloatFilter.php
r151 r152 8 8 */ 9 9 stubClassLoader::load('net.stubbles.ipo.request.filters.stubNumberFilter', 10 'net.stubbles. helper.stubRegistry'10 'net.stubbles.util.stubRegistry' 11 11 ); 12 12 /** trunk/src/main/php/net/stubbles/util/Binford.php
r151 r152 5 5 * @author Frank Kleine <mikey@stubbles.net> 6 6 * @package stubbles 7 * @subpackage helper7 * @subpackage util 8 8 */ 9 9 stubClassLoader::load('net.stubbles.util.validators.stubValidator', … … 16 16 * 17 17 * @package stubbles 18 * @subpackage helper18 * @subpackage util 19 19 * @see http://binford.de/ 20 20 * @Inject(stubResponse) … … 157 157 * its values. 158 158 * <code> 159 * helper.Binford {159 * net.stubbles.util.Binford { 160 160 * POWER(integer): 6100 161 161 * } trunk/src/main/php/net/stubbles/util/stubRegistry.php
r64 r152 5 5 * @author Frank Kleine <frank@kl-s.com> 6 6 * @package stubbles 7 * @subpackage helper7 * @subpackage util 8 8 */ 9 9 /** … … 12 12 * @static 13 13 * @package stubbles 14 * @subpackage helper14 * @subpackage util 15 15 */ 16 16 class stubRegistry trunk/src/main/php/net/stubbles/util/stubRegistryFactory.php
r150 r152 5 5 * @author Frank Kleine <frank@kl-s.com> 6 6 * @package stubbles 7 * @subpackage helper7 * @subpackage util 8 8 */ 9 9 stubClassLoader::load('net.stubbles.util.xjconf.stubXJConfLoader'); … … 13 13 * @static 14 14 * @package stubbles 15 * @subpackage helper15 * @subpackage util 16 16 */ 17 17 class stubRegistryFactory … … 24 24 public static function init($configFile) 25 25 { 26 $tagParser = new DefinitionParser(array('http://stubbles.net/ registry' => stubXJConfLoader::getInstance()));26 $tagParser = new DefinitionParser(array('http://stubbles.net/util/registry' => stubXJConfLoader::getInstance())); 27 27 $defs = $tagParser->parse(stubFactory::getResourcePath() . '/xjconf/registry.xml'); 28 28 $xmlParser = new XmlParser(); trunk/src/main/resources/xjconf/registry.xml
r116 r152 1 1 <?xml version="1.0" encoding="iso-8859-1"?> 2 2 <defines> 3 <namespace uri="http://stubbles.net/ registry">4 <tag name="config" type="net.stubbles. helper.stubRegistry">3 <namespace uri="http://stubbles.net/util/registry"> 4 <tag name="config" type="net.stubbles.util.stubRegistry"> 5 5 <factoryMethod name="setConfig"> 6 6 <attribute name="name" type="string" /> trunk/src/test/php/net/stubbles/util/BinfordTestCase.php
r140 r152 5 5 * @author Frank Kleine <mikey@stubbles.net> 6 6 * @package stubbles 7 * @subpackage test7 * @subpackage util_test 8 8 */ 9 stubClassLoader::load('net.stubbles. helper.Binford');9 stubClassLoader::load('net.stubbles.util.Binford'); 10 10 /** 11 11 * Tests for helper.Binford 12 12 * 13 13 * @package stubbles 14 * @subpackage test14 * @subpackage util_test 15 15 */ 16 16 class BinfordTestCase extends UnitTestCase trunk/src/test/php/net/stubbles/util/UtilTestSuite.php
r151 r152 22 22 $this->TestSuite('All util tests'); 23 23 $dir = dirname(__FILE__); 24 $this->addTestFile($dir . '/BinfordTestCase.php'); 25 $this->addTestFile($dir . '/stubRegistryTestCase.php'); 26 27 // logging api 24 28 $this->addTestFile($dir . '/log/stubLoggerTestCase.php'); 25 29 $this->addTestFile($dir . '/log/stubFileLogAppenderTestCase.php'); trunk/src/test/php/net/stubbles/util/stubRegistryTestCase.php
r98 r152 5 5 * @author Frank Kleine <frank@kl-s.com> 6 6 * @package stubbles 7 * @subpackage test7 * @subpackage util_test 8 8 */ 9 stubClassLoader::load('net.stubbles. helper.stubRegistry');9 stubClassLoader::load('net.stubbles.util.stubRegistry'); 10 10 /** 11 11 * Tests for helper.stubRegistry 12 12 * 13 13 * @package stubbles 14 * @subpackage test14 * @subpackage util_test 15 15 */ 16 16 class stubRegistryTestCase extends UnitTestCase trunk/src/test/run.php
r146 r152 31 31 $testSuite->addTestFile(TEST_SRC_PATH . '/php/net/stubbles/ioc/IOCTestSuite.php'); 32 32 $testSuite->addTestFile(TEST_SRC_PATH . '/php/net/stubbles/ipo/IPOTestSuite.php'); 33 $testSuite->addTestFile(TEST_SRC_PATH . '/php/net/stubbles/helper/HelperTestSuite.php');34 33 $testSuite->addTestFile(TEST_SRC_PATH . '/php/net/stubbles/reflection/ReflectionTestSuite.php'); 35 34 $testSuite->addTestFile(TEST_SRC_PATH . '/php/net/stubbles/util/UtilTestSuite.php');
