Changeset 1232
- Timestamp:
- 01/13/08 12:31:45 (7 months ago)
- Files:
-
- trunk/examples/pages/conf/index.xml (modified) (1 diff)
- trunk/examples/pages/conf/shop.xml (modified) (1 diff)
- trunk/pages/conf/form.xml (modified) (1 diff)
- trunk/pages/conf/index.xml (modified) (1 diff)
- trunk/src/main/php/net/stubbles/ioc/stubIOCPreInterceptor.php (modified) (1 diff)
- trunk/src/main/php/net/stubbles/ipo/request/broker/annotations/stubAbstractFilterAnnotation.php (modified) (1 diff)
- trunk/src/main/php/net/stubbles/ipo/request/broker/stubRequestBroker.php (modified) (1 diff)
- trunk/src/main/php/net/stubbles/ipo/request/filters/stubNumberFilter.php (modified) (1 diff)
- trunk/src/main/php/net/stubbles/ipo/session/stubSession.php (modified) (1 diff)
- trunk/src/main/php/net/stubbles/rdbms/persistence/serializer/stubDatabaseSerializer.php (modified) (1 diff)
- trunk/src/main/php/net/stubbles/rdbms/persistence/stubSetterMethodHelper.php (modified) (1 diff)
- trunk/src/main/php/net/stubbles/reflection/annotations/parser/stubAnnotationStateParser.php (modified) (1 diff)
- trunk/src/main/php/net/stubbles/util/datespan/stubDateSpanCustom.php (modified) (1 diff)
- trunk/src/main/php/net/stubbles/util/net/http/stubHTTPURL.php (modified) (1 diff)
- trunk/src/main/php/net/stubbles/websites/stubPageXJConfFactory.php (modified) (2 diffs)
- trunk/src/main/php/net/stubbles/xml/stubXMLXIncludeStreamWrapper.php (modified) (1 diff)
- trunk/src/main/php/org/stubbles/test/TestLogData.php (modified) (1 diff)
- trunk/src/test/php/net/stubbles/ioc/annotations/stubNamedAnnotationTestCase.php (modified) (1 diff)
- trunk/src/test/php/net/stubbles/ioc/stubBinderTestCase.php (modified) (1 diff)
- trunk/src/test/php/net/stubbles/ioc/stubInjectorImplementedByTestCase.php (modified) (1 diff)
- trunk/src/test/php/net/stubbles/ipo/request/stubAbstractRequestTestCase.php (modified) (1 diff)
- trunk/src/test/php/net/stubbles/rdbms/pdo/stubDatabasePDOConnectionTestCase.php (modified) (1 diff)
- trunk/src/test/php/net/stubbles/rdbms/persistence/stubSetterMethodHelperTestCase.php (modified) (1 diff)
- trunk/src/test/php/net/stubbles/service/jsonrpc/util/stubJsonRpcProxyGeneratorTestCase.php (modified) (1 diff)
- trunk/src/test/php/net/stubbles/stubClassLoaderTestCase.php (modified) (1 diff)
- trunk/src/test/php/net/stubbles/websites/processors/stubAbstractProcessorResolverTestCase.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/examples/pages/conf/index.xml
r1156 r1232 9 9 </properties> 10 10 <resources> 11 <resource name="counter">org .stubbles.examples.resources.MyResource</resource>11 <resource name="counter">org::stubbles::examples::resources::MyResource</resource> 12 12 </resources> 13 <xmlElement type="org .stubbles.examples.pageelements.TestXMLPageElement" name="Test" />13 <xmlElement type="org::stubbles::examples::pageelements::TestXMLPageElement" name="Test" /> 14 14 15 15 <xmlElementCachingDecorator lifetime="60"> 16 <xmlElement type="org .stubbles.examples.pageelements.CurrentTimeXMLPageElement" name="cached" />16 <xmlElement type="org::stubbles::examples::pageelements::CurrentTimeXMLPageElement" name="cached" /> 17 17 </xmlElementCachingDecorator> 18 <xmlElement type="org .stubbles.examples.pageelements.CurrentTimeXMLPageElement" name="uncached" />19 <xmlElement type="org .stubbles.examples.pageelements.TestElementWithInjectedResource" name="counter" />18 <xmlElement type="org::stubbles::examples::pageelements::CurrentTimeXMLPageElement" name="uncached" /> 19 <xmlElement type="org::stubbles::examples::pageelements::TestElementWithInjectedResource" name="counter" /> 20 20 21 21 <xmlPassThru fileName="test.xml" name="passThru"> trunk/examples/pages/conf/shop.xml
r1156 r1232 9 9 </properties> 10 10 11 <xmlElement type="org .stubbles.examples.pageelements.TestShopPageElement" name="shopData"/>11 <xmlElement type="org::stubbles::examples::pageelements::TestShopPageElement" name="shopData"/> 12 12 </page> 13 13 </xj:configuration> trunk/pages/conf/form.xml
r1156 r1232 7 7 <property name="skin">default</property> 8 8 </properties> 9 <element type="org .stubbles.examples.pageelements.TestXMLPageElement" name="Test" />9 <element type="org::stubbles::examples::pageelements::TestXMLPageElement" name="Test" /> 10 10 </page> 11 11 </xj:configuration> trunk/pages/conf/index.xml
r1156 r1232 7 7 <property name="skin">default</property> 8 8 </properties> 9 <xmlElement type="org .stubbles.examples.pageelements.TestXMLPageElement" name="Test" />9 <xmlElement type="org::stubbles::examples::pageelements::TestXMLPageElement" name="Test" /> 10 10 11 11 <xmlElementCachingDecorator lifetime="60"> 12 <xmlElement type="org .stubbles.examples.pageelements.CurrentTimeXMLPageElement" name="cached" />12 <xmlElement type="org::stubbles::examples::pageelements::CurrentTimeXMLPageElement" name="cached" /> 13 13 </xmlElementCachingDecorator> 14 <xmlElement type="org .stubbles.examples.pageelements.CurrentTimeXMLPageElement" name="uncached" />14 <xmlElement type="org::stubbles::examples::pageelements::CurrentTimeXMLPageElement" name="uncached" /> 15 15 </page> 16 16 </xj:configuration> trunk/src/main/php/net/stubbles/ioc/stubIOCPreInterceptor.php
r1222 r1232 8 8 * @subpackage ioc 9 9 */ 10 stubClassLoader::load('net::stubbles::ipo::interceptors .stubPreInterceptor',10 stubClassLoader::load('net::stubbles::ipo::interceptors::stubPreInterceptor', 11 11 'net::stubbles::ioc::stubBinder', 12 12 'net::stubbles::util::stubRegistry' trunk/src/main/php/net/stubbles/ipo/request/broker/annotations/stubAbstractFilterAnnotation.php
r1223 r1232 9 9 stubClassLoader::load('net::stubbles::reflection::annotations::stubAnnotation', 10 10 'net::stubbles::reflection::annotations::stubAbstractAnnotation', 11 'net::stubbles::ipo::request::broker:: .stubRequestBrokerException',11 'net::stubbles::ipo::request::broker::stubRequestBrokerException', 12 12 'net::stubbles::ipo::request::broker::annotations::stubFilterAnnotation' 13 13 ); trunk/src/main/php/net/stubbles/ipo/request/broker/stubRequestBroker.php
r1223 r1232 15 15 'net::stubbles::ipo::request::broker::annotations::stubPasswordFilterAnnotation', 16 16 'net::stubbles::ipo::request::broker::annotations::stubStringFilterAnnotation', 17 'net::stubbles::ipo::request::broker::annotations:: .stubTextFilterAnnotation',17 'net::stubbles::ipo::request::broker::annotations::stubTextFilterAnnotation', 18 18 'net::stubbles::lang::exceptions::stubIllegalArgumentException', 19 19 'net::stubbles::reflection::stubReflectionClass' trunk/src/main/php/net/stubbles/ipo/request/filters/stubNumberFilter.php
r1223 r1232 7 7 * @subpackage ipo_request_filters 8 8 */ 9 stubClassLoader::load('net::stubbles::ipo::request::filters .stubAbstractFilter',9 stubClassLoader::load('net::stubbles::ipo::request::filters::stubAbstractFilter', 10 10 'net::stubbles::ipo::request::stubRequestValueErrorFactory', 11 11 'net::stubbles::util::validators::stubValidator' trunk/src/main/php/net/stubbles/ipo/session/stubSession.php
r1223 r1232 7 7 * @subpackage ipo_session 8 8 */ 9 stubClassLoader::load('net::stubbles::ipo .session::stubSessionException');9 stubClassLoader::load('net::stubbles::ipo::session::stubSessionException'); 10 10 /** 11 11 * interface for sessions trunk/src/main/php/net/stubbles/rdbms/persistence/serializer/stubDatabaseSerializer.php
r1225 r1232 11 11 'net::stubbles::rdbms::persistence::stubPersistenceHelper', 12 12 'net::stubbles::rdbms::persistence::stubSetterMethodHelper', 13 'net::stubbles::rdbms::persistence::serializer .stubDatabaseSerializerException',13 'net::stubbles::rdbms::persistence::serializer::stubDatabaseSerializerException', 14 14 'net::stubbles::rdbms::querybuilder::stubDatabaseQueryBuilderFactory', 15 15 'net::stubbles::rdbms::querybuilder::stubDatabaseTableRow' trunk/src/main/php/net/stubbles/rdbms/persistence/stubSetterMethodHelper.php
r1225 r1232 9 9 stubClassLoader::load('net::stubbles::rdbms::querybuilder::stubDatabaseTableColumn', 10 10 'net::stubbles::rdbms::persistence::stubPersistenceException', 11 'net::stubbles::reflection .reflection'11 'net::stubbles::reflection::reflection' 12 12 ); 13 13 /** trunk/src/main/php/net/stubbles/reflection/annotations/parser/stubAnnotationStateParser.php
r1228 r1232 9 9 */ 10 10 stubClassLoader::load('net::stubbles::reflection::annotations::parser::stubAnnotationParser', 11 'net::stubbles::reflection::annotations::parser::state .stubAnnotationArgumentState',12 'net::stubbles::reflection::annotations::parser::state .stubAnnotationDocblockState',13 'net::stubbles::reflection::annotations::parser::state .stubAnnotationAnnotationState',14 'net::stubbles::reflection::annotations::parser::state .stubAnnotationNameState',15 'net::stubbles::reflection::annotations::parser::state .stubAnnotationParamNameState',16 'net::stubbles::reflection::annotations::parser::state .stubAnnotationParamsState',17 'net::stubbles::reflection::annotations::parser::state .stubAnnotationParamValueState',18 'net::stubbles::reflection::annotations::parser::state .stubAnnotationTextState',19 'net::stubbles::reflection::annotations::parser::state .stubAnnotationTypeState'11 'net::stubbles::reflection::annotations::parser::state::stubAnnotationArgumentState', 12 'net::stubbles::reflection::annotations::parser::state::stubAnnotationDocblockState', 13 'net::stubbles::reflection::annotations::parser::state::stubAnnotationAnnotationState', 14 'net::stubbles::reflection::annotations::parser::state::stubAnnotationNameState', 15 'net::stubbles::reflection::annotations::parser::state::stubAnnotationParamNameState', 16 'net::stubbles::reflection::annotations::parser::state::stubAnnotationParamsState', 17 'net::stubbles::reflection::annotations::parser::state::stubAnnotationParamValueState', 18 'net::stubbles::reflection::annotations::parser::state::stubAnnotationTextState', 19 'net::stubbles::reflection::annotations::parser::state::stubAnnotationTypeState' 20 20 ); 21 21 /** trunk/src/main/php/net/stubbles/util/datespan/stubDateSpanCustom.php
r1230 r1232 9 9 */ 10 10 stubClassLoader::load('net::stubbles::util::datespan::stubDateSpan', 11 'net::stubbles::reflection .reflection'11 'net::stubbles::reflection::reflection' 12 12 ); 13 13 /** trunk/src/main/php/net/stubbles/util/net/http/stubHTTPURL.php
r1230 r1232 164 164 public function getConnection() 165 165 { 166 stubClassLoader::load('net::stubbles::util .net.http.stubHTTPConnection');166 stubClassLoader::load('net::stubbles::util::net::http::stubHTTPConnection'); 167 167 $httpconnection = new stubHTTPConnection($this); 168 168 return $httpconnection; trunk/src/main/php/net/stubbles/websites/stubPageXJConfFactory.php
r1231 r1232 96 96 97 97 if (file_exists(dirname($cacheSource)) == false) { 98 mkdir(dirname($cacheSource), stubRegistry::getConfig('net ::stubbles::filemode', 0700), true);98 mkdir(dirname($cacheSource), stubRegistry::getConfig('net.stubbles.filemode', 0700), true); 99 99 } 100 100 … … 113 113 { 114 114 if (null == self::$xjconf) { 115 stubClassLoader::load('net::stubbles::util .stubFactory',116 'net::stubbles::util .xjconf.xjconfReal'115 stubClassLoader::load('net::stubbles::util::stubFactory', 116 'net::stubbles::util::xjconf::xjconfReal' 117 117 ); 118 118 self::$xjconf = new stubXJConfFacade(new XJConfFacade(array('__default' => stubXJConfLoader::getInstance()))); trunk/src/main/php/net/stubbles/xml/stubXMLXIncludeStreamWrapper.php
r1229 r1232 9 9 stubClassLoader::load('net::stubbles::lang::exceptions::stubIOException', 10 10 'net::stubbles::util::stubRegistry', 11 'net::stubbles::xml .stubXMLException',12 'net::stubbles::xml .xsl.stubXSLProcessor'11 'net::stubbles::xml::stubXMLException', 12 'net::stubbles::xml::xsl::stubXSLProcessor' 13 13 ); 14 14 /** trunk/src/main/php/org/stubbles/test/TestLogData.php
r1221 r1232 7 7 * @subpackage util_log_test 8 8 */ 9 stubClassLoader::load('net .stubbles.util.log.stubBaseLogData');9 stubClassLoader::load('net::stubbles::util::log::stubBaseLogData'); 10 10 /** 11 11 * Class to test net::stubbles::util::log::stubLogDataFactory. trunk/src/test/php/net/stubbles/ioc/annotations/stubNamedAnnotationTestCase.php
r1222 r1232 7 7 * @subpackage ioc_injection_test 8 8 */ 9 stubClassLoader::load('net::stubbles::ioc .::annotations::stubNamedAnnotation');9 stubClassLoader::load('net::stubbles::ioc::annotations::stubNamedAnnotation'); 10 10 11 11 /** trunk/src/test/php/net/stubbles/ioc/stubBinderTestCase.php
r1222 r1232 1 1 <?php 2 2 /** 3 * Test for net .::stubbles::ioc::stubBinder3 * Test for net::stubbles::ioc::stubBinder 4 4 * 5 5 * @author Stephan Schmidt <schst@stubbles.net> trunk/src/test/php/net/stubbles/ioc/stubInjectorImplementedByTestCase.php
r1222 r1232 31 31 32 32 /** 33 * Test for net .::stubbles::ioc::stubInjector with the ImplementedBy annotation.33 * Test for net::stubbles::ioc::stubInjector with the ImplementedBy annotation. 34 34 * 35 35 * @package stubbles trunk/src/test/php/net/stubbles/ipo/request/stubAbstractRequestTestCase.php
r1223 r1232 8 8 */ 9 9 stubClassLoader::load('net::stubbles::ipo::request::stubAbstractRequest', 10 'net::stubbles::ipo::request::filters .::stubAbstractFilter'10 'net::stubbles::ipo::request::filters::stubAbstractFilter' 11 11 ); 12 12 Mock::generate('stubValidator'); trunk/src/test/php/net/stubbles/rdbms/pdo/stubDatabasePDOConnectionTestCase.php
r1225 r1232 27 27 } 28 28 /** 29 * Test for net::stubbles::rdbms::pdo:: .stubDatabasePDOConnection.29 * Test for net::stubbles::rdbms::pdo::stubDatabasePDOConnection. 30 30 * 31 31 * @package stubbles trunk/src/test/php/net/stubbles/rdbms/persistence/stubSetterMethodHelperTestCase.php
r1225 r1232 8 8 */ 9 9 stubClassLoader::load('net::stubbles::rdbms::persistence::stubSetterMethodHelper', 10 'net::stubbles::rdbms::persistence::annotations .stubDBColumnAnnotation'10 'net::stubbles::rdbms::persistence::annotations::stubDBColumnAnnotation' 11 11 ); 12 12 require_once dirname(__FILE__) . '/../persistence/MockSinglePrimaryKeyEntity.php'; trunk/src/test/php/net/stubbles/service/jsonrpc/util/stubJsonRpcProxyGeneratorTestCase.php
r1226 r1232 23 23 { 24 24 $generator = new stubJsonRpcProxyGenerator(); 25 $code = $generator->generateJavascriptProxy('org .stubbles.examples.service.MathService', 'MathService', 'my.js.ns');25 $code = $generator->generateJavascriptProxy('org::stubbles::examples::service::MathService', 'MathService', 'my.js.ns'); 26 26 $expected = "my.js.ns.MathService = function(clientObj) { 27 27 this.dispatcher = new stubbles.json.rpc.Client(clientObj); trunk/src/test/php/net/stubbles/stubClassLoaderTestCase.php
r1209 r1232 38 38 $this->assertEqual(stubClassLoader::getFullQualifiedClassName('WithStatic'), 'org::stubbles::test::WithStatic'); 39 39 $this->assertEqual(stubClassLoader::getNonQualifiedClassName('org::stubbles::test::WithStatic'), 'WithStatic'); 40 stubClassLoader::load('org::stubbles: .test:.WithStatic');40 stubClassLoader::load('org::stubbles:test::WithStatic'); 41 41 $this->assertEqual(WithStatic::getCalled(), 1); 42 42 } trunk/src/test/php/net/stubbles/websites/processors/stubAbstractProcessorResolverTestCase.php
r1231 r1232 93 93 public function testFalseProcessor() 94 94 { 95 $this->abstractProcessorResolver->setReturnValue('doResolve', 'org .stubbles.test.BazProcessor');95 $this->abstractProcessorResolver->setReturnValue('doResolve', 'org::stubbles::test::BazProcessor'); 96 96 $this->expectException('stubProcessorException'); 97 97 $this->abstractProcessorResolver->resolve($this->mockRequest, $this->mockSession, $this->mockResponse); … … 103 103 public function testCorrectProcessor() 104 104 { 105 $this->abstractProcessorResolver->setReturnValue('doResolve', 'org .stubbles.test.FooProcessor');105 $this->abstractProcessorResolver->setReturnValue('doResolve', 'org::stubbles::test::FooProcessor'); 106 106 $processor = $this->abstractProcessorResolver->resolve($this->mockRequest, $this->mockSession, $this->mockResponse); 107 107 $this->assertIsA($processor, 'FooProcessor'); … … 130 130 public function testSerialize() 131 131 { 132 $this->mockPageFactory->setReturnValue('getClassName', 'mock .AnotherMockstubPageFactory');132 $this->mockPageFactory->setReturnValue('getClassName', 'mock::AnotherMockstubPageFactory'); 133 133 $serialized = serialize($this->abstractProcessorResolver); 134 134 $unserialized = unserialize($serialized);
