[gxml/serialization: 30/33] Merge branch 'newattr' into serialization

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 88e9043a8c35bcd75b6c9b4a9a42cdea8d8173b5
Merge: 05b08af d2a5ab9
Author: Daniel Espinosa <esodan gmail com>
Date:   Thu Dec 12 14:55:00 2013 -0600

    Merge branch 'newattr' into serialization
    
    Conflicts:
        gxml/Makefile.am
        gxml/NamespaceAttr.vala
        test/GXmlTest.vala
        test/Makefile.am

 DESIGN                        |  102 ++++++++++++
 gxml/Attr.vala                |  172 ++++++++------------
 gxml/BackedNode.vala          |   36 ++---
 gxml/Document.vala            |   62 ++------
 gxml/Element.vala             |  161 ++-----------------
 gxml/Error.vala               |   15 ++
 gxml/Makefile.am              |   18 ++-
 gxml/NamedNodeMap.vala        |  147 +++++++++++++++++
 gxml/NamespaceAttr.vala       |    2 +-
 gxml/Node.vala                |   41 ++++-
 gxml/NodeList.vala            |   27 ++--
 gxml/XPathError.vala          |   43 +++++
 gxml/XPathExpression.vala     |  117 ++++++++++++++
 gxml/XPathNSResolver.vala     |   64 ++++++++
 gxml/XPathResult.vala         |  208 ++++++++++++++++++++++++
 test/DocumentTest.vala        |    6 +-
 test/ElementTest.vala         |   21 ++--
 test/GXmlTest.vala            |   12 ++-
 test/Makefile.am              |    5 +
 test/SerializableTest.vala    |    2 +-
 test/SerializationTest.vala   |    3 +-
 test/XPathExpressionTest.vala |  353 +++++++++++++++++++++++++++++++++++++++++
 test/XPathNSResolverTest.vala |   22 +++
 test/XPathResultTest.vala     |  153 ++++++++++++++++++
 test/test_invalid.xml         |    4 +
 test/test_with_ns.xml         |   63 ++++++++
 vapi/libxml-2.0.vapi          |   24 +++
 27 files changed, 1519 insertions(+), 364 deletions(-)
---
diff --cc gxml/Makefile.am
index ba77f74,800f595..28f5677
--- a/gxml/Makefile.am
+++ b/gxml/Makefile.am
@@@ -61,18 -55,15 +55,24 @@@ libgxml_la_SOURCES = 
        ProcessingInstruction.vala \
        Text.vala \
        Serializable.vala \
 +      Enumeration.vala \
 +      SerializableObjectModel.vala \
 +      SerializableJson.vala \
        Serialization.vala \
 +      SerializableGeeTreeMap.vala \
 +      SerializableGeeHashMap.vala \
 +      SerializableMapKey.vala \
 +      SerializableGeeDualKeyMap.vala \
 +      SerializableMapDualKey.vala \
 +      SerializableGeeArrayList.vala \
+       XPathError.vala \
+       XPathExpression.vala \
+       XPathNSResolver.vala \
+       XPathResult.vala \
        $(NULL)
  
+ # TODO: do we want XPath files in own directory?
+ 
  gxml.vala.stamp: $(libgxml_la_SOURCES)
  
  
diff --cc gxml/NamespaceAttr.vala
index ee9a508,8fe0ef9..759113e
--- a/gxml/NamespaceAttr.vala
+++ b/gxml/NamespaceAttr.vala
@@@ -32,13 -32,13 +32,13 @@@ namespace GXml 
         */
        public class NamespaceAttr : Node {
                /** Private properties */
-               private Xml.Ns *ns;
 -              internal Xml.Ns *node;  // XPATH:TODO: do they extend us?
++              private Xml.Ns *ns; // XPATH:TODO: do they extend us?
  
                /** Constructors */
 -              internal NamespaceAttr (Xml.Ns *node, Document doc) {
 +              internal NamespaceAttr (Xml.Ns *ns, Document doc) {
                        // TODO: wish valac would warn against using this. before calling base()
                        base (NodeType.ATTRIBUTE, doc); // TODO: want something other than ATTRIBUTE?
 -                      this.node = node;
 +                      this.ns = ns;
                }
  
                /* Public properties (Node general) */
diff --cc test/GXmlTest.vala
index 93c57d1,ed9f82d..34a9c89
--- a/test/GXmlTest.vala
+++ b/test/GXmlTest.vala
@@@ -37,13 -37,9 +37,16 @@@ class GXmlTest 
                ValaLibxml2Test.add_tests ();
                SerializationTest.add_tests ();
                SerializableTest.add_tests ();
 +              SerializableObjectModelTest.add_tests ();
 +              SerializableGeeTreeMapTest.add_tests ();
 +              SerializableGeeHashMapTest.add_tests ();
 +              SerializableGeeDualKeyMapTest.add_tests ();
 +              SerializableGeeArrayListTest.add_tests ();
 +              SerializableGeeCollectionsTest.add_tests ();
 +              SerializableBasicTypeTest.add_tests ();
+               XPathExpressionTest.add_tests ();
+               XPathNSResolverTest.add_tests ();
+               XPathResultTest.add_tests ();
  
                Test.run ();
  
diff --cc test/Makefile.am
index c6bbe6e,bc19782..307f386
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@@ -37,13 -37,9 +37,16 @@@ gxml_test_SOURCES = 
        ValaLibxml2Test.vala \
        SerializableTest.vala \
        SerializationTest.vala \
 +      SerializableObjectModelTest.vala \
 +      SerializableGeeTreeMapTest.vala \
 +      SerializableGeeDualKeyMapTest.vala \
 +      SerializableGeeArrayListTest.vala \
 +      SerializableGeeHashMapTest.vala \
 +      SerializableGeeCollectionsTest.vala \
 +      SerializableBasicTypesTest.vala \
+       XPathExpressionTest.vala \
+       XPathNSResolverTest.vala \
+       XPathResultTest.vala \
        $(NULL)
  
  gxml_test.vala.stamp: $(gxml_test_SOURCES)
@@@ -85,8 -81,10 +88,10 @@@ gxml_test_LDFLAGS = $(AM_LDFLAGS
  
  BUILT_SOURCES = gxml_test.vala.stamp
  
 -CLEANFILES =  $(BUILT_SOURCES) gxml_test
 +CLEANFILES = $(gxml_test_SOURCES:.vala=.c) $(BUILT_SOURCES) gxml_test
  
+ # TODO: should we add *.c to this list?, or is there a var of generated .c we can put in CLEANFILES?
+ 
  DISTCLEANFILES = _serialization_test_*.xml
  
  EXTRA_DIST += \