[Argil-svn] SF.net SVN: argil: [548] branches/experimental

[<tsw...@us...>]

Revision: 548
          http://argil.svn.sourceforge.net/argil/?rev=548&view=rev
Author:   tswicegood
Date:     2007-07-14 18:07:39 -0700 (Sat, 14 Jul 2007)

Log Message:
-----------
Remove annotation code from Argil - now uses Domain51_Tool_Annotation

Modified Paths:
--------------
    branches/experimental/src/Argil/Reflection/Object.php
    branches/experimental/tests/AllTest.php
    branches/experimental/tests/config.php

Removed Paths:
-------------
    branches/experimental/src/Argil/Util/Annotation/
    branches/experimental/tests/Argil/Util/Annotation/

Modified: branches/experimental/src/Argil/Reflection/Object.php
===================================================================
--- branches/experimental/src/Argil/Reflection/Object.php	2007-07-14 22:31:57 UTC (rev 547)
+++ branches/experimental/src/Argil/Reflection/Object.php	2007-07-15 01:07:39 UTC (rev 548)
@@ -1,7 +1,7 @@
 <?php
 require_once 'Argil/Reflection/Property.php';
 require_once 'Argil/Reflection/PropertyList.php';
-require_once 'Argil/Util/Annotation/Parser.php';
+require_once 'Domain51/Tool/Annotation/Parser.php';
 
 class Argil_Reflection_Object
 {
@@ -29,7 +29,7 @@
     
     public function getTable()
     {
-        $parser = new Argil_Util_Annotation_Parser();
+        $parser = new Domain51_Tool_Annotation_Parser();
         $collection = $parser->parse($this->_decorated->getDocComment());
         
         if (!$collection->has('table')) {
@@ -41,7 +41,7 @@
     
     public function getPrimaryKey()
     {
-        $parser = new Argil_Util_Annotation_Parser();
+        $parser = new Domain51_Tool_Annotation_Parser();
         $collection = $parser->parse($this->_decorated->getDocComment());
         
         if (!$collection->has('primaryKey')) {

Modified: branches/experimental/tests/AllTest.php
===================================================================
--- branches/experimental/tests/AllTest.php	2007-07-14 22:31:57 UTC (rev 547)
+++ branches/experimental/tests/AllTest.php	2007-07-15 01:07:39 UTC (rev 548)
@@ -13,9 +13,6 @@
         $this->addTestFile('Argil/RouteTest.php');
         $this->addTestFile('Argil/Specification/LengthTest.php');
         $this->addTestFile('Argil/Specification/StringTest.php');
-        $this->addTestFile('Argil/Util/Annotation/CollectionTest.php');
-        $this->addTestFile('Argil/Util/Annotation/ParserTest.php');
-        $this->addTestFile('Argil/Util/Annotation/ValueTest.php');
         $this->addTestFile('Argil/Util/System/DirectoryTest.php');
         $this->addTestFile('Argil/Util/System/FileTest.php');
         $this->addTestFile('Argil/Util/Template/CamelCapsToUnderscoreTest.php');

Modified: branches/experimental/tests/config.php
===================================================================
--- branches/experimental/tests/config.php	2007-07-14 22:31:57 UTC (rev 547)
+++ branches/experimental/tests/config.php	2007-07-15 01:07:39 UTC (rev 548)
@@ -2,7 +2,9 @@
 require_once 'simpletest/unit_tester.php';
 require_once 'simpletest/mock_objects.php';
 require_once 'simpletest/autorun.php';
-set_include_path(dirname(__FILE__) . PATH_SEPARATOR . dirname(__FILE__) . '/../src' . PATH_SEPARATOR . get_include_path());
+set_include_path(
+    dirname(__FILE__) . PATH_SEPARATOR .
+    dirname(__FILE__) . '/../src' . PATH_SEPARATOR .
+    get_include_path()
+);
 
-require_once 'Argil/Util/Annotation/Value.php';
-Mock::generate('Argil_Util_Annotation_Value');


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.