Changeset 129

Show
Ignore:
Timestamp:
11/17/07 18:01:44 (1 year ago)
Author:
mikey
Message:

renamed XJConfLoader to XJConf

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/XJConf/XJConf.php

    r116 r129  
    1616 * @package  XJConf 
    1717 */ 
    18 class XJConfLoader 
     18class XJConf 
    1919{ 
    2020    /** 
    …… 
    6565 * register with __autoload() 
    6666 */ 
    67 spl_autoload_register(array('net::xjconf::XJConfLoader', 'load')); 
     67spl_autoload_register(array('net::xjconf::XJConf', 'load')); 
    6868?> 

  • trunk/XJConf/definitions/handler/DefinitionHandlerFactory.php

    r117 r129  
    99namespace net::xjconf::definitions::handler; 
    1010use net::xjconf::DefinitionParser; 
    11 use net::xjconf::XJConfLoader; 
     11use net::xjconf::XJConf; 
    1212/** 
    1313 * Factory to create a definition handler of a given type. 
    …… 
    3232    { 
    3333        $className = ucfirst($type) . 'DefinitionHandler'; 
    34         if (XJConfLoader::providesClass('net::xjconf::definitions::handler::' . $className) == false) { 
     34        if (XJConf::providesClass('net::xjconf::definitions::handler::' . $className) == false) { 
    3535            $className = 'EmptyDefinitionHandler'; 
    3636        } 

  • trunk/examples/Example1.php

    r119 r129  
    66 * @author  Frank Kleine <frank.kleine@schlund.de> 
    77 */ 
    8 require_once '../XJConf/XJConfLoader.php'; 
     8require_once '../XJConf/XJConf.php'; 
    99use net::xjconf::DefinitionParser; 
    1010use net::xjconf::XmlParser; 

  • trunk/examples/Example2.php

    r119 r129  
    66 * @author  Frank Kleine <frank.kleine@schlund.de> 
    77 */ 
    8 require_once '../XJConf/XJConfLoader.php'; 
     8require_once '../XJConf/XJConf.php'; 
    99use net::xjconf::DefinitionParser; 
    1010use net::xjconf::XmlParser; 

  • trunk/examples/Example3.php

    r119 r129  
    66 * @author  Frank Kleine <frank.kleine@schlund.de> 
    77 */ 
    8 require_once '../XJConf/XJConfLoader.php'; 
     8require_once '../XJConf/XJConf.php'; 
    99use net::xjconf::DefinitionParser; 
    1010use net::xjconf::XmlParser; 

  • trunk/examples/ExampleClassLoader.php

    r119 r129  
    55 * @author  Frank Kleine <frank.kleine@schlund.de> 
    66 */ 
    7 require_once '../XJConf/XJConfLoader.php'; 
     7require_once '../XJConf/XJConf.php'; 
    88use net::xjconf::DefinitionParser; 
    99use net::xjconf::XmlParser; 

  • trunk/examples/ExampleCollection.php

    r119 r129  
    66 * @author  Frank Kleine <frank.kleine@schlund.de> 
    77 */ 
    8 require_once '../XJConf/XJConfLoader.php'; 
     8require_once '../XJConf/XJConf.php'; 
    99use net::xjconf::DefinitionParser; 
    1010use net::xjconf::XmlParser; 

  • trunk/examples/ExampleExtension.php

    r119 r129  
    66 * @author  Frank Kleine <frank.kleine@schlund.de> 
    77 */ 
    8 require_once '../XJConf/XJConfLoader.php'; 
     8require_once '../XJConf/XJConf.php'; 
    99use net::xjconf::DefinitionParser; 
    1010use net::xjconf::XmlParser; 

  • trunk/examples/ExampleMethods.php

    r119 r129  
    66 */ 
    77 
    8 require_once '../XJConf/XJConfLoader.php'; 
     8require_once '../XJConf/XJConf.php'; 
    99use net::xjconf::DefinitionParser; 
    1010use net::xjconf::XmlParser; 

  • trunk/examples/TestAttributesRequired.php

    r119 r129  
    66 * @author  Frank Kleine <frank.kleine@schlund.de> 
    77 */ 
    8 require_once '../XJConf/XJConfLoader.php'; 
     8require_once '../XJConf/XJConf.php'; 
    99use net::xjconf::DefinitionParser; 
    1010use net::xjconf::XmlParser; 
    …… 
    2424 
    2525        $conf      = new XmlParser(); 
    26                try { 
    27                $conf->setTagDefinitions($defs); 
     26        try { 
     27            $conf->setTagDefinitions($defs); 
    2828            $conf->parse(getcwd() . '/xml/test-attributes-required.xml'); 
    2929            $color = $conf->getConfigValue('red'); 

  • trunk/examples/TestCDataSetter.php

    r119 r129  
    66 * @author  Frank Kleine <frank.kleine@schlund.de> 
    77 */ 
    8 require_once '../XJConf/XJConfLoader.php'; 
     8require_once '../XJConf/XJConf.php'; 
    99use net::xjconf::DefinitionParser; 
    1010use net::xjconf::XmlParser; 

  • trunk/examples/TestConstructor.php

    r119 r129  
    66 * @author  Frank Kleine <frank.kleine@schlund.de> 
    77 */ 
    8 require_once '../XJConf/XJConfLoader.php'; 
     8require_once '../XJConf/XJConf.php'; 
    99use net::xjconf::DefinitionParser; 
    1010use net::xjconf::XmlParser; 

  • trunk/examples/TestDynamicSetters.php

    r119 r129  
    66 * @author  Stephan Schmidt <stephan.schmidt@schlund.de> 
    77 */ 
    8 require_once '../XJConf/XJConfLoader.php'; 
     8require_once '../XJConf/XJConf.php'; 
    99use net::xjconf::DefinitionParser; 
    1010use net::xjconf::XmlParser; 
    …… 
    2020class TestDynamicSetters 
    2121{ 
    22        public static function main() 
    23        { 
     22    public static function main() 
     23    { 
    2424        $tagParser = new DefinitionParser(); 
    2525        $defs      = $tagParser->parse(getcwd() . '/xml/defines-dynamic-setters.xml'); 
    …… 
    3838        $foo = $conf->getConfigValue('class'); 
    3939        var_dump($foo); 
    40        } 
     40    } 
    4141} 
    4242TestDynamicSetters::main(); 

  • trunk/examples/TestDynamicTypes.php

    r119 r129  
    66 * @author  Stephan Schmidt <stephan.schmidt@schlund.de> 
    77 */ 
    8 require_once '../XJConf/XJConfLoader.php'; 
     8require_once '../XJConf/XJConf.php'; 
    99use net::xjconf::DefinitionParser; 
    1010use net::xjconf::XmlParser; 
    …… 
    2222class TestDynamicTypes 
    2323{ 
    24        public static function main() 
    25        { 
     24    public static function main() 
     25    { 
    2626        $tagParser = new DefinitionParser(); 
    2727        $defs      = $tagParser->parse(getcwd() . '/xml/defines-dynamic-types.xml'); 
    …… 
    4040        $foo = $conf->getConfigValue('foo'); 
    4141        var_dump($foo); 
    42        } 
     42    } 
    4343} 
    4444TestDynamicTypes::main(); 

  • trunk/examples/TestEmptyConstructor.php

    r119 r129  
    11<?php 
    2 require_once '../XJConf/XJConfLoader.php'; 
     2require_once '../XJConf/XJConf.php'; 
    33use net::xjconf::DefinitionParser; 
    44use net::xjconf::XmlParser; 

  • trunk/examples/TestInterfaces.php

    r119 r129  
    66 * @author  Frank Kleine <frank.kleine@schlund.de> 
    77 */ 
    8 require_once '../XJConf/XJConfLoader.php'; 
     8require_once '../XJConf/XJConf.php'; 
    99use net::xjconf::DefinitionParser; 
    1010use net::xjconf::XmlParser; 
    …… 
    1818class TestInterfaces 
    1919{ 
    20        public static function main() 
    21        { 
     20    public static function main() 
     21    { 
    2222        $tagParser = new DefinitionParser(); 
    2323        $defs      = $tagParser->parse(getcwd() . '/xml/defines-interfaces.xml'); 
    …… 
    3737        var_dump($foo); 
    3838        var_dump($foo->getBar()); 
    39        } 
     39    } 
    4040} 
    4141TestInterfaces::main(); 

  • trunk/examples/TestPrimitives.php

    r119 r129  
    11<?php 
    2 require_once '../XJConf/XJConfLoader.php'; 
     2require_once '../XJConf/XJConf.php'; 
    33use net::xjconf::DefinitionParser; 
    44use net::xjconf::XmlParser; 

  • trunk/examples/TestPrimitivesFactory.php

    r119 r129  
    11<?php 
    2 require_once '../XJConf/XJConfLoader.php'; 
     2require_once '../XJConf/XJConf.php'; 
    33use net::xjconf::DefinitionParser; 
    44use net::xjconf::XmlParser; 

  • trunk/examples/TestStaticClass.php

    r119 r129  
    11<?php 
    2 require_once '../XJConf/XJConfLoader.php'; 
     2require_once '../XJConf/XJConf.php'; 
    33use net::xjconf::DefinitionParser; 
    44use net::xjconf::XmlParser; 

  • trunk/examples/TestXInclude.php

    r119 r129  
    11<?php 
    2 require_once '../XJConf/XJConfLoader.php'; 
     2require_once '../XJConf/XJConf.php'; 
    33use net::xjconf::DefinitionParser; 
    44use net::xjconf::XmlParser; 

  • trunk/examples/Test__setExplicit.php

    r119 r129  
    11<?php 
    2 require_once '../XJConf/XJConfLoader.php'; 
     2require_once '../XJConf/XJConf.php'; 
    33use net::xjconf::DefinitionParser; 
    44use net::xjconf::XmlParser; 

  • trunk/examples/Test__setImplicit.php

    r119 r129  
    11<?php 
    2 require_once '../XJConf/XJConfLoader.php'; 
     2require_once '../XJConf/XJConf.php'; 
    33use net::xjconf::DefinitionParser; 
    44use net::xjconf::XmlParser; 

  • trunk/examples/Test__setPublicProperties.php

    r119 r129  
    11<?php 
    2 require_once '../XJConf/XJConfLoader.php'; 
     2require_once '../XJConf/XJConf.php'; 
    33use net::xjconf::DefinitionParser; 
    44use net::xjconf::XmlParser; 

  • trunk/tests/run.php

    r128 r129  
    1010require_once dirname(__FILE__) . '/../simpletest/mock_objects.php'; 
    1111require_once dirname(__FILE__) . '/../simpletest/reporter.php'; 
    12 require_once dirname(__FILE__) . '/../XJConf/XJConfLoader.php'; 
     12require_once dirname(__FILE__) . '/../XJConf/XJConf.php'; 
    1313/** 
    1414 * Test runner for XJConf. 

  • trunk/tests/runIntegration.php

    r119 r129  
    99require_once TEST_CWD . '/../simpletest/reporter.php'; 
    1010require_once TEST_CWD . '/../simpletest/unit_tester.php'; 
    11 require_once TEST_CWD . '/../XJConf/XJConfLoader.php'; 
     11require_once TEST_CWD . '/../XJConf/XJConf.php'; 
    1212/** 
    1313 * Test runner for XJConf.