From 45c31a649ea6c334577bca293350affdfdc819c2 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sat, 11 Apr 2009 15:07:23 +0200
Subject: Add a default value to the 'available' attribute

---
 dist/examples/cxx/hybrid/library/makefile     | 3 ++-
 dist/examples/cxx/hybrid/library/nmakefile    | 3 ++-
 examples/cxx/hybrid/binary/cdr/library.xml    | 2 +-
 examples/cxx/hybrid/binary/cdr/library.xsd    | 2 +-
 examples/cxx/hybrid/binary/custom/library.xml | 2 +-
 examples/cxx/hybrid/binary/custom/library.xsd | 2 +-
 examples/cxx/hybrid/binary/xdr/library.xml    | 2 +-
 examples/cxx/hybrid/binary/xdr/library.xsd    | 2 +-
 examples/cxx/hybrid/library/README            | 7 +++++--
 examples/cxx/hybrid/library/driver.cxx        | 1 -
 examples/cxx/hybrid/library/library.xml       | 2 +-
 examples/cxx/hybrid/library/library.xsd       | 2 +-
 examples/cxx/hybrid/library/makefile          | 2 +-
 13 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/dist/examples/cxx/hybrid/library/makefile b/dist/examples/cxx/hybrid/library/makefile
index be92939..2b1e09e 100644
--- a/dist/examples/cxx/hybrid/library/makefile
+++ b/dist/examples/cxx/hybrid/library/makefile
@@ -38,7 +38,8 @@ library-simpl.o: library-simpl.cxx
 %.hxx %.cxx %-pskel.hxx %-pskel.cxx %-pimpl.hxx %-pimpl.cxx \
 %-sskel.hxx %-sskel.cxx %-simpl.hxx %-simpl.cxx: %.xsd
 	$(root)/bin/xsde cxx-hybrid $(XSDFLAGS) $(EXTRA_XSDFLAGS) \
---generate-parser --generate-serializer --generate-aggregate $<
+--generate-parser --generate-serializer --generate-aggregate \
+--omit-default-attributes $<
 
 # Test.
 #
diff --git a/dist/examples/cxx/hybrid/library/nmakefile b/dist/examples/cxx/hybrid/library/nmakefile
index b5a622b..a8c1730 100644
--- a/dist/examples/cxx/hybrid/library/nmakefile
+++ b/dist/examples/cxx/hybrid/library/nmakefile
@@ -37,7 +37,8 @@ library-pskel.cxx library-pskel.hxx library-pimpl.cxx library-pimpl.hxx \
 library-sskel.cxx library-sskel.hxx library-simpl.cxx library-simpl.hxx \
 : library.xsd
 	$(root)\bin\xsde.exe cxx-hybrid $(XSDFLAGS) $(EXTRA_XSDFLAGS) \
---generate-parser --generate-serializer --generate-aggregate library.xsd
+--generate-parser --generate-serializer --generate-aggregate \
+--omit-default-attributes library.xsd
 
 # Test.
 #
diff --git a/examples/cxx/hybrid/binary/cdr/library.xml b/examples/cxx/hybrid/binary/cdr/library.xml
index 6bfb4d8..d1abde8 100644
--- a/examples/cxx/hybrid/binary/cdr/library.xml
+++ b/examples/cxx/hybrid/binary/cdr/library.xml
@@ -25,7 +25,7 @@ copyright : not copyrighted - public domain
   </book>
 
 
-  <book available="true" >
+  <book>
     <isbn>0679600841</isbn>
     <title>War and Peace</title>
     <genre>history</genre>
diff --git a/examples/cxx/hybrid/binary/cdr/library.xsd b/examples/cxx/hybrid/binary/cdr/library.xsd
index 0b0d9d1..3e989c1 100644
--- a/examples/cxx/hybrid/binary/cdr/library.xsd
+++ b/examples/cxx/hybrid/binary/cdr/library.xsd
@@ -53,7 +53,7 @@ copyright : not copyrighted - public domain
       <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" use="required"/>
+    <xsd:attribute name="available" type="xsd:boolean" default="true"/>
   </xsd:complexType>
 
 
diff --git a/examples/cxx/hybrid/binary/custom/library.xml b/examples/cxx/hybrid/binary/custom/library.xml
index e93bab4..d5dcf7e 100644
--- a/examples/cxx/hybrid/binary/custom/library.xml
+++ b/examples/cxx/hybrid/binary/custom/library.xml
@@ -25,7 +25,7 @@ copyright : not copyrighted - public domain
   </book>
 
 
-  <book available="true" >
+  <book>
     <isbn>0679600841</isbn>
     <title>War and Peace</title>
     <genre>history</genre>
diff --git a/examples/cxx/hybrid/binary/custom/library.xsd b/examples/cxx/hybrid/binary/custom/library.xsd
index 7b75c2d..12e2065 100644
--- a/examples/cxx/hybrid/binary/custom/library.xsd
+++ b/examples/cxx/hybrid/binary/custom/library.xsd
@@ -53,7 +53,7 @@ copyright : not copyrighted - public domain
       <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" use="required"/>
+    <xsd:attribute name="available" type="xsd:boolean" default="true"/>
   </xsd:complexType>
 
 
diff --git a/examples/cxx/hybrid/binary/xdr/library.xml b/examples/cxx/hybrid/binary/xdr/library.xml
index ee5f771..ca9f5ed 100644
--- a/examples/cxx/hybrid/binary/xdr/library.xml
+++ b/examples/cxx/hybrid/binary/xdr/library.xml
@@ -25,7 +25,7 @@ copyright : not copyrighted - public domain
   </book>
 
 
-  <book available="true" >
+  <book>
     <isbn>0679600841</isbn>
     <title>War and Peace</title>
     <genre>history</genre>
diff --git a/examples/cxx/hybrid/binary/xdr/library.xsd b/examples/cxx/hybrid/binary/xdr/library.xsd
index 5e411d9..f207772 100644
--- a/examples/cxx/hybrid/binary/xdr/library.xsd
+++ b/examples/cxx/hybrid/binary/xdr/library.xsd
@@ -53,7 +53,7 @@ copyright : not copyrighted - public domain
       <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" use="required"/>
+    <xsd:attribute name="available" type="xsd:boolean" default="true"/>
   </xsd:complexType>
 
 
diff --git a/examples/cxx/hybrid/library/README b/examples/cxx/hybrid/library/README
index b44c462..6490c3e 100644
--- a/examples/cxx/hybrid/library/README
+++ b/examples/cxx/hybrid/library/README
@@ -27,8 +27,11 @@ library-pimpl.cxx
   skeletons (the fourth pair), and serializer implementations (the
   fifth pair). These files are generated by the XSD/e compiler from
   library.xsd. The --generate-parser, --generate-serializer, and 
-  --generate-aggregate options were used to request the generation
-  of the parsing and serialization code.
+  --generate-aggregate options were used to request the generation of
+  the parsing and serialization code. The --omit-default-attributes
+  option was used to omit the 'available' attributes with the default
+  value from the serialized XML documents.
+  
 
 driver.cxx
   Driver for the example. It first calls the parser that constructs
diff --git a/examples/cxx/hybrid/library/driver.cxx b/examples/cxx/hybrid/library/driver.cxx
index 7b010ab..5aa406e 100644
--- a/examples/cxx/hybrid/library/driver.cxx
+++ b/examples/cxx/hybrid/library/driver.cxx
@@ -99,7 +99,6 @@ main (int argc, char* argv[])
     //
     {
       auto_ptr<book> b (new book);
-      b->available (true);
 
       isbn n;
       n.base_value (679776443);
diff --git a/examples/cxx/hybrid/library/library.xml b/examples/cxx/hybrid/library/library.xml
index 6c75d3c..449256d 100644
--- a/examples/cxx/hybrid/library/library.xml
+++ b/examples/cxx/hybrid/library/library.xml
@@ -25,7 +25,7 @@ copyright : not copyrighted - public domain
   </book>
 
 
-  <book available="true" >
+  <book>
     <isbn>0679600841</isbn>
     <title>War and Peace</title>
     <genre>history</genre>
diff --git a/examples/cxx/hybrid/library/library.xsd b/examples/cxx/hybrid/library/library.xsd
index d276894..e2cae44 100644
--- a/examples/cxx/hybrid/library/library.xsd
+++ b/examples/cxx/hybrid/library/library.xsd
@@ -53,7 +53,7 @@ copyright : not copyrighted - public domain
       <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" use="required"/>
+    <xsd:attribute name="available" type="xsd:boolean" default="true"/>
   </xsd:complexType>
 
 
diff --git a/examples/cxx/hybrid/library/makefile b/examples/cxx/hybrid/library/makefile
index f0dbae1..b937289 100644
--- a/examples/cxx/hybrid/library/makefile
+++ b/examples/cxx/hybrid/library/makefile
@@ -43,7 +43,7 @@ gen := $(addprefix $(out_base)/,$(genf))
 $(gen): $(out_root)/xsde/xsde
 $(gen): xsde := $(out_root)/xsde/xsde
 $(gen): xsde_options += --generate-parser --generate-serializer \
---generate-aggregate
+--generate-aggregate --omit-default-attributes
 
 $(call include-dep,$(dep))
 
-- 
cgit v1.1