Changeset 131
- Timestamp:
- 01/11/08 09:46:03 (8 months ago)
- Files:
-
- branches/PRE_NAMESPACES/XJConf/DefinedTag.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/DefinitionParser.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/XJConfFacade.php (modified) (2 diffs)
- branches/PRE_NAMESPACES/XJConf/XJConfLoader.php (modified) (4 diffs)
- branches/PRE_NAMESPACES/XJConf/XmlParser.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/converters/AbstractObjectValueConverter.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/converters/ArrayValueConverter.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/converters/AutoPrimitiveValueConverter.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/converters/ConstructorValueConverter.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/converters/FactoryMethodValueConverter.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/converters/PrimitiveValueConverter.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/converters/StaticClassValueConverter.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/converters/factories/ArrayValueConverterFactory.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/converters/factories/AutoPrimitiveValueConverterFactory.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/converters/factories/ConstructorValueConverterFactory.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/converters/factories/FactoryMethodValueConverterFactory.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/converters/factories/PrimitiveValueConverterFactory.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/converters/factories/StaticClassValueConverterFactory.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/converters/factories/ValueConverterFactoryChain.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/definitions/AbstractTagDefinition.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/definitions/AttributeDefinition.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/definitions/CDataDefinition.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/definitions/ChildDefinition.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/definitions/ConcreteTagDefinition.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/definitions/ConstructorDefinition.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/definitions/FactoryMethodDefinition.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/definitions/MethodCallTagDefinition.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/definitions/NamespaceDefinition.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/definitions/NamespaceDefinitions.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/definitions/TagDefinition.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/definitions/handler/AbstractTagDefinitionHandler.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/definitions/handler/AttributeDefinitionHandler.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/definitions/handler/CDataDefinitionHandler.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/definitions/handler/ChildDefinitionHandler.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/definitions/handler/ConcreteTagDefinitionHandler.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/definitions/handler/ConstructorDefinitionHandler.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/definitions/handler/DefinitionHandlerFactory.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/definitions/handler/EmptyDefinitionHandler.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/definitions/handler/FactoryMethodDefinitionHandler.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/definitions/handler/MethodCallTagDefinitionHandler.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/definitions/handler/TagDefinitionHandler.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/exceptions/InvalidNamespaceDefinitionException.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/exceptions/InvalidTagDefinitionException.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/exceptions/MissingAttributeException.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/exceptions/UnknownNamespaceException.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/exceptions/UnknownTagException.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/exceptions/UnsupportedOperationException.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/exceptions/ValueConversionException.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/ext/xinc/XInclude.php (modified) (1 diff)
- branches/PRE_NAMESPACES/XJConf/ext/xinc/XIncludeException.php (modified) (1 diff)
- branches/PRE_NAMESPACES/build.php (modified) (1 diff)
- branches/PRE_NAMESPACES/examples/ClassLoader.php (modified) (2 diffs)
- branches/PRE_NAMESPACES/examples/ExampleExtension.php (modified) (1 diff)
- branches/PRE_NAMESPACES/examples/TestAttributesRequired.php (modified) (1 diff)
- branches/PRE_NAMESPACES/examples/TestCDataSetter.php (modified) (1 diff)
- branches/PRE_NAMESPACES/examples/TestConstructor.php (modified) (1 diff)
- branches/PRE_NAMESPACES/examples/TestInterfaces.php (modified) (1 diff)
- branches/PRE_NAMESPACES/examples/TestXInclude.php (modified) (1 diff)
- branches/PRE_NAMESPACES/examples/xml/defines-classloader.xml (modified) (1 diff)
- branches/PRE_NAMESPACES/package.php (modified) (2 diffs)
- branches/PRE_NAMESPACES/tests/converters/PrimitiveValueConverterTestCase.php (modified) (1 diff)
- branches/PRE_NAMESPACES/tests/definitions/AttributeDefinitionTestCase.php (modified) (1 diff)
- branches/PRE_NAMESPACES/tests/definitions/CDataDefinitionTestCase.php (modified) (1 diff)
- branches/PRE_NAMESPACES/tests/definitions/ConstructorDefinitionTestCase.php (modified) (1 diff)
- branches/PRE_NAMESPACES/tests/definitions/FactoryMethodDefinitionTestCase.php (modified) (1 diff)
- branches/PRE_NAMESPACES/tests/definitions/NamespaceDefinitionTestCase.php (modified) (1 diff)
- branches/PRE_NAMESPACES/tests/integration/ExampleExtensionTestCase.php (modified) (1 diff)
- branches/PRE_NAMESPACES/tests/integration/TestXIncludeTestCase.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/PRE_NAMESPACES/XJConf/DefinedTag.php
r94 r131 7 7 */ 8 8 XJConfLoader::load('Tag', 9 'definitions .TagDefinition'9 'definitions::TagDefinition' 10 10 ); 11 11 /** branches/PRE_NAMESPACES/XJConf/DefinitionParser.php
r98 r131 6 6 * @author Frank Kleine <frank.kleine@schlund.de> 7 7 */ 8 XJConfLoader::load('definitions .AttributeDefinition',9 'definitions .CDataDefinition',10 'definitions .ChildDefinition',11 'definitions .ConstructorDefinition',12 'definitions .FactoryMethodDefinition',13 'definitions .MethodCallTagDefinition',14 'definitions .NamespaceDefinition',15 'definitions .NamespaceDefinitions',16 'definitions .TagDefinition',17 'definitions .handler.DefinitionHandlerFactory',18 'exceptions .InvalidNamespaceDefinitionException'8 XJConfLoader::load('definitions::AttributeDefinition', 9 'definitions::CDataDefinition', 10 'definitions::ChildDefinition', 11 'definitions::ConstructorDefinition', 12 'definitions::FactoryMethodDefinition', 13 'definitions::MethodCallTagDefinition', 14 'definitions::NamespaceDefinition', 15 'definitions::NamespaceDefinitions', 16 'definitions::TagDefinition', 17 'definitions::handler::DefinitionHandlerFactory', 18 'exceptions::InvalidNamespaceDefinitionException' 19 19 ); 20 20 /** branches/PRE_NAMESPACES/XJConf/XJConfFacade.php
r102 r131 8 8 XJConfLoader::load('DefinitionParser', 9 9 'XmlParser', 10 'ext .Extension',11 'definitions .NamespaceDefinitions'10 'ext::Extension', 11 'definitions::NamespaceDefinitions' 12 12 ); 13 13 /** … … 79 79 public function enableXIncludes() 80 80 { 81 XJConfLoader::load('ext .xinc.XInclude');81 XJConfLoader::load('ext::xinc::XInclude'); 82 82 $xincludeExtension = new XInclude(); 83 83 $this->addExtension($xincludeExtension); branches/PRE_NAMESPACES/XJConf/XJConfLoader.php
r101 r131 26 26 * method to load files from source path 27 27 * 28 * Usage: XJConfLoader::load('path .to.Classfile');28 * Usage: XJConfLoader::load('path::to::Classfile'); 29 29 * or load more than one at once: 30 * XJConfLoader::load('path .to.first.Class',31 'path .to.second.Class'30 * XJConfLoader::load('path::to::first::Class', 31 'path::to::second::Class' 32 32 ); 33 33 * You may name as many files as you like, there is no restriction … … 46 46 $realFiles = array(); 47 47 foreach ($classes as $className) { 48 if (in_array(str_replace('net .xjconf.', '', $className), self::$loadedClasses) == TRUE) {48 if (in_array(str_replace('net::xjconf::', '', $className), self::$loadedClasses) == TRUE) { 49 49 continue; // step to next file if file is already loaded 50 50 } 51 51 52 52 $uri = null; 53 array_push(self::$loadedClasses, str_replace('net .xjconf.', '', $className));53 array_push(self::$loadedClasses, str_replace('net::xjconf::', '', $className)); 54 54 if (class_exists('StarClassRegistry', false) === true) { 55 if (substr($className, 0, 11) != 'net .xjconf.') {56 $uri = StarClassRegistry::getUriForClass('net .xjconf.' . $className);55 if (substr($className, 0, 11) != 'net::xjconf::') { 56 $uri = StarClassRegistry::getUriForClass('net::xjconf::' . $className); 57 57 } else { 58 58 $uri = StarClassRegistry::getUriForClass($className); … … 79 79 } 80 80 81 if (substr($className, 0, 11) != 'net .xjconf.') {82 $fqClassName = 'net .xjconf.' . $className;81 if (substr($className, 0, 11) != 'net::xjconf::') { 82 $fqClassName = 'net::xjconf::' . $className; 83 83 } else { 84 84 $fqClassName = $className; … … 103 103 private static function mapClassname($classname) 104 104 { 105 return str_replace(' .', '/', $classname) . '.php';105 return str_replace('::', '/', $classname) . '.php'; 106 106 } 107 107 } branches/PRE_NAMESPACES/XJConf/XmlParser.php
r99 r131 8 8 XJConfLoader::load('DefinedTag', 9 9 'GenericTag', 10 'definitions .NamespaceDefinition',11 'definitions .NamespaceDefinitions',12 'exceptions .UnknownNamespaceException',13 'exceptions .UnknownTagException'10 'definitions::NamespaceDefinition', 11 'definitions::NamespaceDefinitions', 12 'exceptions::UnknownNamespaceException', 13 'exceptions::UnknownTagException' 14 14 ); 15 15 /** branches/PRE_NAMESPACES/XJConf/converters/AbstractObjectValueConverter.php
r110 r131 6 6 * @author Frank Kleine <frank.kleine@schlund.de> 7 7 */ 8 XJConfLoader::load('converters .ValueConverter',9 'exceptions .ValueConversionException'8 XJConfLoader::load('converters::ValueConverter', 9 'exceptions::ValueConversionException' 10 10 ); 11 11 /** branches/PRE_NAMESPACES/XJConf/converters/ArrayValueConverter.php
r62 r131 5 5 * @author Frank Kleine <frank.kleine@schlund.de> 6 6 */ 7 XJConfLoader::load('converters .ValueConverter',8 'definitions .Definition',9 'definitions .TagDefinition'7 XJConfLoader::load('converters::ValueConverter', 8 'definitions::Definition', 9 'definitions::TagDefinition' 10 10 ); 11 11 /** branches/PRE_NAMESPACES/XJConf/converters/AutoPrimitiveValueConverter.php
r91 r131 7 7 * @author Stephan Schmidt <schst@xjconf.net> 8 8 */ 9 XJConfLoader::load('converters .ValueConverter',10 'exceptions .ValueConversionException'9 XJConfLoader::load('converters::ValueConverter', 10 'exceptions::ValueConversionException' 11 11 ); 12 12 /** branches/PRE_NAMESPACES/XJConf/converters/ConstructorValueConverter.php
r100 r131 6 6 * @author Frank Kleine <frank.kleine@schlund.de> 7 7 */ 8 XJConfLoader::load('converters .ValueConverter',9 'converters .AbstractObjectValueConverter',10 'exceptions .ValueConversionException'8 XJConfLoader::load('converters::ValueConverter', 9 'converters::AbstractObjectValueConverter', 10 'exceptions::ValueConversionException' 11 11 ); 12 12 /** branches/PRE_NAMESPACES/XJConf/converters/FactoryMethodValueConverter.php
r75 r131 6 6 * @author Frank Kleine <frank.kleine@schlund.de> 7 7 */ 8 XJConfLoader::load('converters .ValueConverter',9 'converters .AbstractObjectValueConverter',10 'exceptions .ValueConversionException'8 XJConfLoader::load('converters::ValueConverter', 9 'converters::AbstractObjectValueConverter', 10 'exceptions::ValueConversionException' 11 11 ); 12 12 /** branches/PRE_NAMESPACES/XJConf/converters/PrimitiveValueConverter.php
r126 r131 8 8 * @subpackage converters 9 9 */ 10 XJConfLoader::load('converters .ValueConverter',11 'converters .PrimitiveValueConverter',12 'exceptions .ValueConversionException'10 XJConfLoader::load('converters::ValueConverter', 11 'converters::PrimitiveValueConverter', 12 'exceptions::ValueConversionException' 13 13 ); 14 14 /** branches/PRE_NAMESPACES/XJConf/converters/StaticClassValueConverter.php
r88 r131 8 8 * @subpackage converters 9 9 */ 10 XJConfLoader::load('converters .ValueConverter',11 'exceptions .ValueConversionException'10 XJConfLoader::load('converters::ValueConverter', 11 'exceptions::ValueConversionException' 12 12 ); 13 13 /** branches/PRE_NAMESPACES/XJConf/converters/factories/ArrayValueConverterFactory.php
r12 r131 5 5 * @author Frank Kleine <frank.kleine@schlund.de> 6 6 */ 7 XJConfLoader::load('converters .factories.ValueConverterFactory',8 'converters .ArrayValueConverter'7 XJConfLoader::load('converters::factories::ValueConverterFactory', 8 'converters::ArrayValueConverter' 9 9 ); 10 10 /** branches/PRE_NAMESPACES/XJConf/converters/factories/AutoPrimitiveValueConverterFactory.php
r91 r131 6 6 * @package XJConf 7 7 */ 8 XJConfLoader::load('converters .factories.ValueConverterFactory',9 'converters .AutoPrimitiveValueConverter');8 XJConfLoader::load('converters::factories::ValueConverterFactory', 9 'converters::AutoPrimitiveValueConverter'); 10 10 11 11 /** branches/PRE_NAMESPACES/XJConf/converters/factories/ConstructorValueConverterFactory.php
r22 r131 6 6 * @author Frank Kleine <frank.kleine@schlund.de> 7 7 */ 8 XJConfLoader::load('converters .factories.ValueConverterFactory',9 'converters .ConstructorValueConverter');8 XJConfLoader::load('converters::factories::ValueConverterFactory', 9 'converters::ConstructorValueConverter'); 10 10 /** 11 11 * Factory to create an ConstructorValueConverter. branches/PRE_NAMESPACES/XJConf/converters/factories/FactoryMethodValueConverterFactory.php
r22 r131 6 6 * @author Frank Kleine <frank.kleine@schlund.de> 7 7 */ 8 XJConfLoader::load('converters .factories.ValueConverterFactory',9 'converters .FactoryMethodValueConverter'8 XJConfLoader::load('converters::factories::ValueConverterFactory', 9 'converters::FactoryMethodValueConverter' 10 10 ); 11 11 /** branches/PRE_NAMESPACES/XJConf/converters/factories/PrimitiveValueConverterFactory.php
r14 r131 1 1 <?php 2 XJConfLoader::load('converters .factories.ValueConverterFactory',3 'converters .PrimitiveValueConverter');2 XJConfLoader::load('converters::factories::ValueConverterFactory', 3 'converters::PrimitiveValueConverter'); 4 4 5 5 class PrimitiveValueConverterFactory implements ValueConverterFactory { branches/PRE_NAMESPACES/XJConf/converters/factories/StaticClassValueConverterFactory.php
r77 r131 5 5 * @author Stephan Schmidt <stephan.schmidt@schlund.de> 6 6 */ 7 XJConfLoader::load('converters .factories.ValueConverterFactory',8 'converters .StaticClassValueConverter');7 XJConfLoader::load('converters::factories::ValueConverterFactory', 8 'converters::StaticClassValueConverter'); 9 9 /** 10 10 * Factory to create an StaticClassValueConverter. branches/PRE_NAMESPACES/XJConf/converters/factories/ValueConverterFactoryChain.php
r91 r131 8 8 * @subpackage converters 9 9 */ 10 XJConfLoader::load('converters .factories.ValueConverterFactory',11 'converters .factories.AutoPrimitiveValueConverterFactory',12 'converters .factories.PrimitiveValueConverterFactory',13 'converters .factories.ArrayValueConverterFactory',14 'converters .factories.ConstructorValueConverterFactory',15 'converters .factories.FactoryMethodValueConverterFactory',16 'converters .factories.StaticClassValueConverterFactory',17 'definitions .Definition'10 XJConfLoader::load('converters::factories::ValueConverterFactory', 11 'converters::factories::AutoPrimitiveValueConverterFactory', 12 'converters::factories::PrimitiveValueConverterFactory', 13 'converters::factories::ArrayValueConverterFactory', 14 'converters::factories::ConstructorValueConverterFactory', 15 'converters::factories::FactoryMethodValueConverterFactory', 16 'converters::factories::StaticClassValueConverterFactory', 17 'definitions::Definition' 18 18 ); 19 19 /** branches/PRE_NAMESPACES/XJConf/definitions/AbstractTagDefinition.php
r86 r131 5 5 * @author Frank Kleine <mikey@xjconf.net> 6 6 */ 7 XJConfLoader::load('definitions .TagDefinition',8 'exceptions .ValueConversionException'7 XJConfLoader::load('definitions::TagDefinition', 8 'exceptions::ValueConversionException' 9 9 ); 10 10 /** branches/PRE_NAMESPACES/XJConf/definitions/AttributeDefinition.php
r94 r131 6 6 * @author Frank Kleine <frank.kleine@schlund.de> 7 7 */ 8 XJConfLoader::load('converters .factories.ValueConverterFactoryChain',9 'definitions .Definition',10 'exceptions .InvalidTagDefinitionException',11 'exceptions .MissingAttributeException',12 'exceptions .XJConfException',8 XJConfLoader::load('converters::factories::ValueConverterFactoryChain', 9 'definitions::Definition', 10 'exceptions::InvalidTagDefinitionException', 11 'exceptions::MissingAttributeException', 12 'exceptions::XJConfException', 13 13 'GenericTag' 14 14 ); branches/PRE_NAMESPACES/XJConf/definitions/CDataDefinition.php
r94 r131 6 6 * @author Frank Kleine <frank.kleine@schlund.de> 7 7 */ 8 XJConfLoader::load('converters .factories.ValueConverterFactoryChain',9 'definitions .Definition'8 XJConfLoader::load('converters::factories::ValueConverterFactoryChain', 9 'definitions::Definition' 10 10 ); 11 11 /** branches/PRE_NAMESPACES/XJConf/definitions/ChildDefinition.php
r94 r131 1 1 <?php 2 XJConfLoader::load('definitions .Definition',3 'exceptions .ValueConversionException',4 'exceptions .XJConfException'2 XJConfLoader::load('definitions::Definition', 3 'exceptions::ValueConversionException', 4 'exceptions::XJConfException' 5 5 ); 6 6 /** branches/PRE_NAMESPACES/XJConf/definitions/ConcreteTagDefinition.php
r62 r131 6 6 * @author Frank Kleine <frank.kleine@schlund.de> 7 7 */ 8 XJConfLoader::load('definitions .TagDefinition');8 XJConfLoader::load('definitions::TagDefinition'); 9 9 /** 10 10 * Definition of an XML tag. branches/PRE_NAMESPACES/XJConf/definitions/ConstructorDefinition.php
r94 r131 6 6 * @author Frank Kleine <frank.kleine@schlund.de> 7 7 */ 8 XJConfLoader::load('definitions .Definition');8 XJConfLoader::load('definitions::Definition'); 9 9 /** 10 10 * Definition for the constructor of a class branches/PRE_NAMESPACES/XJConf/definitions/FactoryMethodDefinition.php
r94 r131 6 6 * @author Frank Kleine <frank.kleine@schlund.de> 7 7 */ 8 XJConfLoader::load('definitions .Definition',9 'exceptions .UnsupportedOperationException'8 XJConfLoader::load('definitions::Definition', 9 'exceptions::UnsupportedOperationException' 10 10 ); 11 11 /** branches/PRE_NAMESPACES/XJConf/definitions/MethodCallTagDefinition.php
r94 r131 1 1 <?php 2 XJConfLoader::load('definitions .Definition',3 'definitions .ValueModifier',4 'exceptions .ValueConversionException',5 'exceptions .XJConfException'2 XJConfLoader::load('definitions::Definition', 3 'definitions::ValueModifier', 4 'exceptions::ValueConversionException', 5 'exceptions::XJConfException' 6 6 ); 7 7 /** branches/PRE_NAMESPACES/XJConf/definitions/NamespaceDefinition.php
r104 r131 6 6 * @author Frank Kleine <mikey@xjconf.net> 7 7 */ 8 XJConfLoader::load('definitions .TagDefinition');8 XJConfLoader::load('definitions::TagDefinition'); 9 9 /** 10 10 * Container for all tag definitions in one namespace branches/PRE_NAMESPACES/XJConf/definitions/NamespaceDefinitions.php
r62 r131 1 1 <?php 2 XJConfLoader::load('definitions .NamespaceDefinition');2 XJConfLoader::load('definitions::NamespaceDefinition'); 3 3 /** 4 4 * Stores definitions of several namespaces. branches/PRE_NAMESPACES/XJConf/definitions/TagDefinition.php
r94 r131 6 6 * @author Frank Kleine <frank.kleine@schlund.de> 7 7 */ 8 XJConfLoader::load('converters .factories.ValueConverterFactoryChain',9 'definitions .AttributeDefinition',10 'definitions .CDataDefinition',11 'definitions .ConstructorDefinition',12 'definitions .FactoryMethodDefinition',13 'definitions .Definition',14 'exceptions .ValueConversionException',15 'exceptions .XJConfException',8 XJConfLoader::load('converters::factories::ValueConverterFactoryChain', 9 'definitions::AttributeDefinition', 10 'definitions::CDataDefinition', 11 'definitions::ConstructorDefinition', 12 'definitions::FactoryMethodDefinition', 13 'definitions::Definition', 14 'exceptions::ValueConversionException', 15 'exceptions::XJConfException', 16 16 'XJConfClassLoader' 17 17 ); branches/PRE_NAMESPACES/XJConf/definitions/handler/AbstractTagDefinitionHandler.php
r90 r131 5 5 * @author Frank Kleine <frank@kl-s.com> 6 6 */ 7 XJConfLoader::load('definitions .handler.DefinitionHandler',8 'definitions .AbstractTagDefinition',9 'definitions .NamespaceDefinition',10 'exceptions .InvalidTagDefinitionException'7 XJConfLoader::load('definitions::handler::DefinitionHandler', 8 'definitions::AbstractTagDefinition', 9 'definitions::NamespaceDefinition', 10 'exceptions::InvalidTagDefinitionException' 11 11 ); 12 12 /** branches/PRE_NAMESPACES/XJConf/definitions/handler/AttributeDefinitionHandler.php
r19 r131 5 5 * @author Frank Kleine <frank@kl-s.com> 6 6 */ 7 XJConfLoader::load('definitions .handler.DefinitionHandler',8 'definitions .AttributeDefinition',9 'exceptions .InvalidTagDefinitionException'7 XJConfLoader::load('definitions::handler::DefinitionHandler', 8 'definitions::AttributeDefinition', 9 'exceptions::InvalidTagDefinitionException' 10 10 ); 11 11 /** branches/PRE_NAMESPACES/XJConf/definitions/handler/CDataDefinitionHandler.php
r19 r131 5 5 * @author Frank Kleine <frank@kl-s.com> 6 6 */ 7 XJConfLoader::load('definitions .handler.DefinitionHandler',8 'definitions .CDataDefinition',9 'exceptions .InvalidTagDefinitionException'7 XJConfLoader::load('definitions::handler::DefinitionHandler', 8 'definitions::CDataDefinition', 9 'exceptions::InvalidTagDefinitionException' 10 10 ); 11 11 /** branches/PRE_NAMESPACES/XJConf/definitions/handler/ChildDefinitionHandler.php
r38 r131 5 5 * @author Frank Kleine <frank@kl-s.com> 6 6 */ 7 XJConfLoader::load('definitions .handler.DefinitionHandler',8 'definitions .ChildDefinition',9 'exceptions .InvalidTagDefinitionException'7 XJConfLoader::load('definitions::handler::DefinitionHandler', 8 'definitions::ChildDefinition', 9 'exceptions::InvalidTagDefinitionException' 10 10 ); 11 11 /** branches/PRE_NAMESPACES/XJConf/definitions/handler/ConcreteTagDefinitionHandler.php
r90 r131 5 5 * @author Frank Kleine <frank@kl-s.com> 6 6 */ 7 XJConfLoader::load('definitions .handler.DefinitionHandler',8 'definitions .ConcreteTagDefinition',9 'definitions .NamespaceDefinition',10 'exceptions .InvalidTagDefinitionException'7 XJConfLoader::load('definitions::handler::DefinitionHandler', 8 'definitions::ConcreteTagDefinition', 9 'definitions::NamespaceDefinition', 10 'exceptions::InvalidTagDefinitionException' 11 11 ); 12 12 /** branches/PRE_NAMESPACES/XJConf/definitions/handler/ConstructorDefinitionHandler.php
r19 r131 5 5 * @author Frank Kleine <frank@kl-s.com> 6 6 */ 7 XJConfLoader::load('definitions .handler.DefinitionHandler',8 'definitions .ConstructorDefinition',9 'exceptions .InvalidTagDefinitionException'7 XJConfLoader::load('definitions::handler::DefinitionHandler', 8 'definitions::ConstructorDefinition', 9 'exceptions::InvalidTagDefinitionException' 10 10 ); 11 11 /** branches/PRE_NAMESPACES/XJConf/definitions/handler/DefinitionHandlerFactory.php
r78 r131 26 26 { 27 27 $className = ucfirst($type) . 'DefinitionHandler'; 28 if (XJConfLoader::classFileExists('definitions .handler.' . $className) == false) {28 if (XJConfLoader::classFileExists('definitions::handler::' . $className) == false) { 29 29 $className = 'EmptyDefinitionHandler'; 30 30 } 31 31 32 XJConfLoader::load('definitions .handler.' . $className);32 XJConfLoader::load('definitions::handler::' . $className); 33 33 34 34 $defHandler = new $className(); branches/PRE_NAMESPACES/XJConf/definitions/handler/EmptyDefinitionHandler.php
r19 r131 5 5 * @author Frank Kleine <frank@kl-s.com> 6 6 */ 7 XJConfLoader::load('definitions .handler.DefinitionHandler');7 XJConfLoader::load('definitions::handler::DefinitionHandler'); 8 8 /** 9 9 * DefinitionHandler for xml elements that do not define anything. branches/PRE_NAMESPACES/XJConf/definitions/handler/FactoryMethodDefinitionHandler.php
r19 r131 5 5 * @author Frank Kleine <frank@kl-s.com> 6 6 */ 7 XJConfLoader::load('definitions .handler.DefinitionHandler',8 'definitions .FactoryMethodDefinition',9 'exceptions .InvalidTagDefinitionException'7 XJConfLoader::load('definitions::handler::DefinitionHandler', 8 'definitions::FactoryMethodDefinition', 9 'exceptions::InvalidTagDefinitionException' 10 10 ); 11 11 /** branches/PRE_NAMESPACES/XJConf/definitions/handler/MethodCallTagDefinitionHandler.php
r94 r131 5 5 * @author Frank Kleine <frank@kl-s.com> 6 6 */ 7 XJConfLoader::load('definitions .handler.DefinitionHandler',8 'definitions .FactoryMethodDefinition',9 'exceptions .InvalidTagDefinitionException'7 XJConfLoader::load('definitions::handler::DefinitionHandler', 8 'definitions::FactoryMethodDefinition', 9 'exceptions::InvalidTagDefinitionException' 10 10 ); 11 11 /** branches/PRE_NAMESPACES/XJConf/definitions/handler/TagDefinitionHandler.php
r62 r131 8 8 * @author Frank Kleine <frank@kl-s.com> <
