Changeset 83

Show
Ignore:
Timestamp:
01/19/07 22:05:46 (2 years ago)
Author:
schst
Message:

Fixed bug when XJConf is used as PEAR install, but STAR is available,
prepared 0.2.0 release

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/XJConf/XJConfLoader.php

    r82 r83  
    7272     * @return  bool 
    7373     */ 
    74     public static function classFileExists($fqClassName) 
     74    public static function classFileExists($className) 
    7575    { 
    7676        if (class_exists('StarClassRegistry') == false) { 
    77             return file_exists(dirname(__FILE__) . '/' . self::mapClassname($fqClassName)); 
     77            return file_exists(dirname(__FILE__) . '/' . self::mapClassname($className)); 
    7878        } 
    7979 
    80         if (substr($fqClassName, 0, 11) != 'net.xjconf.') { 
    81             $fqClassName = 'net.xjconf.' . $fqClassName; 
     80        if (substr($className, 0, 11) != 'net.xjconf.') { 
     81            $fqClassName = 'net.xjconf.' . $className; 
    8282        } 
    83         return (StarClassRegistry::getFileForClass($fqClassName) != null); 
     83        if (StarClassRegistry::getFileForClass($fqClassName) != null) { 
     84            return true; 
     85        } 
     86        return file_exists(dirname(__FILE__) . '/' . self::mapClassname($className)); 
    8487    } 
    8588 
  • trunk/autopackage2.php

    r77 r83  
    2020 * Base version 
    2121 */ 
    22 $baseVersion = '0.1.2'; 
     22$baseVersion = '0.2.0'; 
    2323 
    2424/** 
     
    3131 * Current API version 
    3232 */ 
    33 $apiVersion = '0.1.2'; 
     33$apiVersion = '0.2.0'; 
    3434 
    3535/** 
     
    5252- Added possibility to declare tags as static (schst) 
    5353- Added several unit tests (mikey) 
     54- Added possibility to package XJConfForPHP as a STAR archive (mikey, schst) 
    5455Bugfixes: 
    5556- Fixed bug #6: Enable factory methods without parameters in PHP 5.0.x (schst) 
  • trunk/package.php

    r77 r83  
    2020 * current version 
    2121 */ 
    22 $version = '0.1.2'; 
     22$version = '0.2.0'; 
    2323 
    2424/** 
    2525 * Current API version 
    2626 */ 
    27 $apiVersion = '0.1.2'; 
     27$apiVersion = '0.2.0'; 
    2828 
    2929/** 
     
    4646- Added possibility to declare tags as static (schst) 
    4747- Added several unit tests (mikey) 
     48- Added possibility to package XJConfForPHP as a STAR archive (mikey, schst) 
    4849Bugfixes: 
    4950- Fixed bug #6: Enable factory methods without parameters in PHP 5.0.x (schst) 
  • trunk/package.xml

    r51 r83  
    2222  <active>yes</active> 
    2323 </lead> 
    24  <date>2006-11-28</date> 
    25  <time>15:07:43</time> 
     24 <date>2007-01-19</date> 
     25 <time>22:04:32</time> 
    2626 <version> 
    27   <release>0.1.2</release> 
    28   <api>0.1.2</api> 
     27  <release>0.2.0</release> 
     28  <api>0.2.0</api> 
    2929 </version> 
    3030 <stability> 
     
    3333 </stability> 
    3434 <license uri="http://www.gnu.org/copyleft/lesser.txt">LGPL</license> 
    35  <notes>Feature addition: 
    36 This release enables using class loaders for differant namespaces which allows to load classes 
    37 at runtime of the XmlParser instead of having to load all classes before parsing the xml files. 
    38 Bugfix: 
    39 The ConstructorValueConverter now works with all examples.</notes> 
     35 <notes>Feature additions: 
     36- New feature to define abstract tags, which enables yo to define the concrete type in the tag instead of the definition (mikey) 
     37- It is now possible to define an explicit setter method for character data inside a tag (schst) 
     38- Added possibility to declare tags as static (schst) 
     39- Added several unit tests (mikey) 
     40- Added possibility to package XJConfForPHP as a STAR archive (mikey, schst) 
     41Bugfixes: 
     42- Fixed bug #6: Enable factory methods without parameters in PHP 5.0.x (schst) 
     43- Fixed bug #7: check, whether factory method can be called statically (schst) 
     44- Fixed bug: prevent errors in case factory method does not return an instance of an object (mikey)</notes> 
    4045 <contents> 
    4146  <dir baseinstalldir="/" name="/"> 
     
    5055     <file name="defines-constructor.xml" role="doc" /> 
    5156     <file name="defines-dynamic-setters.xml" role="doc" /> 
     57     <file name="defines-dynamic-types.xml" role="doc" /> 
    5258     <file name="defines-empty-constructor.xml" role="doc" /> 
    5359     <file name="defines-extension.xml" role="doc" /> 
     
    5662     <file name="defines-primitives.xml" role="doc" /> 
    5763     <file name="defines-set-cdata.xml" role="doc" /> 
     64     <file name="defines-static.xml" role="doc" /> 
    5865     <file name="defines.xml" role="doc" /> 
    5966     <file name="defines2.xml" role="doc" /> 
     
    6471     <file name="test-constructor.xml" role="doc" /> 
    6572     <file name="test-dynamic-setters.xml" role="doc" /> 
     73     <file name="test-dynamic-types.xml" role="doc" /> 
    6674     <file name="test-empty-constructor.xml" role="doc" /> 
    6775     <file name="test-extension.xml" role="doc" /> 
     
    6977     <file name="test-primitives.xml" role="doc" /> 
    7078     <file name="test-set-cdata.xml" role="doc" /> 
     79     <file name="test-static.xml" role="doc" /> 
    7180     <file name="test-xinclude-included.xml" role="doc" /> 
    7281     <file name="test-xinclude.xml" role="doc" /> 
     
    7584     <file name="test3.xml" role="doc" /> 
    7685    </dir> <!-- /examples/xml --> 
     86    <file name="AnotherClass.php" role="doc" /> 
    7787    <file name="ClassLoader.php" role="doc" /> 
    7888    <file name="Color.php" role="doc" /> 
     
    92102    <file name="MathExtension.php" role="doc" /> 
    93103    <file name="MyClass.php" role="doc" /> 
     104    <file name="MyCollector.php" role="doc" /> 
    94105    <file name="MyInterface.php" role="doc" /> 
    95106    <file name="TestAttributesRequired.php" role="doc" /> 
     
    97108    <file name="TestConstructor.php" role="doc" /> 
    98109    <file name="TestDynamicSetters.php" role="doc" /> 
     110    <file name="TestDynamicTypes.php" role="doc" /> 
    99111    <file name="TestEmptyConstructor.php" role="doc" /> 
    100112    <file name="TestInterfaces.php" role="doc" /> 
    101113    <file name="TestPrimitives.php" role="doc" /> 
    102114    <file name="TestPrimitivesFactory.php" role="doc" /> 
     115    <file name="TestStaticClass.php" role="doc" /> 
    103116    <file name="TestXInclude.php" role="doc" /> 
    104117    <file name="UpperString.php" role="doc" /> 
     
    107120    <dir name="definitions"> 
    108121     <file name="AttributeDefinitionTestCase.php" role="test" /> 
     122     <file name="CDataDefinitionTestCase.php" role="test" /> 
     123     <file name="ConstructorDefinitionTestCase.php" role="test" /> 
    109124     <file name="DefinitionsTestSuite.php" role="test" /> 
     125     <file name="FactoryMethodDefinitionTestCase.php" role="test" /> 
    110126    </dir> <!-- /tests/definitions --> 
    111127    <file name="run.php" role="test" /> 
     
    118134      <file name="FactoryMethodValueConverterFactory.php" role="php" /> 
    119135      <file name="PrimitiveValueConverterFactory.php" role="php" /> 
     136      <file name="StaticClassValueConverterFactory.php" role="php" /> 
    120137      <file name="ValueConverterFactory.php" role="php" /> 
    121138      <file name="ValueConverterFactoryChain.php" role="php" /> 
     
    126143     <file name="FactoryMethodValueConverter.php" role="php" /> 
    127144     <file name="PrimitiveValueConverter.php" role="php" /> 
     145     <file name="StaticClassValueConverter.php" role="php" /> 
    128146     <file name="ValueConverter.php" role="php" /> 
    129147    </dir> <!-- /XJConf/converters --> 
    130148    <dir name="definitions"> 
    131149     <dir name="handler"> 
     150      <file name="AbstractTagDefinitionHandler.php" role="php" /> 
    132151      <file name="AttributeDefinitionHandler.php" role="php" /> 
    133152      <file name="CDataDefinitionHandler.php" role="php" /> 
    134153      <file name="ChildDefinitionHandler.php" role="php" /> 
     154      <file name="ConcreteTagDefinitionHandler.php" role="php" /> 
    135155      <file name="ConstructorDefinitionHandler.php" role="php" /> 
    136156      <file name="DefinitionHandler.php" role="php" /> 
     
    140160      <file name="TagDefinitionHandler.php" role="php" /> 
    141161     </dir> <!-- /XJConf/definitions/handler --> 
     162     <file name="AbstractTagDefinition.php" role="php" /> 
    142163     <file name="AttributeDefinition.php" role="php" /> 
    143164     <file name="CDataDefinition.php" role="php" /> 
    144165     <file name="ChildDefinition.php" role="php" /> 
     166     <file name="ConcreteTagDefinition.php" role="php" /> 
    145167     <file name="ConstructorDefinition.php" role="php" /> 
    146168     <file name="Definition.php" role="php" /> 
     
    175197    <file name="XmlParser.php" role="php" /> 
    176198   </dir> <!-- /XJConf --> 
     199   <file name="autopackage2.php" role="php" /> 
     200   <file name="build.php" role="php" /> 
    177201   <file name="LICENSE" role="data" /> 
    178202  </dir> <!-- / --> 
     
    237261The ConstructorValueConverter now works with all examples.</notes> 
    238262  </release> 
     263  <release> 
     264   <version> 
     265    <release>0.2.0</release> 
     266    <api>0.2.0</api> 
     267   </version> 
     268   <stability> 
     269    <release>alpha</release> 
     270    <api>alpha</api> 
     271   </stability> 
     272   <date>2007-01-19</date> 
     273   <license uri="http://www.gnu.org/copyleft/lesser.txt">LGPL</license> 
     274   <notes>Feature additions: 
     275- New feature to define abstract tags, which enables yo to define the concrete type in the tag instead of the definition (mikey) 
     276- It is now possible to define an explicit setter method for character data inside a tag (schst) 
     277- Added possibility to declare tags as static (schst) 
     278- Added several unit tests (mikey) 
     279- Added possibility to package XJConfForPHP as a STAR archive (mikey, schst) 
     280Bugfixes: 
     281- Fixed bug #6: Enable factory methods without parameters in PHP 5.0.x (schst) 
     282- Fixed bug #7: check, whether factory method can be called statically (schst) 
     283- Fixed bug: prevent errors in case factory method does not return an instance of an object (mikey)</notes> 
     284  </release> 
    239285 </changelog> 
    240286</package>