Housekeeping

git-svn-id: https://svn.middleware.georgetown.edu/cpp-xmltooling/trunk@27 de75baf8-a10c-0410-a50a-987c0e22f00f

diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
index d949703..1fc91c8 100644 (file)
--- a/xmltooling/Makefile.am
+++ b/xmltooling/Makefile.am
@@ -8,7 +8,6 @@ libxmltoolingincludedir = \
 libxmltoolinginclude_HEADERS = \
        AbstractDOMCachingXMLObject.h \
        AbstractXMLObject.h \
-       AbstractXMLObjectBuilder.h \
        base.h \
        config_pub.h \
        DOMCachingXMLObject.h \
@@ -23,13 +22,21 @@ libxmltoolinginclude_HEADERS = \
        XMLToolingConfig.h
 
 utilincludedir = \
-        $(includedir)/xmltooling/util
+    $(includedir)/xmltooling/util
 
 utilinclude_HEADERS = \
-        util/NDC.h \
-        util/ParserPool.h \
-        util/XMLConstants.h \
-        util/XMLHelper.h
+    util/NDC.h \
+    util/ParserPool.h \
+    util/XMLConstants.h \
+    util/XMLHelper.h
+
+ioincludedir = \
+    $(includedir)/xmltooling/io
+
+ioinclude_HEADERS = \
+       io/AbstractXMLObjectUnmarshaller.h \
+    io/Marshaller.h \
+    io/Unmarshaller.h
 
 noinst_HEADERS = \
        internal.h
@@ -39,7 +46,11 @@ libxmltooling_la_SOURCES = \
        Namespace.cpp \
        QName.cpp \
        unicode.cpp \
+       XMLObjectBuilder.cpp \
        XMLToolingConfig.cpp \
+       io/AbstractXMLObjectUnmarshaller.cpp \
+       io/Marshaller.cpp \
+       io/Unmarshaller.cpp \
        util/NDC.cpp \
        util/ParserPool.cpp \
        util/XMLConstants.cpp \

diff --git a/xmltooling/exceptions.h b/xmltooling/exceptions.h
index 914c536..2be4cf8 100644 (file)
--- a/xmltooling/exceptions.h
+++ b/xmltooling/exceptions.h
@@ -15,7 +15,7 @@
  */\r
 \r
 /**\r
- * @file exception.h\r
+ * @file exceptions.h\r
  * \r
  * Exception classes\r
  */\r
@@ -57,6 +57,8 @@ namespace xmltooling {
     DECL_XMLTOOLING_EXCEPTION(XMLObjectException);\r
     DECL_XMLTOOLING_EXCEPTION(MarshallingException);\r
     DECL_XMLTOOLING_EXCEPTION(UnmarshallingException);\r
+    DECL_XMLTOOLING_EXCEPTION(UnknownElementException);\r
+    DECL_XMLTOOLING_EXCEPTION(UnknownAttributeException);\r
 \r
 };\r
 \r

diff --git a/xmltooling/xmltooling.vcproj b/xmltooling/xmltooling.vcproj
index c5c9826..6f02046 100644 (file)
--- a/xmltooling/xmltooling.vcproj
+++ b/xmltooling/xmltooling.vcproj
@@ -198,6 +198,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath=".\XMLObjectBuilder.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\XMLToolingConfig.cpp"\r
                                >\r
                        </File>\r
@@ -221,6 +225,22 @@
                                        >\r
                                </File>\r
                        </Filter>\r
+                       <Filter\r
+                               Name="io"\r
+                               >\r
+                               <File\r
+                                       RelativePath=".\io\AbstractXMLObjectUnmarshaller.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\io\Marshaller.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\io\Unmarshaller.cpp"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
                </Filter>\r
                <Filter\r
                        Name="Header Files"\r
@@ -236,10 +256,6 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\AbstractXMLObjectBuilder.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
                                RelativePath=".\base.h"\r
                                >\r
                        </File>\r
@@ -311,6 +327,22 @@
                                        >\r
                                </File>\r
                        </Filter>\r
+                       <Filter\r
+                               Name="io"\r
+                               >\r
+                               <File\r
+                                       RelativePath=".\io\AbstractXMLObjectUnmarshaller.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\io\Marshaller.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\io\Unmarshaller.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
                </Filter>\r
                <Filter\r
                        Name="Resource Files"\r