Changeset 1226

Show
Ignore:
Timestamp:
01/11/08 18:34:19 (4 months ago)
Author:
mikey
Message:

continued refactoring #119: replaced package dots in net::stubbles::service

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main/php/net/stubbles/service/annotations/stubWebMethodAnnotation.php

    r1127 r1226  
    77 * @subpackage  service_annotations 
    88 */ 
    9 stubClassLoader::load('net.stubbles.reflection.annotations.stubAnnotation', 
    10                       'net.stubbles.reflection.annotations.stubAbstractAnnotation' 
     9stubClassLoader::load('net::stubbles::reflection::annotations::stubAnnotation', 
     10                      'net::stubbles::reflection::annotations::stubAbstractAnnotation' 
    1111); 
    1212/** 

  • trunk/src/main/php/net/stubbles/service/jsonrpc/stubJsonRpcProcessor.php

    r1127 r1226  
    99 * @subpackage  service_jsonrpc 
    1010 */ 
    11 stubClassLoader::load('net.stubbles.ioc.stubBinder', 
    12                       'net.stubbles.lang.stubMode', 
    13                       'net.stubbles.reflection.reflection', 
    14                       'net.stubbles.service.annotations.stubWebMethodAnnotation', 
    15                       'net.stubbles.service.jsonrpc.stubJsonRpcResponse', 
    16                       'net.stubbles.util.validators.stubPassThruValidator', 
    17                       'net.stubbles.util.validators.stubRegexValidator', 
    18                       'net.stubbles.websites.processors.stubAbstractProcessor' 
     11stubClassLoader::load('net::stubbles::ioc::stubBinder', 
     12                      'net::stubbles::lang::stubMode', 
     13                      'net::stubbles::reflection::reflection', 
     14                      'net::stubbles::service::annotations::stubWebMethodAnnotation', 
     15                      'net::stubbles::service::jsonrpc::stubJsonRpcResponse', 
     16                      'net::stubbles::util::validators::stubPassThruValidator', 
     17                      'net::stubbles::util::validators::stubRegexValidator', 
     18                      'net::stubbles::websites::processors::stubAbstractProcessor' 
    1919); 
    2020/** 
    …… 
    108108        $configFile = stubConfig::getConfigPath() . '/xml/' . stubRegistry::getConfig(self::KEY_SERVICE_FILE, 'json-rpc-service.xml'); 
    109109        if (file_exists($configFile) === false || is_readable($configFile) === false) { 
    110             stubClassLoader::load('net.stubbles.lang.exceptions.stubFileNotFoundException'); 
     110            stubClassLoader::load('net::stubbles::lang::exceptions::stubFileNotFoundException'); 
    111111            throw new stubFileNotFoundException($configFile); 
    112112        } 
    …… 
    130130        } 
    131131 
    132         stubClassLoader::load('net.stubbles.util.xjconf.xjconf', 
    133                               'net.stubbles.util.xjconf.xjconfReal'); 
     132        stubClassLoader::load('net::stubbles::util::xjconf::xjconf', 
     133                              'net::stubbles::util::xjconf::xjconfReal'); 
    134134 
    135135        $xjconf = new stubXJConfFacade(new XJConfFacade(array('__default' => stubXJConfLoader::getInstance()))); 
    …… 
    151151    public function generateProxies($classes = null) 
    152152    { 
    153         stubClassLoader::load('net.stubbles.service.jsonrpc.util.stubJsonRpcProxyGenerator'); 
     153        stubClassLoader::load('net::stubbles::service::jsonrpc::util::stubJsonRpcProxyGenerator'); 
    154154        $tmp        = parse_url($this->request->getURI()); 
    155155        $serviceUrl = '//' . $tmp['path']; 
    …… 
    183183    public function generateSmd($class) 
    184184    { 
    185         stubClassLoader::load('net.stubbles.service.jsonrpc.util.stubSmdGenerator'); 
     185        stubClassLoader::load('net::stubbles::service::jsonrpc::util::stubSmdGenerator'); 
    186186        $tmp        = parse_url($this->request->getURI()); 
    187187        $serviceUrl = '//' . $tmp['path']; 
    …… 
    341341        $binder = stubRegistry::get(stubBinder::REGISTRY_KEY); 
    342342        if (($binder instanceof stubBinder) === false) { 
    343             throw new stubRuntimeException('No instance of net.stubbles.ioc.stubBinder in registry.'); 
     343            throw new stubRuntimeException('No instance of net::stubbles::ioc::stubBinder in registry.'); 
    344344        } 
    345345 

  • trunk/src/main/php/net/stubbles/service/jsonrpc/stubJsonRpcResponse.php

    r971 r1226  
    77 * @subpackage  service_jsonrpc 
    88 */ 
    9 stubClassLoader::load('net.stubbles.ipo.response.stubDecoratedResponse', 
    10                       'net.stubbles.php.string.stubRecursiveStringEncoder', 
    11                       'net.stubbles.php.string.stubUTF8Encoder' 
     9stubClassLoader::load('net::stubbles::ipo::response::stubDecoratedResponse', 
     10                      'net::stubbles::php::string::stubRecursiveStringEncoder', 
     11                      'net::stubbles::php::string::stubUTF8Encoder' 
    1212); 
    1313/** 

  • trunk/src/main/php/net/stubbles/service/jsonrpc/util/stubJsonRpcProxyGenerator.php

    r1165 r1226  
    88 * @subpackage  service_jsonrpc_util 
    99 */ 
    10 stubClassLoader::load('net.stubbles.service.annotations.stubWebMethodAnnotation', 
    11                       'net.stubbles.reflection.reflection' 
     10stubClassLoader::load('net::stubbles::service::annotations::stubWebMethodAnnotation', 
     11                      'net::stubbles::reflection::reflection' 
    1212); 
    1313/** 

  • trunk/src/main/php/net/stubbles/service/jsonrpc/util/stubSmdGenerator.php

    r955 r1226  
    88 * @subpackage  service_jsonrpc_util 
    99 */ 
    10 stubClassLoader::load('net.stubbles.service.annotations.stubWebMethodAnnotation', 
    11                       'net.stubbles.reflection.reflection' 
     10stubClassLoader::load('net::stubbles::service::annotations::stubWebMethodAnnotation', 
     11                      'net::stubbles::reflection::reflection' 
    1212); 
    1313/** 

  • trunk/src/main/php/net/stubbles/service/soap/native/stubNativeSoapClient.php

    r1127 r1226  
    77 * @subpackage  service_soap_native 
    88 */ 
    9 stubClassLoader::load('net.stubbles.lang.exceptions.stubIllegalArgumentException', 
    10                       'net.stubbles.lang.exceptions.stubRuntimeException', 
    11                       'net.stubbles.service.soap.stubAbstractSoapClient', 
    12                       'net.stubbles.service.soap.stubSoapFault' 
     9stubClassLoader::load('net::stubbles::lang::exceptions::stubIllegalArgumentException', 
     10                      'net::stubbles::lang::exceptions::stubRuntimeException', 
     11                      'net::stubbles::service::soap::stubAbstractSoapClient', 
     12                      'net::stubbles::service::soap::stubSoapFault' 
    1313); 
    1414/** 
    …… 
    3131    { 
    3232        if (extension_loaded('soap') === false) { 
    33             throw new stubRuntimeException('net.stubbles.service.soap.stubNativeSoapClient requires PHP extension soap.'); 
     33            throw new stubRuntimeException('net::stubbles::service::soap::stubNativeSoapClient requires PHP extension soap.'); 
    3434        } 
    3535         

  • trunk/src/main/php/net/stubbles/service/soap/stubAbstractSoapClient.php

    r991 r1226  
    77 * @subpackage  service_soap 
    88 */ 
    9 stubClassLoader::load('net.stubbles.service.soap.stubSoapClient'); 
     9stubClassLoader::load('net::stubbles::service::soap::stubSoapClient'); 
    1010/** 
    1111 * Basic implementation for SOAP clients. 

  • trunk/src/main/php/net/stubbles/service/soap/stubSoapClient.php

    r989 r1226  
    77 * @subpackage  service_soap 
    88 */ 
    9 stubClassLoader::load('net.stubbles.service.soap.stubSoapClientConfiguration', 
    10                       'net.stubbles.service.soap.stubSoapException', 
    11                       'net.stubbles.util.net.http.stubHTTPURL' 
     9stubClassLoader::load('net::stubbles::service::soap::stubSoapClientConfiguration', 
     10                      'net::stubbles::service::soap::stubSoapException', 
     11                      'net::stubbles::util::net::http::stubHTTPURL' 
    1212); 
    1313/** 

  • trunk/src/main/php/net/stubbles/service/soap/stubSoapClientConfiguration.php

    r1127 r1226  
    77 * @subpackage  service_soap 
    88 */ 
    9 stubClassLoader::load('net.stubbles.lang.exceptions.stubIllegalArgumentException'); 
     9stubClassLoader::load('net::stubbles::lang::exceptions::stubIllegalArgumentException'); 
    1010/** 
    1111 * Configuration container for SOAP clients. 
    …… 
    7777            $endPoint = stubHTTPURL::fromString($endPoint); 
    7878            if (null === $endPoint) { 
    79                 throw new stubIllegalArgumentException('Endpoint must be a string denoting an URL or an instance of net.stubbles.util.net.http.stubHTTPURL.'); 
     79                throw new stubIllegalArgumentException('Endpoint must be a string denoting an URL or an instance of net::stubbles::util::net::http::stubHTTPURL.'); 
    8080            } 
    8181        } elseif (($endPoint instanceof stubHTTPURL) === false) { 
    82             throw new stubIllegalArgumentException('Endpoint must be a string denoting an URL or an instance of net.stubbles.util.net.http.stubHTTPURL.'); 
     82            throw new stubIllegalArgumentException('Endpoint must be a string denoting an URL or an instance of net::stubbles::util::net::http::stubHTTPURL.'); 
    8383        } 
    8484         

  • trunk/src/main/php/net/stubbles/service/soap/stubSoapClientGenerator.php

    r990 r1226  
    77 * @subpackage  service_soap 
    88 */ 
    9 stubClassLoader::load('net.stubbles.reflection.stubReflectionClass', 
    10                       'net.stubbles.service.soap.stubSoapClient', 
    11                       'net.stubbles.service.soap.stubSoapClientConfiguration' 
     9stubClassLoader::load('net::stubbles::reflection::stubReflectionClass', 
     10                      'net::stubbles::service::soap::stubSoapClient', 
     11                      'net::stubbles::service::soap::stubSoapClientConfiguration' 
    1212); 
    1313/** 
    …… 
    5757    { 
    5858        if (extension_loaded('soap') === true) { 
    59             $this->drivers['net.stubbles.service.soap.native.stubNativeSoapClient'] = 'net.stubbles.service.soap.native.stubNativeSoapClient'; 
     59            $this->drivers['net::stubbles::service::soap::native::stubNativeSoapClient'] = 'net::stubbles::service::soap::native::stubNativeSoapClient'; 
    6060        } 
    6161    } 

  • trunk/src/main/php/net/stubbles/service/soap/stubSoapException.php

    r987 r1226  
    77 * @subpackage  service_soap 
    88 */ 
    9 stubClassLoader::load('net.stubbles.service.soap.stubSoapFault'); 
     9stubClassLoader::load('net::stubbles::service::soap::stubSoapFault'); 
    1010/** 
    1111 * Exception to be thrown on failed SOAP operations. 

  • trunk/src/test/php/net/stubbles/service/jsonrpc/stubJsonRpcProcessorTestCase.php

    r884 r1226  
    11<?php 
    22/** 
    3  * Test for net.stubbles.service.jsonrpc.stubJsonRpcProcessor 
     3 * Test for net::stubbles::service::jsonrpc::stubJsonRpcProcessor. 
    44 * 
    55 * @author          Richard Sternagel 
    …… 
    88 * @subpackage      service_jsonrpc_test 
    99 */ 
    10 stubClassLoader::load('net.stubbles.service.jsonrpc.stubJsonRpcProcessor'); 
     10stubClassLoader::load('net::stubbles::service::jsonrpc::stubJsonRpcProcessor'); 
    1111Mock::generate('stubPageFactory'); 
    1212Mock::generate('stubRequest'); 
    …… 
    6565} 
    6666/** 
    67  * Tests for net.stubbles.service.jsonrpc.stubJsonRpcProcessor 
     67 * Tests for net::stubbles::service::jsonrpc::stubJsonRpcProcessor. 
    6868 * 
    6969 * @package     stubbles 
    …… 
    121121                                 ) 
    122122        ); 
    123         stubRegistry::set('net.stubbles.ioc.stubBinder', new stubBinder()); 
     123        stubRegistry::set(stubBinder::REGISTRY_KEY, new stubBinder()); 
    124124    } 
    125125 
    …… 
    129129    public function tearDown() 
    130130    { 
    131         stubRegistry::remove('net.stubbles.ioc.stubBinder'); 
     131        stubRegistry::remove(stubBinder::REGISTRY_KEY); 
    132132    } 
    133133 
    …… 
    250250    public function testWithoutBinderInRegistry() 
    251251    { 
    252         stubRegistry::remove('net.stubbles.ioc.stubBinder'); 
     252        stubRegistry::remove(stubBinder::REGISTRY_KEY); 
    253253        $this->mockRequest->setReturnValue('getValidatedRawData', '{"method":"Test.add","params":["2","2"],"id":"1"}'); 
    254         $this->mockResponse->expect('write', array('{"id":"1","result":null,"error":"No instance of net.stubbles.ioc.stubBinder in registry."}')); 
     254        $this->mockResponse->expect('write', array('{"id":"1","result":null,"error":"No instance of net::stubbles::ioc::stubBinder in registry."}')); 
    255255        $this->proc->processPostRequest(); 
    256256    } 

  • trunk/src/test/php/net/stubbles/service/jsonrpc/stubJsonRpcResponseTestCase.php

    r793 r1226  
    11<?php 
    22/** 
    3  * Test for net.stubbles.service.jsonrpc.stubJsonRpcResponse. 
     3 * Test for net::stubbles::service::jsonrpc::stubJsonRpcResponse. 
    44 * 
    55 * @author          Richard Sternagel 
    …… 
    88 * @subpackage      service_jsonrpc_test 
    99 */ 
    10 stubClassLoader::load('net.stubbles.service.jsonrpc.stubJsonRpcResponse'); 
     10stubClassLoader::load('net::stubbles::service::jsonrpc::stubJsonRpcResponse'); 
    1111Mock::generate('stubResponse'); 
    1212/** 
    13  * Tests for net.stubbles.service.jsonrpc.stubJsonRpcResponse. 
     13 * Tests for net::stubbles::service::jsonrpc::stubJsonRpcResponse. 
    1414 * 
    1515 * @package     stubbles 

  • trunk/src/test/php/net/stubbles/service/jsonrpc/util/stubJsonRpcProxyGeneratorTestCase.php

    r1165 r1226  
    11<?php 
    22/** 
    3  * Tests for net.stubbles.service.jsonrpc.util.stubJsonRpcProxyGenerator 
     3 * Tests for net::stubbles::service::jsonrpc::util::stubJsonRpcProxyGenerator. 
    44 * 
    55 * @author      Stephan Schmidt <schst@stubbles.net> 
    …… 
    77 * @subpackage  util_test 
    88 */ 
    9 stubClassLoader::load('net.stubbles.service.jsonrpc.util.stubJsonRpcProxyGenerator'); 
     9stubClassLoader::load('net::stubbles::service::jsonrpc::util::stubJsonRpcProxyGenerator'); 
    1010/** 
    11  * Tests for net.stubbles.service.jsonrpc.util.stubJsonRpcProxyGenerator 
     11 * Tests for net::stubbles::service::jsonrpc::util::stubJsonRpcProxyGenerator. 
    1212 * 
    1313 * @author      Stephan Schmidt <schst@stubbles.net> 

  • trunk/src/test/php/net/stubbles/service/soap/native/stubNativeSoapClientTestCase.php

    r994 r1226  
    11<?php 
    22/** 
    3  * Test for net.stubbles.service.soap.native.stubNativeSoapClient. 
     3 * Test for net::stubbles::service::soap::native::stubNativeSoapClient. 
    44 * 
    55 * @author          Frank Kleine <mikey@stubbles.net> 
    …… 
    77 * @subpackage      service_soap_native_test 
    88 */ 
    9 stubClassLoader::load('net.stubbles.service.soap.native.stubNativeSoapClient'); 
     9stubClassLoader::load('net::stubbles::service::soap::native::stubNativeSoapClient'); 
    1010Mock::generatePartial('stubNativeSoapClient', 'PartialMockstubNativeSoapClient', array('createClient')); 
    1111if (extension_loaded('soap') === true) { 
    …… 
    1313} 
    1414/** 
    15  * Tests for net.stubbles.service.soap.native.stubNativeSoapClient. 
     15 * Tests for net::stubbles::service::soap::native::stubNativeSoapClient. 
    1616 * 
    1717 * @package     stubbles 
    …… 
    3232    public function skip() 
    3333    { 
    34         $this->skipUnless(extension_loaded('soap'), 'net.stubbles.service.soap.native.stubNativeSoapClient requires PHP-extension "soap".'); 
     34        $this->skipUnless(extension_loaded('soap'), 'net::stubbles::service::soap::native::stubNativeSoapClient requires PHP-extension "soap".'); 
    3535    } 
    3636     

  • trunk/src/test/php/net/stubbles/service/soap/stubSoapClientConfigurationTestCase.php

    r995 r1226  
    11<?php 
    22/** 
    3  * Test for net.stubbles.service.soap.stubSoapClientConfiguration. 
     3 * Test for net::stubbles::service::soap::stubSoapClientConfiguration. 
    44 * 
    55 * @author      Frank Kleine <mikey@stubbles.net> 
    …… 
    77 * @subpackage  service_soap_test 
    88 */ 
    9 stubClassLoader::load('net.stubbles.service.soap.stubSoapClientConfiguration'); 
     9stubClassLoader::load('net::stubbles::service::soap::stubSoapClientConfiguration'); 
    1010/** 
    11  * Tests for net.stubbles.service.soap.stubSoapClientConfiguration. 
     11 * Tests for net::stubbles::service::soap::stubSoapClientConfiguration. 
    1212 * 
    1313 * @package     stubbles 
    …… 
    1717{ 
    1818    /** 
    19      * test that only strings and instances of net.stubbles.util.net.http.stubHTTPURL 
     19     * test that only strings and instances of net::stubbles::util::net::http::stubHTTPURL 
    2020     * are accepted as value for $endPoint 
    2121     */ 
    …… 
    3232 
    3333    /** 
    34      * test that only strings and instances of net.stubbles.util.net.http.stubHTTPURL 
     34     * test that only strings and instances of net::stubbles::util::net::http::stubHTTPURL 
    3535     * are accepted as value for $endPoint 
    3636     */ 
    …… 
    4444 
    4545    /** 
    46      * test that only strings and instances of net.stubbles.util.net.http.stubHTTPURL 
     46     * test that only strings and instances of net::stubbles::util::net::http.stubHTTPURL 
    4747     * are accepted as value for $endPoint 
    4848     */