 -      }
 +    public function toString() {
 +      return sprintf(
-+        "%s(version= %s encoding=%s) {\n  %s\n}",
++        "%s(version=%s encoding=%s)@{\n  %s\n}",
 +        $this->getClassName(),
 +        $this->version,
 +        $this->encoding,

     
Index: ports/classes/net/xp_framework/unittest/xml/TreeTest.class.php
===================================================================
--- ports/classes/net/xp_framework/unittest/xml/TreeTest.class.php	(revision 14454)
+++ ports/classes/net/xp_framework/unittest/xml/TreeTest.class.php	(working copy)
@@ -72,12 +72,10 @@
      */

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 14616)
+++ skeleton/xml/PCData.class.php	(working copy)
@@ -4,6 +4,8 @@
  * $Id$
