Merge branch 'feature/upstream' into develop

5 files changed, 0 insertions, 419 deletions

diff --git a/xsd/examples/cxx/tree/caching/README b/xsd/examples/cxx/tree/caching/README
deleted file mode 100644
index 64e5a1a..0000000
--- a/xsd/examples/cxx/tree/caching/README
+++ /dev/null
@@ -1,29 +0,0 @@
-This example shows how to use the C++/Tree mapping to parse several
-XML documents while reusing the underlying XML parser and caching the
-schemas used for validation.
-
-The example consists of the following files:
-
-library.xsd
-  XML Schema which describes a library of books.
-
-library.xml
-  Sample XML instance document.
-
-library.hxx
-library.cxx
-  C++ types that represent the given vocabulary and a set of parsing
-  functions that convert XML instance documents to a tree-like in-memory
-  object model. These are generated by XSD from library.xsd.
-
-driver.cxx
-  Driver for the example. It first sets up the Xerces-C++ DOM parser
-  and caches the library.xsd schema for validation. It then performs
-  ten iterations that parse the input file to a DOM document using
-  the DOM parser and call one of the parsing functions that constructs
-  the object model from this DOM document. On each iteration the driver
-  prints a number of books in the object model to STDERR.
-
-To run the example on the sample XML instance document simply execute:
-
-$ ./driver library.xml
diff --git a/xsd/examples/cxx/tree/caching/driver.cxx b/xsd/examples/cxx/tree/caching/driver.cxx
deleted file mode 100644
index 2aa9396..0000000
--- a/xsd/examples/cxx/tree/caching/driver.cxx
+++ /dev/null
@@ -1,165 +0,0 @@
-// file      : examples/cxx/tree/caching/driver.cxx
-// copyright : not copyrighted - public domain
-
-#include <memory>   // std::auto_ptr
-#include <fstream>
-#include <iostream>
-
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/util/XMLUniDefs.hpp> // chLatin_*
-#include <xercesc/util/PlatformUtils.hpp>
-#include <xercesc/validators/common/Grammar.hpp> // xercesc::Grammar
-#include <xercesc/framework/Wrapper4InputSource.hpp>
-
-#include <xsd/cxx/xml/dom/auto-ptr.hxx>
-#include <xsd/cxx/xml/dom/bits/error-handler-proxy.hxx>
-#include <xsd/cxx/xml/sax/std-input-source.hxx>
-
-#include <xsd/cxx/tree/error-handler.hxx>
-
-#include "library.hxx"
-
-using namespace std;
-
-int
-main (int argc, char* argv[])
-{
-  if (argc != 2)
-  {
-    cerr << "usage: " << argv[0] << " library.xml" << endl;
-    return 1;
-  }
-
-  int r (0);
-
-  // We need to initialize the Xerces-C++ runtime because we
-  // are doing the XML-to-DOM parsing ourselves.
-  //
-  xercesc::XMLPlatformUtils::Initialize ();
-
-  try
-  {
-    using namespace xercesc;
-    namespace xml = xsd::cxx::xml;
-    namespace tree = xsd::cxx::tree;
-
-    const XMLCh ls_id [] = {chLatin_L, chLatin_S, chNull};
-
-    // Get an implementation of the Load-Store (LS) interface.
-    //
-    DOMImplementation* impl (
-      DOMImplementationRegistry::getDOMImplementation (ls_id));
-
-    xml::dom::auto_ptr<DOMLSParser> parser (
-      impl->createLSParser (DOMImplementationLS::MODE_SYNCHRONOUS, 0));
-
-    DOMConfiguration* conf (parser->getDomConfig ());
-
-    // Discard comment nodes in the document.
-    //
-    conf->setParameter (XMLUni::fgDOMComments, false);
-
-    // Enable datatype normalization.
-    //
-    conf->setParameter (XMLUni::fgDOMDatatypeNormalization, true);
-
-    // Do not create EntityReference nodes in the DOM tree. No
-    // EntityReference nodes will be created, only the nodes
-    // corresponding to their fully expanded substitution text
-    // will be created.
-    //
-    conf->setParameter (XMLUni::fgDOMEntities, false);
-
-    // Perform namespace processing.
-    //
-    conf->setParameter (XMLUni::fgDOMNamespaces, true);
-
-    // Do not include ignorable whitespace in the DOM tree.
-    //
-    conf->setParameter (XMLUni::fgDOMElementContentWhitespace, false);
-
-    // Enable validation.
-    //
-    conf->setParameter (XMLUni::fgDOMValidate, true);
-    conf->setParameter (XMLUni::fgXercesSchema, true);
-    conf->setParameter (XMLUni::fgXercesSchemaFullChecking, false);
-
-    // Xerces-C++ 3.1.0 is the first version with working multi import
-    // support.
-    //
-#if _XERCES_VERSION >= 30100
-    conf->setParameter (XMLUni::fgXercesHandleMultipleImports, true);
-#endif
-
-    // Set error handler.
-    //
-    tree::error_handler<char> eh;
-    xml::dom::bits::error_handler_proxy<char> ehp (eh);
-    conf->setParameter (XMLUni::fgDOMErrorHandler, &ehp);
-
-    // Initialize the schema cache.
-    //
-    if (!parser->loadGrammar ("library.xsd", Grammar::SchemaGrammarType, true))
-    {
-      // In Xerces-C++ grammar loading failure results in just a warning.
-      // Make it a fatal error.
-      //
-      eh.handle ("library.xsd", 0, 0,
-                 tree::error_handler<char>::severity::fatal,
-                 "unable to load schema");
-    }
-
-    eh.throw_if_failed<xml_schema::parsing> ();
-
-    // Use the loaded grammar during parsing.
-    //
-    conf->setParameter (XMLUni::fgXercesUseCachedGrammarInParse, true);
-
-    // Disable loading schemas via other means (e.g., schemaLocation).
-    //
-    conf->setParameter (XMLUni::fgXercesLoadSchema, false);
-
-    // We will release the DOM document ourselves.
-    //
-    conf->setParameter (XMLUni::fgXercesUserAdoptsDOMDocument, true);
-
-    // Parse XML documents.
-    //
-    for (unsigned long i (0); i < 10; ++i)
-    {
-      ifstream ifs;
-      ifs.exceptions (ifstream::badbit | ifstream::failbit);
-      ifs.open (argv[1]);
-
-      // Wrap the standard input stream.
-      //
-      xml::sax::std_input_source isrc (ifs, argv[1]);
-      Wrapper4InputSource wrap (&isrc, false);
-
-      // Parse XML to DOM.
-      //
-      xml_schema::dom::auto_ptr<DOMDocument> doc (parser->parse (&wrap));
-
-      eh.throw_if_failed<xml_schema::parsing> ();
-
-      // Parse DOM to the object model.
-      //
-      auto_ptr<library::catalog> c (library::catalog_ (*doc));
-
-      cerr << "catalog with " << c->book ().size () << " books" << endl;
-    }
-  }
-  catch (const xml_schema::exception& e)
-  {
-    cerr << e << endl;
-    r = 1;
-  }
-  catch (const std::ios_base::failure&)
-  {
-    cerr << argv[1] << ": unable to open or read failure" << endl;
-    r = 1;
-  }
-
-  xercesc::XMLPlatformUtils::Terminate ();
-  return r;
-}
diff --git a/xsd/examples/cxx/tree/caching/library.xml b/xsd/examples/cxx/tree/caching/library.xml
deleted file mode 100644
index 6d4d6f1..0000000
--- a/xsd/examples/cxx/tree/caching/library.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-
-file      : examples/cxx/tree/caching/library.xml
-copyright : not copyrighted - public domain
-
--->
-
-<lib:catalog xmlns:lib="http://www.codesynthesis.com/library"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	     xsi:schemaLocation="http://www.codesynthesis.com/library library.xsd">
-
-  <book id="MM" available="false">
-    <isbn>0679760806</isbn>
-    <title>The Master and Margarita</title>
-    <genre>fiction</genre>
-
-    <author recommends="WP">
-      <name>Mikhail Bulgakov</name>
-      <born>1891-05-15</born>
-      <died>1940-03-10</died>
-    </author>
-  </book>
-
-
-  <book id="WP">
-    <isbn>0679600841</isbn>
-    <title>War and Peace</title>
-    <genre>history</genre>
-
-    <author recommends="CP">
-      <name>Leo Tolstoy</name>
-      <born>1828-09-09</born>
-      <died>1910-11-20</died>
-    </author>
-  </book>
-
-
-  <book id="CP" available="false">
-    <isbn>0679420290</isbn>
-    <title>Crime and Punishment</title>
-    <genre>philosophy</genre>
-
-    <author>
-      <name>Fyodor Dostoevsky</name>
-      <born>1821-11-11</born>
-      <died>1881-02-09</died>
-    </author>
-  </book>
-
-</lib:catalog>
diff --git a/xsd/examples/cxx/tree/caching/library.xsd b/xsd/examples/cxx/tree/caching/library.xsd
deleted file mode 100644
index a46c558..0000000
--- a/xsd/examples/cxx/tree/caching/library.xsd
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-
-file      : examples/cxx/tree/caching/library.xsd
-copyright : not copyrighted - public domain
-
--->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:xse="http://www.codesynthesis.com/xmlns/xml-schema-extension"
-            xmlns:lib="http://www.codesynthesis.com/library"
-            targetNamespace="http://www.codesynthesis.com/library">
-
-  <xsd:simpleType name="isbn">
-    <xsd:restriction base="xsd:unsignedInt"/>
-  </xsd:simpleType>
-
-  <xsd:complexType name="title">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-        <xsd:attribute name="lang" type="xsd:language"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-  <xsd:simpleType name="genre">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="romance"/>
-      <xsd:enumeration value="fiction"/>
-      <xsd:enumeration value="horror"/>
-      <xsd:enumeration value="history"/>
-      <xsd:enumeration value="philosophy"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:complexType name="person">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="born" type="xsd:date"/>
-      <xsd:element name="died" type="xsd:date" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="author">
-    <xsd:complexContent>
-      <xsd:extension base="lib:person">
-	<xsd:attribute name="recommends" type="xsd:IDREF" xse:refType="lib:book"/>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-
-  <xsd:complexType name="book">
-    <xsd:sequence>
-      <xsd:element name="isbn" type="lib:isbn"/>
-      <xsd:element name="title" type="lib:title"/>
-      <xsd:element name="genre" type="lib:genre"/>
-      <xsd:element name="author" type="lib:author" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="available" type="xsd:boolean" default="true"/>
-    <xsd:attribute name="id" type="xsd:ID" use="required"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="catalog">
-    <xsd:sequence>
-      <xsd:element name="book" type="lib:book" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:element name="catalog" type="lib:catalog"/>
-
-</xsd:schema>
diff --git a/xsd/examples/cxx/tree/caching/makefile b/xsd/examples/cxx/tree/caching/makefile
deleted file mode 100644
index cb9b191..0000000
--- a/xsd/examples/cxx/tree/caching/makefile
+++ /dev/null
@@ -1,101 +0,0 @@
-# file      : examples/cxx/tree/caching/makefile
-# copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
-# license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make
-
-xsd := library.xsd
-cxx := driver.cxx
-
-obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o))
-dep := $(obj:.o=.o.d)
-
-driver   := $(out_base)/driver
-install  := $(out_base)/.install
-dist     := $(out_base)/.dist
-dist-win := $(out_base)/.dist-win
-clean    := $(out_base)/.clean
-
-
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/libxerces-c/stub.make,\
-  l: xerces_c.l,cpp-options: xerces_c.l.cpp-options)
-
-
-# Build.
-#
-$(driver): $(obj) $(xerces_c.l)
-
-$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd
-$(obj) $(dep): $(xerces_c.l.cpp-options)
-
-genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx)
-gen  := $(addprefix $(out_base)/,$(genf))
-
-$(gen): xsd := $(out_root)/xsd/xsd
-$(gen): $(out_root)/xsd/xsd
-
-$(call include-dep,$(dep),$(obj),$(gen))
-
-# Convenience alias for default target.
-#
-$(out_base)/: $(driver)
-
-
-# Install & Dist.
-#
-dist-common := $(out_base)/.dist-common
-
-$(install) $(dist) $(dist-win) $(dist-common): path := $(subst $(src_root)/,,$(src_base))
-
-$(install):
-	$(call install-data,$(src_base)/README,$(install_doc_dir)/xsd/$(path)/README)
-	$(call install-data,$(src_base)/driver.cxx,$(install_doc_dir)/xsd/$(path)/driver.cxx)
-	$(call install-data,$(src_base)/library.xsd,$(install_doc_dir)/xsd/$(path)/library.xsd)
-	$(call install-data,$(src_base)/library.xml,$(install_doc_dir)/xsd/$(path)/library.xml)
-
-$(dist-common):
-	$(call install-data,$(src_base)/driver.cxx,$(dist_prefix)/$(path)/driver.cxx)
-	$(call install-data,$(src_base)/library.xsd,$(dist_prefix)/$(path)/library.xsd)
-	$(call install-data,$(src_base)/library.xml,$(dist_prefix)/$(path)/library.xml)
-
-$(dist): $(dist-common)
-	$(call install-data,$(src_base)/README,$(dist_prefix)/$(path)/README)
-
-$(dist-win): $(dist-common)
-	$(call install-data,$(src_base)/README,$(dist_prefix)/$(path)/README.txt)
-	$(call message,,todos $(dist_prefix)/$(path)/README.txt)
-
-
-# Clean.
-#
-$(clean): $(driver).o.clean                            \
-  $(addsuffix .cxx.clean,$(obj))                       \
-  $(addsuffix .cxx.clean,$(dep))                       \
-  $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean))
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(gen): | $(out_base)/.gitignore
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver $(genf)
-$(clean): $(out_base)/.gitignore.clean
-
-$(call include,$(bld_root)/git/gitignore.make)
-endif
-
-# How to.
-#
-$(call include,$(bld_root)/cxx/o-e.make)
-$(call include,$(bld_root)/cxx/cxx-o.make)
-$(call include,$(bld_root)/cxx/cxx-d.make)
-$(call include,$(bld_root)/install.make)
-$(call include,$(scf_root)/xsd/tree/xsd-cxx.make)
-
-# Dependencies.
-#
-$(call import,$(src_root)/xsd/makefile)