 Added: svn:keywords
    + Id
 
+Index: skeleton/xml/meta/Marshaller.class.php
+===================================================================
+--- skeleton/xml/meta/Marshaller.class.php	(revision 14616)
++++ skeleton/xml/meta/Marshaller.class.php	(working copy)
+@@ -63,7 +63,7 @@
+         
+         // Node content
+         if ('.' == $element) {
+-          $node->setContent($method->invoke($instance));
++          $node->addChild(new Text($method->invoke($instance)));
+           continue;
+         }
+         
 Index: skeleton/xml/PCData.class.php
 ===================================================================
---- skeleton/xml/PCData.class.php	(revision 14454)
+--- skeleton/xml/PCData.class.php	(revision 14616)
 +++ skeleton/xml/PCData.class.php	(working copy)
 @@ -4,6 +4,8 @@
   * $Id$

+    }
   }
 ?>
Index: skeleton/xml/meta/Marshaller.class.php
===================================================================
--- skeleton/xml/meta/Marshaller.class.php	(revision 14454)
+++ skeleton/xml/meta/Marshaller.class.php	(working copy)
@@ -63,7 +63,7 @@
         
         // Node content
         if ('.' == $element) {
-          $node->setContent($method->invoke($instance));
+          $node->addChild(new Text($method->invoke($instance)));
           continue;
         }
         
Index: skeleton/xml/Tree.class.php
===================================================================
--- skeleton/xml/Tree.class.php	(revision 14454)
+++ skeleton/xml/Tree.class.php	(working copy)
@@ -5,9 +5,10 @@
  */
  
   uses(
-    'xml.parser.XMLParser',
-    'xml.Node',
-    'xml.parser.ParserCallback'
+    'xml.parser.TreeParser',
+    'xml.parser.StreamInputSource',
+    'xml.parser.StringInputSource',
+    'xml.Node'
   );
  
   /**
@@ -15,19 +16,14 @@
    * to and imported from an XML document.
    *
    * @test     xp://net.xp_framework.unittest.xml.TreeTest
-   * @see      xp://xml.parser.XMLParser
+   * @see      xp://xml.parser.TreeParser
    * @purpose  Tree
    */
-  class Tree extends Object implements ParserCallback {

      * @param   io.File file
      * @param   string c default __CLASS__ class name
      * @return  xml.Tree
@@ -145,89 +134,22 @@
      * @throws  io.IOException in case reading the file fails
      */ 
     public static function fromFile($file, $c= __CLASS__) {
