Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-maxExclusive/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-maxExclusive/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-maxExclusive/test.xsd	(revision 0)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.8.4 Constraints on maxExclusive Schema Components
+  Schema Component Constraint: maxInclusive and maxExclusive
+    It is an error for both maxInclusive and maxExclusive
+    to be specified in the same derivation step of a datatype definition.
+
+http://www.w3.org/TR/xmlschema-2/#maxInclusive-maxExclusive
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:maxExclusive value="1"/>
+			<xsd:maxInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st1" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-maxExclusive/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-maxExclusive/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-maxExclusive/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because both maxExclusive
+				and maxInclusive are specified
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[1]/case-1/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[1]/case-1/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[1]/case-1/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.10.4 Constraints on minInclusive Schema Components
+  Schema Component Constraint: minInclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [1] minInclusive is among the members of {facets}
+        of {base type definition} and {value} is less than
+        the {value} of the parent minInclusive
+
+http://www.w3.org/TR/xmlschema-2/#minInclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:minInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[1]/case-1/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[1]/case-1/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[1]/case-1/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because minInclusive is equal to
+				the parent minInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[1]/case-2/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[1]/case-2/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[1]/case-2/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.10.4 Constraints on minInclusive Schema Components
+  Schema Component Constraint: minInclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [1] minInclusive is among the members of {facets}
+        of {base type definition} and {value} is less than
+        the {value} of the parent minInclusive
+
+http://www.w3.org/TR/xmlschema-2/#minInclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:minInclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[1]/case-2/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[1]/case-2/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[1]/case-2/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because minInclusive is greater than
+				the parent minInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[1]/case-3/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[1]/case-3/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[1]/case-3/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.10.4 Constraints on minInclusive Schema Components
+  Schema Component Constraint: minInclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [1] minInclusive is among the members of {facets}
+        of {base type definition} and {value} is less than
+        the {value} of the parent minInclusive
+
+http://www.w3.org/TR/xmlschema-2/#minInclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minInclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:minInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[1]/case-3/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[1]/case-3/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[1]/case-3/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because minInclusive is less than
+				the parent minInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[2]/case-1/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[2]/case-1/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[2]/case-1/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.10.4 Constraints on minInclusive Schema Components
+  Schema Component Constraint: minInclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [2] maxInclusive is among the members of {facets}
+        of {base type definition} and {value} is greater than
+        the {value} of the parent maxInclusive
+
+http://www.w3.org/TR/xmlschema-2/#minInclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:maxInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:minInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[2]/case-1/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[2]/case-1/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[2]/case-1/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because minInclusive is equal to
+				the parent maxInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[2]/case-2/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[2]/case-2/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[2]/case-2/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.10.4 Constraints on minInclusive Schema Components
+  Schema Component Constraint: minInclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [2] maxInclusive is among the members of {facets}
+        of {base type definition} and {value} is greater than
+        the {value} of the parent maxInclusive
+
+http://www.w3.org/TR/xmlschema-2/#minInclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:maxInclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:minInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[2]/case-2/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[2]/case-2/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[2]/case-2/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because minInclusive is less than
+				the parent maxInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[2]/case-3/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[2]/case-3/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[2]/case-3/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.10.4 Constraints on minInclusive Schema Components
+  Schema Component Constraint: minInclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [2] maxInclusive is among the members of {facets}
+        of {base type definition} and {value} is greater than
+        the {value} of the parent maxInclusive
+
+http://www.w3.org/TR/xmlschema-2/#minInclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:maxInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:minInclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[2]/case-3/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[2]/case-3/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[2]/case-3/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because minInclusive is greater than
+				the parent maxInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[3]/case-1/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[3]/case-1/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[3]/case-1/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.10.4 Constraints on minInclusive Schema Components
+  Schema Component Constraint: minInclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [3] minExclusive is among the members of {facets}
+        of {base type definition} and {value} is less than
+        or equal to the {value} of the parent minExclusive
+
+http://www.w3.org/TR/xmlschema-2/#minInclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:minInclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[3]/case-1/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[3]/case-1/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[3]/case-1/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because minInclusive is greater than
+				the parent minExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[3]/case-2/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[3]/case-2/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[3]/case-2/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.10.4 Constraints on minInclusive Schema Components
+  Schema Component Constraint: minInclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [3] minExclusive is among the members of {facets}
+        of {base type definition} and {value} is less than
+        or equal to the {value} of the parent minExclusive
+
+http://www.w3.org/TR/xmlschema-2/#minInclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:minInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[3]/case-2/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[3]/case-2/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[3]/case-2/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because minInclusive is equal to
+				the parent minExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[3]/case-3/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[3]/case-3/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[3]/case-3/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.10.4 Constraints on minInclusive Schema Components
+  Schema Component Constraint: minInclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [3] minExclusive is among the members of {facets}
+        of {base type definition} and {value} is less than
+        or equal to the {value} of the parent minExclusive
+
+http://www.w3.org/TR/xmlschema-2/#minInclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minExclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:minInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[3]/case-3/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[3]/case-3/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[3]/case-3/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because minInclusive is less than
+				the parent minExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[4]/case-1/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[4]/case-1/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[4]/case-1/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.10.4 Constraints on minInclusive Schema Components
+  Schema Component Constraint: minInclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [4] maxExclusive is among the members of {facets}
+        of {base type definition} and {value} is greater than
+        or equal to the {value} of the parent maxExclusive
+
+http://www.w3.org/TR/xmlschema-2/#minInclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:maxExclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:minInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[4]/case-1/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[4]/case-1/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[4]/case-1/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because minInclusive is less than
+				the parent maxExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[4]/case-2/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[4]/case-2/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[4]/case-2/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.10.4 Constraints on minInclusive Schema Components
+  Schema Component Constraint: minInclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [4] maxExclusive is among the members of {facets}
+        of {base type definition} and {value} is greater than
+        or equal to the {value} of the parent maxExclusive
+
+http://www.w3.org/TR/xmlschema-2/#minInclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:maxExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:minInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[4]/case-2/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[4]/case-2/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[4]/case-2/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because minInclusive is equal to
+				the parent maxExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[4]/case-3/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[4]/case-3/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[4]/case-3/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.10.4 Constraints on minInclusive Schema Components
+  Schema Component Constraint: minInclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [4] maxExclusive is among the members of {facets}
+        of {base type definition} and {value} is greater than
+        or equal to the {value} of the parent maxExclusive
+
+http://www.w3.org/TR/xmlschema-2/#minInclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:maxExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:minInclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[4]/case-3/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[4]/case-3/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-valid-restriction/[4]/case-3/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because minInclusive is greater than
+				the parent maxExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[1]/case-1/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[1]/case-1/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[1]/case-1/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.7.4 Constraints on maxInclusive Schema Components
+  Schema Component Constraint: maxInclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [1] maxInclusive is among the members of {facets}
+        of {base type definition} and {value} is greater than
+        the {value} of the parent maxInclusive
+
+http://www.w3.org/TR/xmlschema-2/#maxInclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:maxInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:maxInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[1]/case-1/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[1]/case-1/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[1]/case-1/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because maxInclusive is equal to
+				the parent maxInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[1]/case-2/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[1]/case-2/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[1]/case-2/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.7.4 Constraints on maxInclusive Schema Components
+  Schema Component Constraint: maxInclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [1] maxInclusive is among the members of {facets}
+        of {base type definition} and {value} is greater than
+        the {value} of the parent maxInclusive
+
+http://www.w3.org/TR/xmlschema-2/#maxInclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:maxInclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:maxInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[1]/case-2/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[1]/case-2/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[1]/case-2/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because maxInclusive is less than
+				the parent maxInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[1]/case-3/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[1]/case-3/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[1]/case-3/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.7.4 Constraints on maxInclusive Schema Components
+  Schema Component Constraint: maxInclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [1] maxInclusive is among the members of {facets}
+        of {base type definition} and {value} is greater than
+        the {value} of the parent maxInclusive
+
+http://www.w3.org/TR/xmlschema-2/#maxInclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:maxInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:maxInclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[1]/case-3/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[1]/case-3/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[1]/case-3/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because maxInclusive is greater than
+				the parent maxInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[2]/case-1/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[2]/case-1/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[2]/case-1/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.7.4 Constraints on maxInclusive Schema Components
+  Schema Component Constraint: maxInclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [2] maxExclusive is among the members of {facets}
+        of {base type definition} and {value} is greater than
+        or equal to the {value} of the parent maxExclusive
+
+http://www.w3.org/TR/xmlschema-2/#maxInclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:maxExclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:maxInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[2]/case-1/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[2]/case-1/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[2]/case-1/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because maxInclusive is less than
+				the parent maxExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[2]/case-2/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[2]/case-2/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[2]/case-2/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.7.4 Constraints on maxInclusive Schema Components
+  Schema Component Constraint: maxInclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [2] maxExclusive is among the members of {facets}
+        of {base type definition} and {value} is greater than
+        or equal to the {value} of the parent maxExclusive
+
+http://www.w3.org/TR/xmlschema-2/#maxInclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:maxExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:maxInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[2]/case-2/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[2]/case-2/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[2]/case-2/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because maxInclusive is equal to
+				the parent maxExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[2]/case-3/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[2]/case-3/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[2]/case-3/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.7.4 Constraints on maxInclusive Schema Components
+  Schema Component Constraint: maxInclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [2] maxExclusive is among the members of {facets}
+        of {base type definition} and {value} is greater than
+        or equal to the {value} of the parent maxExclusive
+
+http://www.w3.org/TR/xmlschema-2/#maxInclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:maxExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:maxInclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[2]/case-3/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[2]/case-3/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[2]/case-3/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because maxInclusive is greater than
+				the parent maxExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[3]/case-1/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[3]/case-1/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[3]/case-1/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.7.4 Constraints on maxInclusive Schema Components
+  Schema Component Constraint: maxInclusive valid restriction
+    It is an error if any of the following conditions is true:
+    [3] minInclusive is among the members of {facets}
+        of {base type definition} and {value} is less than
+        the {value} of the parent minInclusive 
+
+http://www.w3.org/TR/xmlschema-2/#maxInclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:maxInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[3]/case-1/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[3]/case-1/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[3]/case-1/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because maxInclusive is equal to
+				the parent minInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[3]/case-2/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[3]/case-2/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[3]/case-2/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.7.4 Constraints on maxInclusive Schema Components
+  Schema Component Constraint: maxInclusive valid restriction
+    It is an error if any of the following conditions is true:
+    [3] minInclusive is among the members of {facets}
+        of {base type definition} and {value} is less than
+        the {value} of the parent minInclusive 
+
+http://www.w3.org/TR/xmlschema-2/#maxInclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:maxInclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[3]/case-2/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[3]/case-2/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[3]/case-2/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because maxInclusive is greater than
+				the parent minInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[3]/case-3/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[3]/case-3/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[3]/case-3/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.7.4 Constraints on maxInclusive Schema Components
+  Schema Component Constraint: maxInclusive valid restriction
+    It is an error if any of the following conditions is true:
+    [3] minInclusive is among the members of {facets}
+        of {base type definition} and {value} is less than
+        the {value} of the parent minInclusive 
+
+http://www.w3.org/TR/xmlschema-2/#maxInclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minInclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:maxInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[3]/case-3/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[3]/case-3/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[3]/case-3/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because maxInclusive is less than
+				the parent minInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[4]/case-1/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[4]/case-1/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[4]/case-1/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.7.4 Constraints on maxInclusive Schema Components
+  Schema Component Constraint: maxInclusive valid restriction
+    It is an error if any of the following conditions is true:
+    [4] minExclusive is among the members of {facets}
+        of {base type definition} and {value} is less than
+        or equal to the {value} of the parent minExclusive 
+
+http://www.w3.org/TR/xmlschema-2/#maxInclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:maxInclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[4]/case-1/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[4]/case-1/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[4]/case-1/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because maxInclusive is greater than
+				the parent minExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[4]/case-2/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[4]/case-2/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[4]/case-2/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.7.4 Constraints on maxInclusive Schema Components
+  Schema Component Constraint: maxInclusive valid restriction
+    It is an error if any of the following conditions is true:
+    [4] minExclusive is among the members of {facets}
+        of {base type definition} and {value} is less than
+        or equal to the {value} of the parent minExclusive 
+
+http://www.w3.org/TR/xmlschema-2/#maxInclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:maxInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[4]/case-2/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[4]/case-2/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[4]/case-2/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because maxInclusive is equal to
+				the parent minExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[4]/case-3/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[4]/case-3/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[4]/case-3/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.7.4 Constraints on maxInclusive Schema Components
+  Schema Component Constraint: maxInclusive valid restriction
+    It is an error if any of the following conditions is true:
+    [4] minExclusive is among the members of {facets}
+        of {base type definition} and {value} is less than
+        or equal to the {value} of the parent minExclusive 
+
+http://www.w3.org/TR/xmlschema-2/#maxInclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minExclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:maxInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[4]/case-3/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[4]/case-3/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxInclusive-valid-restriction/[4]/case-3/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because maxInclusive is less than
+				the parent minExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-equal-to-maxExclusive/case-1/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-equal-to-maxExclusive/case-1/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-equal-to-maxExclusive/case-1/test.xsd	(revision 0)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.8.4 Constraints on maxExclusive Schema Components
+  Schema Component Constraint: minExclusive <= maxExclusive
+    It is an error for the value specified for minExclusive
+    to be greater than the value specified for maxExclusive
+    for the same datatype.
+
+http://www.w3.org/TR/xmlschema-2/#minExclusive-less-than-equal-to-maxExclusive
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minExclusive value="1"/>
+			<xsd:maxExclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st1" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-equal-to-maxExclusive/case-1/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-equal-to-maxExclusive/case-1/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-equal-to-maxExclusive/case-1/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because minExclusive is less than
+				the sibling maxExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-equal-to-maxExclusive/case-2/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-equal-to-maxExclusive/case-2/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-equal-to-maxExclusive/case-2/test.xsd	(revision 0)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.8.4 Constraints on maxExclusive Schema Components
+  Schema Component Constraint: minExclusive <= maxExclusive
+    It is an error for the value specified for minExclusive
+    to be greater than the value specified for maxExclusive
+    for the same datatype.
+
+http://www.w3.org/TR/xmlschema-2/#minExclusive-less-than-equal-to-maxExclusive
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minExclusive value="1"/>
+			<xsd:maxExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st1" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-equal-to-maxExclusive/case-2/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-equal-to-maxExclusive/case-2/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-equal-to-maxExclusive/case-2/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because minExclusive is equal to
+				the sibling maxExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-equal-to-maxExclusive/case-3/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-equal-to-maxExclusive/case-3/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-equal-to-maxExclusive/case-3/test.xsd	(revision 0)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.8.4 Constraints on maxExclusive Schema Components
+  Schema Component Constraint: minExclusive <= maxExclusive
+    It is an error for the value specified for minExclusive
+    to be greater than the value specified for maxExclusive
+    for the same datatype.
+
+http://www.w3.org/TR/xmlschema-2/#minExclusive-less-than-equal-to-maxExclusive
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minExclusive value="2"/>
+			<xsd:maxExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st1" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-equal-to-maxExclusive/case-3/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-equal-to-maxExclusive/case-3/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-equal-to-maxExclusive/case-3/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because minExclusive is greater than
+				the sibling maxExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[1]/case-1/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[1]/case-1/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[1]/case-1/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.9.4 Constraints on minExclusive Schema Components
+  Schema Component Constraint: minExclusive valid restriction
+    It is an error if any of the following conditions is true:
+    [1] minExclusive is among the members of {facets} 
+        of {base type definition} and {value} is less than
+        the {value} of the parent minExclusive
+
+http://www.w3.org/TR/xmlschema-2/#minExclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:minExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[1]/case-1/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[1]/case-1/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[1]/case-1/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because minExclusive is equal to
+				the parent minExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[1]/case-2/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[1]/case-2/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[1]/case-2/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.9.4 Constraints on minExclusive Schema Components
+  Schema Component Constraint: minExclusive valid restriction
+    It is an error if any of the following conditions is true:
+    [1] minExclusive is among the members of {facets} 
+        of {base type definition} and {value} is less than
+        the {value} of the parent minExclusive
+
+http://www.w3.org/TR/xmlschema-2/#minExclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:minExclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[1]/case-2/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[1]/case-2/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[1]/case-2/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because minExclusive is greater than
+				the parent minExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[1]/case-3/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[1]/case-3/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[1]/case-3/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.9.4 Constraints on minExclusive Schema Components
+  Schema Component Constraint: minExclusive valid restriction
+    It is an error if any of the following conditions is true:
+    [1] minExclusive is among the members of {facets} 
+        of {base type definition} and {value} is less than
+        the {value} of the parent minExclusive
+
+http://www.w3.org/TR/xmlschema-2/#minExclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minExclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:minExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[1]/case-3/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[1]/case-3/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[1]/case-3/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because minExclusive is less than
+				the parent minExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[2]/case-1/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[2]/case-1/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[2]/case-1/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.9.4 Constraints on minExclusive Schema Components
+  Schema Component Constraint: minExclusive valid restriction
+    It is an error if any of the following conditions is true:
+    [2] maxInclusive is among the members of {facets} 
+        of {base type definition} and {value} is greater than
+        the {value} of the parent maxInclusive
+
+http://www.w3.org/TR/xmlschema-2/#minExclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:maxInclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:minExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[2]/case-1/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[2]/case-1/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[2]/case-1/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because minExclusive is less than
+				the parent maxInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[2]/case-2/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[2]/case-2/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[2]/case-2/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.9.4 Constraints on minExclusive Schema Components
+  Schema Component Constraint: minExclusive valid restriction
+    It is an error if any of the following conditions is true:
+    [2] maxInclusive is among the members of {facets} 
+        of {base type definition} and {value} is greater than
+        the {value} of the parent maxInclusive
+
+http://www.w3.org/TR/xmlschema-2/#minExclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:maxInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:minExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[2]/case-2/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[2]/case-2/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[2]/case-2/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because minExclusive is equal to
+				the parent maxInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[2]/case-3/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[2]/case-3/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[2]/case-3/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.9.4 Constraints on minExclusive Schema Components
+  Schema Component Constraint: minExclusive valid restriction
+    It is an error if any of the following conditions is true:
+    [2] maxInclusive is among the members of {facets} 
+        of {base type definition} and {value} is greater than
+        the {value} of the parent maxInclusive
+
+http://www.w3.org/TR/xmlschema-2/#minExclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:maxInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:minExclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[2]/case-3/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[2]/case-3/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[2]/case-3/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because minExclusive is greater than
+				the parent maxInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[3]/case-1/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[3]/case-1/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[3]/case-1/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.9.4 Constraints on minExclusive Schema Components
+  Schema Component Constraint: minExclusive valid restriction
+    It is an error if any of the following conditions is true:
+    [3] minInclusive is among the members of {facets}
+        of {base type definition} and {value} is less than
+        the {value} of the parent minInclusive
+
+http://www.w3.org/TR/xmlschema-2/#minExclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:minExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[3]/case-1/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[3]/case-1/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[3]/case-1/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because minExclusive is equal to
+				the parent minInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[3]/case-2/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[3]/case-2/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[3]/case-2/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.9.4 Constraints on minExclusive Schema Components
+  Schema Component Constraint: minExclusive valid restriction
+    It is an error if any of the following conditions is true:
+    [3] minInclusive is among the members of {facets}
+        of {base type definition} and {value} is less than
+        the {value} of the parent minInclusive
+
+http://www.w3.org/TR/xmlschema-2/#minExclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:minExclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[3]/case-2/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[3]/case-2/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[3]/case-2/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because minExclusive is greater than
+				the parent minInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[3]/case-3/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[3]/case-3/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[3]/case-3/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.9.4 Constraints on minExclusive Schema Components
+  Schema Component Constraint: minExclusive valid restriction
+    It is an error if any of the following conditions is true:
+    [3] minInclusive is among the members of {facets}
+        of {base type definition} and {value} is less than
+        the {value} of the parent minInclusive
+
+http://www.w3.org/TR/xmlschema-2/#minExclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minInclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:minExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[3]/case-3/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[3]/case-3/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[3]/case-3/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because minExclusive is less than
+				the parent minInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[4]/case-1/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[4]/case-1/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[4]/case-1/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.9.4 Constraints on minExclusive Schema Components
+  Schema Component Constraint: minExclusive valid restriction
+    It is an error if any of the following conditions is true:
+    [4] maxExclusive is among the members of {facets}
+        of {base type definition} and {value} is greater than
+        or equal to the {value} of the parent maxExclusive
+
+http://www.w3.org/TR/xmlschema-2/#minExclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:maxExclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:minExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[4]/case-1/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[4]/case-1/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[4]/case-1/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because minExclusive is less than
+				the parent maxExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[4]/case-2/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[4]/case-2/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[4]/case-2/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.9.4 Constraints on minExclusive Schema Components
+  Schema Component Constraint: minExclusive valid restriction
+    It is an error if any of the following conditions is true:
+    [4] maxExclusive is among the members of {facets}
+        of {base type definition} and {value} is greater than
+        or equal to the {value} of the parent maxExclusive
+
+http://www.w3.org/TR/xmlschema-2/#minExclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:maxExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:minExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[4]/case-2/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[4]/case-2/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[4]/case-2/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because minExclusive is equal to
+				the parent maxExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[4]/case-3/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[4]/case-3/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[4]/case-3/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.9.4 Constraints on minExclusive Schema Components
+  Schema Component Constraint: minExclusive valid restriction
+    It is an error if any of the following conditions is true:
+    [4] maxExclusive is among the members of {facets}
+        of {base type definition} and {value} is greater than
+        or equal to the {value} of the parent maxExclusive
+
+http://www.w3.org/TR/xmlschema-2/#minExclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:maxExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:minExclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[4]/case-3/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[4]/case-3/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-valid-restriction/[4]/case-3/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because minExclusive is greater than
+				the parent maxExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-equal-to-maxInclusive/case-1/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-equal-to-maxInclusive/case-1/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-equal-to-maxInclusive/case-1/test.xsd	(revision 0)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.7.4 Constraints on maxInclusive Schema Components
+  Schema Component Constraint: minInclusive <= maxInclusive
+    It is an error for the value specified for minInclusive
+    to be greater than the value specified for maxInclusive
+    for the same datatype.
+
+http://www.w3.org/TR/xmlschema-2/#minInclusive-less-than-equal-to-maxInclusive
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minInclusive value="1"/>
+			<xsd:maxInclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st1" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-equal-to-maxInclusive/case-1/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-equal-to-maxInclusive/case-1/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-equal-to-maxInclusive/case-1/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because minInclusive is less than
+				the sibling maxInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-equal-to-maxInclusive/case-2/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-equal-to-maxInclusive/case-2/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-equal-to-maxInclusive/case-2/test.xsd	(revision 0)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.7.4 Constraints on maxInclusive Schema Components
+  Schema Component Constraint: minInclusive <= maxInclusive
+    It is an error for the value specified for minInclusive
+    to be greater than the value specified for maxInclusive
+    for the same datatype.
+
+http://www.w3.org/TR/xmlschema-2/#minInclusive-less-than-equal-to-maxInclusive
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minInclusive value="1"/>
+			<xsd:maxInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st1" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-equal-to-maxInclusive/case-2/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-equal-to-maxInclusive/case-2/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-equal-to-maxInclusive/case-2/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because minInclusive is equal to
+				the sibling maxInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-equal-to-maxInclusive/case-3/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-equal-to-maxInclusive/case-3/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-equal-to-maxInclusive/case-3/test.xsd	(revision 0)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.7.4 Constraints on maxInclusive Schema Components
+  Schema Component Constraint: minInclusive <= maxInclusive
+    It is an error for the value specified for minInclusive
+    to be greater than the value specified for maxInclusive
+    for the same datatype.
+
+http://www.w3.org/TR/xmlschema-2/#minInclusive-less-than-equal-to-maxInclusive
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minInclusive value="2"/>
+			<xsd:maxInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st1" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-equal-to-maxInclusive/case-3/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-equal-to-maxInclusive/case-3/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-equal-to-maxInclusive/case-3/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because minInclusive is greater than
+				the sibling maxInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-maxInclusive/case-1/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-maxInclusive/case-1/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-maxInclusive/case-1/test.xsd	(revision 0)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.9.4 Constraints on minExclusive Schema Components
+  Schema Component Constraint: minExclusive < maxInclusive
+    It is an error for the value specified for minExclusive
+    to be greater than or equal to the value specified for 
+    maxInclusive for the same datatype.
+
+http://www.w3.org/TR/xmlschema-2/#minExclusive-less-than-maxInclusive
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minExclusive value="1"/>
+			<xsd:maxInclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st1" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-maxInclusive/case-1/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-maxInclusive/case-1/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-maxInclusive/case-1/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Werner Guttmann, Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because minExclusive is less than
+				the sibling maxInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-maxInclusive/case-2/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-maxInclusive/case-2/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-maxInclusive/case-2/test.xsd	(revision 0)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.9.4 Constraints on minExclusive Schema Components
+  Schema Component Constraint: minExclusive < maxInclusive
+    It is an error for the value specified for minExclusive
+    to be greater than or equal to the value specified for 
+    maxInclusive for the same datatype.
+
+http://www.w3.org/TR/xmlschema-2/#minExclusive-less-than-maxInclusive
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minExclusive value="1"/>
+			<xsd:maxInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st1" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-maxInclusive/case-2/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-maxInclusive/case-2/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-maxInclusive/case-2/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Werner Guttmann, Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because minExclusive is equal to
+				the sibling maxInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-maxInclusive/case-3/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-maxInclusive/case-3/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-maxInclusive/case-3/test.xsd	(revision 0)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.9.4 Constraints on minExclusive Schema Components
+  Schema Component Constraint: minExclusive < maxInclusive
+    It is an error for the value specified for minExclusive
+    to be greater than or equal to the value specified for 
+    maxInclusive for the same datatype.
+
+http://www.w3.org/TR/xmlschema-2/#minExclusive-less-than-maxInclusive
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minExclusive value="2"/>
+			<xsd:maxInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st1" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-maxInclusive/case-3/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-maxInclusive/case-3/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minExclusive-less-than-maxInclusive/case-3/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Werner Guttmann, Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because minExclusive is greater than
+				the sibling maxInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-maxExclusive/case-1/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-maxExclusive/case-1/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-maxExclusive/case-1/test.xsd	(revision 0)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.10.4 Constraints on minInclusive Schema Components
+  Schema Component Constraint: minInclusive < maxExclusive
+    It is an error for the value specified for minInclusive
+    to be greater than or equal to the value specified for
+    maxExclusive for the same datatype.
+
+http://www.w3.org/TR/xmlschema-2/#minInclusive-less-than-maxExclusive
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minInclusive value="1"/>
+			<xsd:maxExclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st1" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-maxExclusive/case-1/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-maxExclusive/case-1/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-maxExclusive/case-1/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because minInclusive is less than
+				the sibling maxExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-maxExclusive/case-2/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-maxExclusive/case-2/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-maxExclusive/case-2/test.xsd	(revision 0)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.10.4 Constraints on minInclusive Schema Components
+  Schema Component Constraint: minInclusive < maxExclusive
+    It is an error for the value specified for minInclusive
+    to be greater than or equal to the value specified for
+    maxExclusive for the same datatype.
+
+http://www.w3.org/TR/xmlschema-2/#minInclusive-less-than-maxExclusive
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minInclusive value="1"/>
+			<xsd:maxExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st1" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-maxExclusive/case-2/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-maxExclusive/case-2/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-maxExclusive/case-2/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because minInclusive is equal to
+				the sibling maxExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-maxExclusive/case-3/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-maxExclusive/case-3/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-maxExclusive/case-3/test.xsd	(revision 0)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.10.4 Constraints on minInclusive Schema Components
+  Schema Component Constraint: minInclusive < maxExclusive
+    It is an error for the value specified for minInclusive
+    to be greater than or equal to the value specified for
+    maxExclusive for the same datatype.
+
+http://www.w3.org/TR/xmlschema-2/#minInclusive-less-than-maxExclusive
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minInclusive value="2"/>
+			<xsd:maxExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st1" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-maxExclusive/case-3/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-maxExclusive/case-3/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-less-than-maxExclusive/case-3/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minInclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because minInclusive is greater than
+				the sibling maxExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[1]/case-1/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[1]/case-1/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[1]/case-1/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.8.4 Constraints on maxExclusive Schema Components
+  Schema Component Constraint: maxExclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [1] maxExclusive is among the members of {facets}
+        of {base type definition} and {value} is greater than
+        the {value} of the parent maxExclusive
+
+http://www.w3.org/TR/xmlschema-2/#maxExclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:maxExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:maxExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[1]/case-1/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[1]/case-1/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[1]/case-1/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because maxExclusive is equal to
+				the parent maxExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[1]/case-2/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[1]/case-2/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[1]/case-2/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.8.4 Constraints on maxExclusive Schema Components
+  Schema Component Constraint: maxExclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [1] maxExclusive is among the members of {facets}
+        of {base type definition} and {value} is greater than
+        the {value} of the parent maxExclusive
+
+http://www.w3.org/TR/xmlschema-2/#maxExclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:maxExclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:maxExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[1]/case-2/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[1]/case-2/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[1]/case-2/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because maxExclusive is less than
+				the parent maxExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[1]/case-3/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[1]/case-3/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[1]/case-3/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.8.4 Constraints on maxExclusive Schema Components
+  Schema Component Constraint: maxExclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [1] maxExclusive is among the members of {facets}
+        of {base type definition} and {value} is greater than
+        the {value} of the parent maxExclusive
+
+http://www.w3.org/TR/xmlschema-2/#maxExclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:maxExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:maxExclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[1]/case-3/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[1]/case-3/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[1]/case-3/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because maxExclusive is greater than
+				the parent maxExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[2]/case-1/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[2]/case-1/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[2]/case-1/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.8.4 Constraints on maxExclusive Schema Components
+  Schema Component Constraint: maxExclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [2] maxInclusive is among the members of {facets}
+        of {base type definition} and {value} is greater than
+        the {value} of the parent maxInclusive
+
+http://www.w3.org/TR/xmlschema-2/#maxExclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:maxInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:maxExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[2]/case-1/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[2]/case-1/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[2]/case-1/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because maxExclusive is equal to
+				the parent maxInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[2]/case-2/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[2]/case-2/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[2]/case-2/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.8.4 Constraints on maxExclusive Schema Components
+  Schema Component Constraint: maxExclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [2] maxInclusive is among the members of {facets}
+        of {base type definition} and {value} is greater than
+        the {value} of the parent maxInclusive
+
+http://www.w3.org/TR/xmlschema-2/#maxExclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:maxInclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:maxExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[2]/case-2/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[2]/case-2/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[2]/case-2/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because maxExclusive is less than
+				the parent maxInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[2]/case-3/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[2]/case-3/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[2]/case-3/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.8.4 Constraints on maxExclusive Schema Components
+  Schema Component Constraint: maxExclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [2] maxInclusive is among the members of {facets}
+        of {base type definition} and {value} is greater than
+        the {value} of the parent maxInclusive
+
+http://www.w3.org/TR/xmlschema-2/#maxExclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:maxInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:maxExclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[2]/case-3/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[2]/case-3/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[2]/case-3/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because maxExclusive is greater than
+				the parent maxInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[3]/case-1/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[3]/case-1/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[3]/case-1/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.8.4 Constraints on maxExclusive Schema Components
+  Schema Component Constraint: maxExclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [3] minInclusive is among the members of {facets}
+        of {base type definition} and {value} is less than
+        or equal to the {value} of the parent minInclusive
+
+http://www.w3.org/TR/xmlschema-2/#maxExclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:maxExclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[3]/case-1/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[3]/case-1/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[3]/case-1/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because maxExclusive is greater than
+				the parent minInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[3]/case-2/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[3]/case-2/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[3]/case-2/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.8.4 Constraints on maxExclusive Schema Components
+  Schema Component Constraint: maxExclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [3] minInclusive is among the members of {facets}
+        of {base type definition} and {value} is less than
+        or equal to the {value} of the parent minInclusive
+
+http://www.w3.org/TR/xmlschema-2/#maxExclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minInclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:maxExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[3]/case-2/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[3]/case-2/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[3]/case-2/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because maxExclusive is equal to
+				the parent minInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[3]/case-3/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[3]/case-3/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[3]/case-3/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.8.4 Constraints on maxExclusive Schema Components
+  Schema Component Constraint: maxExclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [3] minInclusive is among the members of {facets}
+        of {base type definition} and {value} is less than
+        or equal to the {value} of the parent minInclusive
+
+http://www.w3.org/TR/xmlschema-2/#maxExclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minInclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:maxExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[3]/case-3/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[3]/case-3/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[3]/case-3/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because maxExclusive is less than
+				the parent minInclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[4]/case-1/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[4]/case-1/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[4]/case-1/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.8.4 Constraints on maxExclusive Schema Components
+  Schema Component Constraint: maxExclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [4] minExclusive is among the members of {facets}
+        of {base type definition} and {value} is less than
+        or equal to the {value} of the parent minExclusive
+
+http://www.w3.org/TR/xmlschema-2/#maxExclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:maxExclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[4]/case-1/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[4]/case-1/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[4]/case-1/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Comment>
+				Must pass because maxExclusive is greater than
+				the parent minExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[4]/case-2/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[4]/case-2/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[4]/case-2/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.8.4 Constraints on maxExclusive Schema Components
+  Schema Component Constraint: maxExclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [4] minExclusive is among the members of {facets}
+        of {base type definition} and {value} is less than
+        or equal to the {value} of the parent minExclusive
+
+http://www.w3.org/TR/xmlschema-2/#maxExclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:maxExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[4]/case-2/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[4]/case-2/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[4]/case-2/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because maxExclusive is equal to
+				the parent minExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[4]/case-3/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[4]/case-3/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[4]/case-3/test.xsd	(revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.8.4 Constraints on maxExclusive Schema Components
+  Schema Component Constraint: maxExclusive valid restriction
+    It is an error if any of the following conditions is true: 
+    [4] minExclusive is among the members of {facets}
+        of {base type definition} and {value} is less than
+        or equal to the {value} of the parent minExclusive
+
+http://www.w3.org/TR/xmlschema-2/#maxExclusive-valid-restriction
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minExclusive value="2"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="st2">
+		<xsd:restriction base="st1">
+			<xsd:maxExclusive value="1"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st2" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[4]/case-3/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[4]/case-3/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/maxExclusive-valid-restriction/[4]/case-3/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the maxExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because maxExclusive is less than
+				the parent minExclusive
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-minExclusive/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-minExclusive/test.xsd	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-minExclusive/test.xsd	(revision 0)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!--
+4.3.9.4 Constraints on minExclusive Schema Components
+  Schema Component Constraint: minInclusive and minExclusive
+    It is an error for both minInclusive and minExclusive
+    to be specified for the same datatype.
+
+http://www.w3.org/TR/xmlschema-2/#minInclusive-minExclusive
+-->
+
+	<xsd:simpleType name="st1">
+		<xsd:restriction base="xsd:long">
+			<xsd:minExclusive value="0"/>
+			<xsd:minInclusive value="0"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="ct1">
+		<xsd:attribute name="a1" type="st1" use="optional"/>
+	</xsd:complexType>
+
+</xsd:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-minExclusive/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-minExclusive/TestDescriptor.xml	(revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/generationOnly/facets/minInclusive-minExclusive/TestDescriptor.xml	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+
+	<Name>Tests validity of various schema constraints</Name>
+	<Author>Werner Guttmann, Sergei Ivanov</Author>
+	<Comment>
+		Make sure that the minExclusive facet is used according to the
+		XML schema specification
+	</Comment>
+	<Category>basic capability</Category>
+
+	<BugFix>
+		<Reporter>Sergei Ivanov</Reporter>
+		<issue>CASTOR-1107</issue>
+		<Date_Report>2005-05-10</Date_Report>
+		<Date_Fix>2008-02-06</Date_Fix>
+		<Comment>Added validation code</Comment>
+	</BugFix>
+
+	<OnlySourceGenerationTest>
+		<Schema>test.xsd</Schema>
+		<UnitTestCase>
+			<Name>Test Source Generation</Name>
+			<Failure
+				exception="org.exolab.castor.xml.ValidationException"
+				FailureStep="source-generation">
+				true
+			</Failure>
+			<Comment>
+				Must fail because both minExclusive
+				and minInclusive are specified
+			</Comment>
+		</UnitTestCase>
+	</OnlySourceGenerationTest>
+
+</TestDescriptor>
Index: schema/src/main/java/org/exolab/castor/xml/schema/SimpleTypesFactory.java
===================================================================
--- schema/src/main/java/org/exolab/castor/xml/schema/SimpleTypesFactory.java	(revision 7434)
+++ schema/src/main/java/org/exolab/castor/xml/schema/SimpleTypesFactory.java	(working copy)
@@ -45,23 +45,24 @@
 
 package org.exolab.castor.xml.schema;
 
+import java.io.InputStream;
+import java.io.PrintStream;
 import java.io.PrintWriter;
-import java.io.PrintStream;
-import java.io.InputStream;
-
+import java.util.Hashtable;
 import java.util.Vector;
-import java.util.Hashtable;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.castor.util.Messages;
 import org.exolab.castor.mapping.Mapping;
-
 import org.exolab.castor.xml.Unmarshaller;
-import org.exolab.castor.xml.schema.SchemaException;
-import org.exolab.castor.xml.schema.simpletypes.*;
-import org.exolab.castor.xml.schema.simpletypes.factory.*;
-
+import org.exolab.castor.xml.schema.simpletypes.AtomicType;
+import org.exolab.castor.xml.schema.simpletypes.ListType;
+import org.exolab.castor.xml.schema.simpletypes.RealType;
+import org.exolab.castor.xml.schema.simpletypes.UrType;
+import org.exolab.castor.xml.schema.simpletypes.factory.Type;
+import org.exolab.castor.xml.schema.simpletypes.factory.TypeList;
+import org.exolab.castor.xml.schema.simpletypes.factory.TypeProperty;
 import org.xml.sax.InputSource;
 
 /**
@@ -505,7 +506,7 @@
             TypeProperty prop= (TypeProperty)facets.elementAt(index);
             if (!prop.getPseudo()) {
                 //adds a "real" facet (defined in the xml specs)
-                result.addFacet( new Facet(prop.getName(), prop.getValue()) );
+                result.addFacet( FacetFactory.getInstance().createFacet( prop.getName(), prop.getValue()) );
             }
             else {
                 //sets the information linked with the pseudo facet
Index: schema/src/main/java/org/exolab/castor/xml/schema/Facet.java
===================================================================
--- schema/src/main/java/org/exolab/castor/xml/schema/Facet.java	(revision 7434)
+++ schema/src/main/java/org/exolab/castor/xml/schema/Facet.java	(working copy)
@@ -44,6 +44,9 @@
  */
 package org.exolab.castor.xml.schema;
 
+import java.math.BigDecimal;
+import java.util.Enumeration;
+
 import org.exolab.castor.xml.ValidationException;
 
 /**
@@ -188,6 +191,15 @@
     } //-- toInt
 
     /**
+     * Returns a {@link BigDecimal} representation of the value of this facet
+     * @return a {@link BigDecimal} representation of the value of this facet
+     * @throws NumberFormatException if the value cannot be parsed as number
+     */
+    public BigDecimal toBigDecimal() throws NumberFormatException {
+        return new BigDecimal(_value);
+    } //-- toBigDecimal
+
+    /**
      * Returns the type of this Schema Structure
      * @return the type of this Schema Structure
     **/
@@ -204,4 +216,48 @@
          //-- do nothing for now
     } //-- validate
 
+    /**
+     * Checks whether the current facet overrides a facet of the base data type.
+     * This does generally happen when a data type is derived by restriction
+     * and it therefore has facet(s), which are more restrictive than the ones
+     * of the base data type.
+     *
+     * <p>This method is used for merging facets of the base and derived types,
+     * in order to create an effective set of facets for the derived type.
+     *
+     * <p>It's important to note that this method does not perform any validity
+     * checks. Validation must be generally performed <b>before</b> trying
+     * to merge facets of the base and derived types.
+     *
+     * @param baseFacet a facet of the base data type
+     * @return <code>true</code>,
+     *         if the current facet overrides <code>baseFacet</code>;
+     *         <code>false</code>, otherwise.
+     * 
+     * @see #checkConstraints(Enumeration,Enumeration)
+     * @see SimpleType#getEffectiveFacets()
+     */
+    public boolean overridesBase(Facet baseFacet) {
+        return getName().equals(baseFacet.getName());
+    }
+
+    /**
+     * Checks the constraints on the current facet against
+     * the other local facets of the same derived data type
+     * and facets of the base data type.
+     * Validation is performed according to the rules defined in
+     * "<a href="http://www.w3.org/TR/xmlschema-2/">XML Schema Part 2:
+     * Datatypes Second Edition</a>" document.
+     *
+     * @param localFacets local facets of the data type
+     * @param baseFacets  merged facets of the base data type
+     * @throws SchemaException when the current facet does not satisfy
+     *                         schema component validation constraints
+     */
+    public void checkConstraints(
+            Enumeration localFacets, Enumeration baseFacets)
+            throws SchemaException {
+        // Does nothing by default
+    }
+
 } //-- Facet
Index: schema/src/main/java/org/exolab/castor/xml/schema/facets/MinInclusive.java
===================================================================
--- schema/src/main/java/org/exolab/castor/xml/schema/facets/MinInclusive.java	(revision 0)
+++ schema/src/main/java/org/exolab/castor/xml/schema/facets/MinInclusive.java	(revision 0)
@@ -0,0 +1,131 @@
+package org.exolab.castor.xml.schema.facets;
+
+import java.util.Enumeration;
+
+import org.exolab.castor.xml.schema.Facet;
+import org.exolab.castor.xml.schema.SchemaException;
+
+/**
+ * An implementation of <b>minInclusive</b> constraining facet, defined in section
+ * "<a href="http://www.w3.org/TR/xmlschema-2/#rf-minExclusive">4.3.10 minInclusive</a>"
+ * of "<a href="http://www.w3.org/TR/xmlschema-2/">XML Schema Part 2:
+ * Datatypes Second Edition</a>" document.
+ *
+ * <p>[Definition:] <b>minInclusive</b> is the <i>inclusive lower bound</i>
+ * of the <i>value space</i> for a datatype with the <i>ordered</i> property.
+ * The value of <b>minInclusive</b> <i>must</i> be in the <i>value space</i>
+ * of the <i>base type</i>.
+ *
+ * @author <a href="mailto:sergei.ivanov@mail.ru">Sergei Ivanov</a>
+ * @version $Revision: 6465 $ $Date: 2006-04-13 06:47:36 -0600 (Thu, 13 Apr 2006) $
+ */
+public final class MinInclusive extends Facet {
+    
+    private static final long serialVersionUID = 1820136879077904618L;
+
+    public MinInclusive(String value) {
+        super(Facet.MIN_INCLUSIVE, value);
+    }
+
+    /**
+     * Checks whether the current facet overrides a facet of the base data type.
+     *
+     * <p><i>minInclusive</i> can override the following facets
+     * of the base data type:
+     *
+     * <ul>
+     *   <li><i>minExclusive</i></li>
+     *   <li>or <i>minInclusive</i></li>
+     * </ul>
+     *
+     * @param baseFacet a facet of the base data type
+     * @return <code>true</code>,
+     *   if the current facet overrides <code>baseFacet</code>;
+     *   <code>false</code>, otherwise.
+     * @see #checkConstraints(Enumeration, Enumeration)
+     */
+    public boolean overridesBase(final Facet baseFacet) {
+        final String otherName = baseFacet.getName();
+        return otherName.equals(Facet.MIN_EXCLUSIVE)
+               || otherName.equals(Facet.MIN_INCLUSIVE);
+    }
+
+    /**
+     * Validation is performed according to section
+     * "<a href="http://www.w3.org/TR/xmlschema-2/#minInclusive-coss">4.3.10.4
+     * Constraints on minInclusive Schema Components</a>"
+     * of "<a href="http://www.w3.org/TR/xmlschema-2/">XML Schema Part 2:
+     * Datatypes Second Edition</a>" document.
+     *
+     * @param localFacets local facets of the data type
+     * @param baseFacets merged facets of the base data type
+     * @throws SchemaException when the current facet does not satisfy
+     *   schema component validation constraints
+     */
+    public void checkConstraints(
+            final Enumeration localFacets, final Enumeration baseFacets)
+            throws SchemaException {
+
+        while (localFacets.hasMoreElements()) {
+            final Facet other = (Facet)localFacets.nextElement();
+            if (this == other) {
+                continue; // do not check against self
+            }
+            final String otherName = other.getName();
+            if (otherName.equals(Facet.MAX_EXCLUSIVE)
+                     && this.toBigDecimal().compareTo(other.toBigDecimal()) >= 0) {
+                // Schema Component Constraint: minInclusive < maxExclusive
+                throw new SchemaException(
+                        "It is an error for the value specified "
+                        + "for minInclusive to be greater than "
+                        + "or equal to the value specified for "
+                        + "maxExclusive for the same datatype.");
+            }
+        }
+        if (baseFacets != null) {
+            while (baseFacets.hasMoreElements()) {
+                final Facet other = (Facet)baseFacets.nextElement();
+                final String otherName = other.getName();
+
+                // Schema Component Constraint: minInclusive valid restriction
+                //   It is an error if any of the following conditions is true:
+                if (otherName.equals(Facet.MIN_INCLUSIVE)
+                    && this.toBigDecimal().compareTo(other.toBigDecimal()) < 0) {
+                    // [1]
+                    throw new SchemaException(
+                            "It is an error if the following condition is true: "
+                            + "minInclusive is among the members of {facets} of "
+                            + "{base type definition} and {value} is less than "
+                            + "the {value} of the parent minInclusive.");
+                }
+                else if (otherName.equals(Facet.MAX_INCLUSIVE)
+                         && this.toBigDecimal().compareTo(other.toBigDecimal()) > 0) {
+                    // [2]
+                    throw new SchemaException(
+                            "It is an error if the following condition is true: "
+                            + "maxInclusive is among the members of {facets} of "
+                            + "{base type definition} and {value} is greater than "
+                            + "the {value} of the parent maxInclusive.");
+                }
+                else if (otherName.equals(Facet.MIN_EXCLUSIVE)
+                         && this.toBigDecimal().compareTo(other.toBigDecimal()) <= 0) {
+                    // [3]
+                    throw new SchemaException(
+                            "It is an error if the following condition is true: "
+                            + "minExclusive is among the members of {facets} of "
+                            + "{base type definition} and {value} is less than "
+                            + "or equal to the {value} of the parent minExclusive.");
+                }
+                else if (otherName.equals(Facet.MAX_EXCLUSIVE)
+                         && this.toBigDecimal().compareTo(other.toBigDecimal()) >= 0) {
+                    // [4]
+                    throw new SchemaException(
+                            "It is an error if the following condition is true: "
+                            + "maxExclusive is among the members of {facets} of "
+                            + "{base type definition} and {value} is greater than "
+                            + "or equal to the {value} of the parent maxExclusive.");
+                }
+            }
+        }
+    }
+}
Index: schema/src/main/java/org/exolab/castor/xml/schema/facets/MaxInclusive.java
===================================================================
--- schema/src/main/java/org/exolab/castor/xml/schema/facets/MaxInclusive.java	(revision 0)
+++ schema/src/main/java/org/exolab/castor/xml/schema/facets/MaxInclusive.java	(revision 0)
@@ -0,0 +1,131 @@
+package org.exolab.castor.xml.schema.facets;
+
+import java.util.Enumeration;
+
+import org.exolab.castor.xml.schema.Facet;
+import org.exolab.castor.xml.schema.SchemaException;
+
+/**
+ * An implementation of <b>maxInclusive</b> constraining facet, defined in section
+ * "<a href="http://www.w3.org/TR/xmlschema-2/#rf-maxInclusive">4.3.7 maxInclusive</a>"
+ * of "<a href="http://www.w3.org/TR/xmlschema-2/">XML Schema Part 2:
+ * Datatypes Second Edition</a>" document.
+ *
+ * <p>[Definition:] <b>maxInclusive</b> is the <i>inclusive upper bound</i>
+ * of the <i>value space</i> for a datatype with the <i>ordered</i> property.
+ * The value of <b>maxInclusive</b> <i>must</i> be in the <i>value space</i>
+ * of the <i>base type</i>.
+ *
+ * @author <a href="mailto:sergei.ivanov@mail.ru">Sergei Ivanov</a>
+ * @version $Revision: 6465 $ $Date: 2006-04-13 06:47:36 -0600 (Thu, 13 Apr 2006) $
+ */
+public final class MaxInclusive extends Facet {
+
+    private static final long serialVersionUID = 2826634377769846916L;
+
+    public MaxInclusive(String value) {
+        super(Facet.MAX_INCLUSIVE, value);
+    }
+
+    /**
+     * Checks whether the current facet overrides a facet of the base data type.
+     *
+     * <p><i>maxInclusive</i> can override the following facets
+     * of the base data type:
+     *
+     * <ul>
+     *   <li><i>maxExclusive</i></li>
+     *   <li>or <i>maxInclusive</i></li>
+     * </ul>
+     *
+     * @param baseFacet a facet of the base data type
+     * @return <code>true</code>,
+     *   if the current facet overrides <code>baseFacet</code>;
+     *   <code>false</code>, otherwise.
+     * @see #checkConstraints(Enumeration, Enumeration)
+     */
+    public boolean overridesBase(final Facet baseFacet) {
+        final String otherName = baseFacet.getName();
+        return otherName.equals(Facet.MAX_EXCLUSIVE)
+               || otherName.equals(Facet.MAX_INCLUSIVE);
+    }
+
+    /**
+     * Validation is performed according to section
+     * "<a href="http://www.w3.org/TR/xmlschema-2/#maxInclusive-coss">4.3.7.4
+     * Constraints on maxInclusive Schema Components</a>"
+     * of "<a href="http://www.w3.org/TR/xmlschema-2/">XML Schema Part 2:
+     * Datatypes Second Edition</a>" document.
+     *
+     * @param localFacets local facets of the data type
+     * @param baseFacets merged facets of the base data type
+     * @throws SchemaException when the current facet does not satisfy
+     *   schema component validation constraints
+     */
+    public void checkConstraints(
+            final Enumeration localFacets, final Enumeration baseFacets)
+            throws SchemaException {
+
+        while (localFacets.hasMoreElements()) {
+            final Facet other = (Facet)localFacets.nextElement();
+            if (this == other) {
+                continue; // do not check against self
+            }
+            final String otherName = other.getName();
+            if (otherName.equals(Facet.MIN_INCLUSIVE)
+                     && other.toBigDecimal().compareTo(this.toBigDecimal()) > 0) {
+                // Schema Component Constraint: minInclusive <= maxInclusive
+                throw new SchemaException(
+                        "It is an error for the value specified "
+                        + "for minInclusive to be greater than "
+                        + "the value specified for maxInclusive "
+                        + "for the same datatype.");
+            }
+        }
+        if (baseFacets != null) {
+            while (baseFacets.hasMoreElements()) {
+                final Facet other = (Facet)baseFacets.nextElement();
+                final String otherName = other.getName();
+
+                // Schema Component Constraint: maxInclusive valid restriction
+                //   It is an error if any of the following conditions is true:
+                if (otherName.equals(Facet.MAX_INCLUSIVE)
+                    && this.toBigDecimal().compareTo(other.toBigDecimal()) > 0) {
+                    // [1]
+                    throw new SchemaException(
+                            "It is an error if the following condition is true: "
+                            + "maxInclusive is among the members of {facets} "
+                            + "of {base type definition} and {value} is greater than "
+                            + "the {value} of the parent maxInclusive.");
+                }
+                else if (otherName.equals(Facet.MAX_EXCLUSIVE)
+                         && this.toBigDecimal().compareTo(other.toBigDecimal()) >= 0) {
+                    // [2]
+                    throw new SchemaException(
+                            "It is an error if the following condition is true: "
+                            + "maxExclusive is among the members of {facets} "
+                            + "of {base type definition} and {value} is greater than "
+                            + "or equal to the {value} of the parent maxExclusive.");
+                }
+                else if (otherName.equals(Facet.MIN_INCLUSIVE)
+                         && this.toBigDecimal().compareTo(other.toBigDecimal()) < 0) {
+                    // [3]
+                    throw new SchemaException(
+                            "It is an error if the following condition is true: "
+                            + "minInclusive is among the members of {facets} "
+                            + "of {base type definition} and {value} is less than "
+                            + "the {value} of the parent minInclusive.");
+                }
+                else if (otherName.equals(Facet.MIN_EXCLUSIVE)
+                         && this.toBigDecimal().compareTo(other.toBigDecimal()) <= 0) {
+                    // [4]
+                    throw new SchemaException(
+                            "It is an error if the following condition is true: "
+                            + "minExclusive is among the members of {facets} "
+                            + "of {base type definition} and {value} is less than "
+                            + "or equal to the {value} of the parent minExclusive.");
+                }
+            }
+        }
+    }
+}
Index: schema/src/main/java/org/exolab/castor/xml/schema/facets/MinExclusive.java
===================================================================
--- schema/src/main/java/org/exolab/castor/xml/schema/facets/MinExclusive.java	(revision 0)
+++ schema/src/main/java/org/exolab/castor/xml/schema/facets/MinExclusive.java	(revision 0)
@@ -0,0 +1,137 @@
+package org.exolab.castor.xml.schema.facets;
+
+import java.util.Enumeration;
+
+import org.exolab.castor.xml.schema.Facet;
+import org.exolab.castor.xml.schema.SchemaException;
+
+/**
+ * An implementation of <b>minExclusive</b> constraining facet, defined in section
+ * "<a href="http://www.w3.org/TR/xmlschema-2/#rf-minExclusive">4.3.9 minExclusive</a>"
+ * of "<a href="http://www.w3.org/TR/xmlschema-2/">XML Schema Part 2:
+ * Datatypes Second Edition</a>" document.
+ *
+ * <p>[Definition:] <b>minExclusive</b> is the <i>exclusive lower bound</i>
+ * of the <i>value space</i> for a datatype with the <i>ordered</i> property.
+ * The value of <b>minExclusive</b> <i>must</i> be in the <i>value space</i>
+ * of the <i>base type</i> or be equal to {value} in {base type definition}.
+ *
+ * @author <a href="mailto:sergei.ivanov@mail.ru">Sergei Ivanov</a>
+ * @version $Revision: 6465 $ $Date: 2006-04-13 06:47:36 -0600 (Thu, 13 Apr 2006) $
+ */
+public final class MinExclusive extends Facet {
+    
+    private static final long serialVersionUID = 9164023814934394681L;
+
+    public MinExclusive(String value) {
+        super(Facet.MIN_EXCLUSIVE, value);
+    }
+
+    /**
+     * Checks whether the current facet overrides a facet of the base data type.
+     *
+     * <p><i>minExclusive</i> can override the following facets
+     * of the base data type:
+     *
+     * <ul>
+     *   <li><i>minExclusive</i></li>
+     *   <li>or <i>minInclusive</i></li>
+     * </ul>
+     *
+     * @param baseFacet a facet of the base data type
+     * @return <code>true</code>,
+     *   if the current facet overrides <code>baseFacet</code>;
+     *   <code>false</code>, otherwise.
+     * @see #checkConstraints(Enumeration, Enumeration)
+     */
+    public boolean overridesBase(final Facet baseFacet) {
+        final String otherName = baseFacet.getName();
+        return otherName.equals(Facet.MIN_EXCLUSIVE)
+               || otherName.equals(Facet.MIN_INCLUSIVE);
+    }
+
+    /**
+     * Validation is performed according to section
+     * "<a href="http://www.w3.org/TR/xmlschema-2/#minExclusive-coss">4.3.9.4
+     * Constraints on minExclusive Schema Components</a>"
+     * of "<a href="http://www.w3.org/TR/xmlschema-2/">XML Schema Part 2:
+     * Datatypes Second Edition</a>" document.
+     *
+     * @param localFacets local facets of the data type
+     * @param baseFacets merged facets of the base data type
+     * @throws SchemaException when the current facet does not satisfy
+     *   schema component validation constraints
+     */
+    public void checkConstraints(
+            final Enumeration localFacets, final Enumeration baseFacets)
+            throws SchemaException {
+
+        while (localFacets.hasMoreElements()) {
+            final Facet other = (Facet)localFacets.nextElement();
+            if (this == other) {
+                continue; // do not check against self
+            }
+            final String otherName = other.getName();
+            if (otherName.equals(Facet.MIN_INCLUSIVE)) {
+                // Schema Component Constraint: minInclusive and minExclusive
+                throw new SchemaException(
+                        "It is an error for both minInclusive and minExclusive "
+                        + "to be specified for the same datatype.");
+            }
+            else if (otherName.equals(Facet.MAX_INCLUSIVE)
+                     && this.toBigDecimal().compareTo(other.toBigDecimal()) >= 0) {
+                // Schema Component Constraint: minExclusive < maxInclusive
+                throw new SchemaException(
+                        "It is an error for the value specified "
+                        + "for minExclusive to be greater than "
+                        + "or equal to the value specified for "
+                        + "maxInclusive for the same datatype.");
+            }
+        }
+        if (baseFacets != null) {
+            while (baseFacets.hasMoreElements()) {
+                final Facet other = (Facet)baseFacets.nextElement();
+                final String otherName = other.getName();
+
+                // Schema Component Constraint: minExclusive valid restriction
+                //   It is an error if any of the following conditions is true:
+                if (otherName.equals(Facet.MIN_EXCLUSIVE)
+                    && this.toBigDecimal().compareTo(other.toBigDecimal()) < 0) {
+                    // [1]
+                    throw new SchemaException(
+                            "It is an error if the following condition is true: "
+                            + "minExclusive is among the members of {facets} of "
+                            + "{base type definition} and {value} is less than "
+                            + "the {value} of the parent minExclusive.");
+                }
+                else if (otherName.equals(Facet.MAX_INCLUSIVE)
+                         && this.toBigDecimal().compareTo(other.toBigDecimal()) > 0) {
+                    // [2]
+                    throw new SchemaException(
+                            "It is an error if the following condition is true: "
+                            + "maxInclusive is among the members of {facets} of "
+                            + "{base type definition} and {value} is greater than "
+                            + "the {value} of the parent maxInclusive.");
+                }
+                else if (otherName.equals(Facet.MIN_INCLUSIVE)
+                         && this.toBigDecimal().compareTo(other.toBigDecimal()) < 0) {
+                    // [3]
+                    throw new SchemaException(
+                            "It is an error if the following condition is true: "
+                            + "minInclusive is among the members of {facets} of "
+                            + "{base type definition} and {value} is less than "
+                            + "the {value} of the parent minInclusive.");
+                }
+                else if (otherName.equals(Facet.MAX_EXCLUSIVE)
+                         && this.toBigDecimal().compareTo(other.toBigDecimal()) >= 0) {
+                    // [4]
+                    throw new SchemaException(
+                            "It is an error if the following condition is true: "
+                            + "maxExclusive is among the members of {facets} of "
+                            + "{base type definition} and {value} is greater than "
+                            + "or equal to the {value} of the parent maxExclusive.");
+                }
+            }
+        }
+    }
+}
Index: schema/src/main/java/org/exolab/castor/xml/schema/facets/MaxExclusive.java
===================================================================
--- schema/src/main/java/org/exolab/castor/xml/schema/facets/MaxExclusive.java	(revision 0)
+++ schema/src/main/java/org/exolab/castor/xml/schema/facets/MaxExclusive.java	(revision 0)
@@ -0,0 +1,137 @@
+package org.exolab.castor.xml.schema.facets;
+
+import java.util.Enumeration;
+
+import org.exolab.castor.xml.schema.Facet;
+import org.exolab.castor.xml.schema.SchemaException;
+
+/**
+ * An implementation of <b>maxExclusive</b> constraining facet, defined in section
+ * "<a href="http://www.w3.org/TR/xmlschema-2/#rf-maxExclusive">4.3.8 maxExclusive</a>"
+ * of "<a href="http://www.w3.org/TR/xmlschema-2/">XML Schema Part 2:
+ * Datatypes Second Edition</a>" document.
+ *
+ * <p>[Definition:] <b>maxExclusive</b> is the <i>exclusive upper bound</i>
+ * of the <i>value space</i> for a datatype with the <i>ordered</i> property.
+ * The value of <b>maxExclusive</b> <i>must</i> be in the <i>value space</i>
+ * of the <i>base type</i> or be equal to {value} in {base type definition}.
+ *
+ * @author <a href="mailto:sergei.ivanov@mail.ru">Sergei Ivanov</a>
+ * @version $Revision: 6465 $ $Date: 2006-04-13 06:47:36 -0600 (Thu, 13 Apr 2006) $
+ */
+public final class MaxExclusive extends Facet {
+    
+    private static final long serialVersionUID = 2343915377123869053L;
+
+    public MaxExclusive(String value) {
+        super(Facet.MAX_EXCLUSIVE, value);
+    }
+
+    /**
+     * Checks whether the current facet overrides a facet of the base data type.
+     *
+     * <p><i>maxExclusive</i> can override the following facets
+     * of the base data type:
+     *
+     * <ul>
+     *   <li><i>maxExclusive</i></li>
+     *   <li>or <i>maxInclusive</i></li>
+     * </ul>
+     *
+     * @param baseFacet a facet of the base data type
+     * @return <code>true</code>,
+     *   if the current facet overrides <code>baseFacet</code>;
+     *   <code>false</code>, otherwise.
+     * @see #checkConstraints(Enumeration, Enumeration)
+     */
+    public boolean overridesBase(final Facet baseFacet) {
+        final String otherName = baseFacet.getName();
+        return otherName.equals(Facet.MAX_EXCLUSIVE)
+               || otherName.equals(Facet.MAX_INCLUSIVE);
+    }
+
+    /**
+     * Validation is performed according to section
+     * "<a href="http://www.w3.org/TR/xmlschema-2/#maxExclusive-coss">4.3.8.4
+     * Constraints on maxExclusive Schema Components</a>"
+     * of "<a href="http://www.w3.org/TR/xmlschema-2/">XML Schema Part 2:
+     * Datatypes Second Edition</a>" document.
+     *
+     * @param localFacets local facets of the data type
+     * @param baseFacets merged facets of the base data type
+     * @throws SchemaException when the current facet does not satisfy
+     *   schema component validation constraints
+     */
+    public void checkConstraints(
+            final Enumeration localFacets, final Enumeration baseFacets)
+            throws SchemaException {
+
+        while (localFacets.hasMoreElements()) {
+            final Facet other = (Facet)localFacets.nextElement();
+            if (this == other) {
+                continue; // do not check against self
+            }
+            final String otherName = other.getName();
+            if (otherName.equals(Facet.MAX_INCLUSIVE)) {
+                // Schema Component Constraint: maxInclusive and maxExclusive
+                throw new SchemaException(
+                        "It is an error for both maxInclusive and maxExclusive "
+                        + "to be specified in the same derivation step "
+                        + "of a datatype definition.");
+            }
+            else if (otherName.equals(Facet.MIN_EXCLUSIVE)
+                     && other.toBigDecimal().compareTo(this.toBigDecimal()) > 0) {
+                // Schema Component Constraint: minExclusive <= maxExclusive
+                throw new SchemaException(
+                        "It is an error for the value specified "
+                        + "for minExclusive to be greater than the value "
+                        + "specified for maxExclusive for the same datatype.");
+            }
+        }
+        if (baseFacets != null) {
+            while (baseFacets.hasMoreElements()) {
+                final Facet other = (Facet)baseFacets.nextElement();
+                final String otherName = other.getName();
+
+                // Schema Component Constraint: maxExclusive valid restriction
+                //   It is an error if any of the following conditions is true:
+                if (otherName.equals(Facet.MAX_EXCLUSIVE)
+                    && this.toBigDecimal().compareTo(other.toBigDecimal()) > 0) {
+                    // [1]
+                    throw new SchemaException(
+                            "It is an error if the following condition is true: "
+                            + "maxExclusive is among the members of {facets} "
+                            + "of {base type definition} and {value} is greater than "
+                            + "the {value} of the parent maxExclusive.");
+                }
+                else if (otherName.equals(Facet.MAX_INCLUSIVE)
+                         && this.toBigDecimal().compareTo(other.toBigDecimal()) > 0) {
+                    // [2]
+                    throw new SchemaException(
+                            "It is an error if the following condition is true: "
+                            + "maxInclusive is among the members of {facets} "
+                            + "of {base type definition} and {value} is greater than "
+                            + "the {value} of the parent maxInclusive.");
+                }
+                else if (otherName.equals(Facet.MIN_INCLUSIVE)
+                         && this.toBigDecimal().compareTo(other.toBigDecimal()) <= 0) {
+                    // [3]
+                    throw new SchemaException(
+                            "It is an error if the following condition is true: "
+                            + "minInclusive is among the members of {facets} "
+                            + "of {base type definition} and {value} is less than "
+                            + "or equal to the {value} of the parent minInclusive.");
+                }
+                else if (otherName.equals(Facet.MIN_EXCLUSIVE)
+                         && this.toBigDecimal().compareTo(other.toBigDecimal()) <= 0) {
+                    // [4]
+                    throw new SchemaException(
+                            "It is an error if the following condition is true: "
+                            + "minExclusive is among the members of {facets} "
+                            + "of {base type definition} and {value} is less than "
+                            + "or equal to the {value} of the parent minExclusive.");
+                }
+            }
+        }
+    }
+}
Index: schema/src/main/java/org/exolab/castor/xml/schema/SimpleType.java
===================================================================
--- schema/src/main/java/org/exolab/castor/xml/schema/SimpleType.java	(revision 7434)
+++ schema/src/main/java/org/exolab/castor/xml/schema/SimpleType.java	(working copy)
@@ -45,11 +45,10 @@
 
 package org.exolab.castor.xml.schema;
 
-import org.exolab.castor.xml.*;
-
 import java.util.Enumeration;
-import java.util.Iterator;
 
+import org.exolab.castor.xml.ValidationException;
+
 /**
  * An XML Schema SimpleType
  * @author <a href="mailto:kvisco@intalio.com">Keith Visco</a>
@@ -140,6 +139,7 @@
 
     /**
      * Returns the first facet associated with the given name
+     * @param name the name of the Facet to look for
      * @return the first facet associated with the given name
     **/
     public Facet getFacet(String name) {
@@ -152,6 +152,7 @@
 
     /**
      * Returns the facets associated with the given name
+     * @param name the name of the Facet to look for
      * @return the facets associated with the given name
     **/
     public Enumeration getFacets(String name) {
@@ -201,6 +202,50 @@
         return facets.enumerate();
     }
 
+    /**
+     * Returns an enumeration of the effective facets for this type.
+     * A set of effective facets contains all local facets
+     * and only those inherited facets that are not overridden
+     * by the local facets.
+     *
+     * @return an enumeration of the effective facets for this type.
+     *
+     * @see #getLocalFacets()
+     * @see #getFacets() 
+     */
+    public Enumeration getEffectiveFacets() {
+        final Enumeration localFacets = getLocalFacets();
+        final SimpleType baseType = (SimpleType) getBaseType();
+        if (baseType == null) {
+            // There's no base type ==> return local facets
+            return localFacets;
+        }
+        final Enumeration effectiveBaseFacets = baseType.getEffectiveFacets();
+        if (localFacets == null) {
+            // There's a base type, but no local facets ==> return
+            // effective facets of the base type
+            return effectiveBaseFacets;
+        }
+        // There are both local and inherited facets ==> merge them
+        final FacetList filteredBaseFacets = new FacetList();
+        OUTER:
+        while (effectiveBaseFacets.hasMoreElements()) {
+            final Facet baseFacet = (Facet) effectiveBaseFacets.nextElement();
+            // Check whether one of the local facets
+            // overrides the inherited facet
+            for (int i = 0; i < facets.size(); i++) {
+                final Facet localFacet = facets.get(i);
+                if (localFacet.overridesBase(baseFacet)) {
+                    continue OUTER;
+                }
+            }
+            // Base facet is not overridden ==> keep it in the list
+            filteredBaseFacets.add(baseFacet);
+        }
+        return new FacetListEnumerator(
+                facets,
+                (FacetListEnumerator) filteredBaseFacets.enumerate());
+    }
 
     /**
      * Returns the built in type this type is derived from.
@@ -428,7 +473,7 @@
     } //-- getStructureType
 
     /**
-     * Checks the validity of this SimpleType defintion.
+     * Checks the validity of this SimpleType definition.
      *
      * @throws ValidationException when this SimpleType definition
      * is invalid.
@@ -436,8 +481,27 @@
     public void validate()
         throws ValidationException
     {
-        //-- NOT YET IMPLEMENTED
-        
+        final Enumeration localFacets = getLocalFacets();
+        final SimpleType datatype = (SimpleType) getBaseType();
+        if (localFacets != null) {
+            while (localFacets.hasMoreElements()) {
+                final Facet facet = (Facet) localFacets.nextElement();
+                Enumeration baseFacets = null;
+                if (datatype != null) {
+                    baseFacets = datatype.getFacets();
+                }
+                try {
+                    facet.checkConstraints(getLocalFacets(), baseFacets);
+                }
+                catch (SchemaException e) {
+                    throw new ValidationException(
+                            "Facet validation failed for type '" + getName() + "'", e);
+                }
+            }
+        }
+
+        //-- TODO: NOT YET FULLY IMPLEMENTED
+
     } //-- validate
 
     //-- protected Methods -/
Index: schema/src/main/java/org/exolab/castor/xml/schema/FacetFactory.java
===================================================================
--- schema/src/main/java/org/exolab/castor/xml/schema/FacetFactory.java	(revision 0)
+++ schema/src/main/java/org/exolab/castor/xml/schema/FacetFactory.java	(revision 0)
@@ -0,0 +1,56 @@
+package org.exolab.castor.xml.schema;
+
+import org.exolab.castor.xml.schema.facets.MaxExclusive;
+import org.exolab.castor.xml.schema.facets.MaxInclusive;
+import org.exolab.castor.xml.schema.facets.MinExclusive;
+import org.exolab.castor.xml.schema.facets.MinInclusive;
+
+/**
+ * A factory to create instances of facets.
+ *
+ * @author <a href="mailto:sergei.ivanov@mail.ru">Sergei Ivanov</a>
+ * @version $Revision: 6465 $ $Date: 2006-04-13 06:47:36 -0600 (Thu, 13 Apr 2006) $
+ */
+public final class FacetFactory {
+
+    /**
+     * A private constructor to disallow direct instantiation.
+     */
+    private FacetFactory() {
+	}
+
+    /**
+     * The singleton instance of the factory.
+     */
+    private static final FacetFactory INSTANCE = new FacetFactory();
+
+    /**
+     * Returns the singleton instance of the facet factory.
+     * @return factory instance
+     */
+    public static FacetFactory getInstance() {
+		return INSTANCE;
+	}
+
+    /**
+     * Creates a new instance of a facet.
+     * @param name facet name (implies facet type)
+     * @param value value of the facet
+     * @return a new facet instance
+     */
+    public Facet createFacet(String name, String value) {
+		if (Facet.MIN_EXCLUSIVE.equals(name)) {
+			return new MinExclusive(value);
+		}
+		else if (Facet.MIN_INCLUSIVE.equals(name)) {
+			return new MinInclusive(value);
+		}
+		else if (Facet.MAX_INCLUSIVE.equals(name)) {
+			return new MaxInclusive(value);
+		}
+		else if (Facet.MAX_EXCLUSIVE.equals(name)) {
+			return new MaxExclusive(value);
+		}
+		return new Facet(name, value);
+	}
+}
\ No newline at end of file
Index: schema/src/main/java/org/exolab/castor/xml/schema/reader/FacetUnmarshaller.java
===================================================================
--- schema/src/main/java/org/exolab/castor/xml/schema/reader/FacetUnmarshaller.java	(revision 7434)
+++ schema/src/main/java/org/exolab/castor/xml/schema/reader/FacetUnmarshaller.java	(working copy)
@@ -51,6 +51,7 @@
 import org.exolab.castor.xml.XMLException;
 import org.exolab.castor.xml.schema.Annotation;
 import org.exolab.castor.xml.schema.Facet;
+import org.exolab.castor.xml.schema.FacetFactory;
 import org.exolab.castor.xml.schema.SchemaContext;
 import org.exolab.castor.xml.schema.SchemaException;
 import org.exolab.castor.xml.schema.SchemaNames;
@@ -111,9 +112,10 @@
             throw new IllegalArgumentException(err);
         }
 
-        _facet = new Facet(name, atts.getValue(SchemaNames.VALUE_ATTR));
+        _facet = FacetFactory.getInstance().createFacet(
+                name, atts.getValue(SchemaNames.VALUE_ATTR));
 
-    } //-- ArchetypeUnmarshaller
+    } //-- FacetUnmarshaller
 
       //-----------/
      //- Methods -/
Index: schema/src/main/java/org/exolab/castor/xml/dtd/Converter.java
===================================================================
--- schema/src/main/java/org/exolab/castor/xml/dtd/Converter.java	(revision 7434)
+++ schema/src/main/java/org/exolab/castor/xml/dtd/Converter.java	(working copy)
@@ -68,6 +68,7 @@
 import org.exolab.castor.xml.schema.Documentation;
 import org.exolab.castor.xml.schema.ElementDecl;
 import org.exolab.castor.xml.schema.Facet;
+import org.exolab.castor.xml.schema.FacetFactory;
 import org.exolab.castor.xml.schema.Group;
 import org.exolab.castor.xml.schema.Order;
 import org.exolab.castor.xml.schema.Particle;
@@ -563,7 +564,9 @@
                                                                         "restriction");
            Iterator values = dtdAttribute.getValues();
            while(values.hasNext()) {
-               type.addFacet(new Facet(Facet.ENUMERATION, (String)values.next()));
+               type.addFacet(
+                       FacetFactory.getInstance().createFacet(
+                               Facet.ENUMERATION, (String)values.next()));
            }
 
        }
@@ -574,7 +577,9 @@
                                                                         "restriction");
           Iterator values = dtdAttribute.getValues();
           while(values.hasNext()) {
-             type.addFacet(new Facet(Facet.ENUMERATION, (String)values.next()));
+             type.addFacet(
+                     FacetFactory.getInstance().createFacet(
+                             Facet.ENUMERATION, (String)values.next()));
           }
        }
        else
Index: codegen/src/main/java/org/exolab/castor/builder/types/AbstractLengthFacet.java
===================================================================
--- codegen/src/main/java/org/exolab/castor/builder/types/AbstractLengthFacet.java	(revision 7434)
+++ codegen/src/main/java/org/exolab/castor/builder/types/AbstractLengthFacet.java	(working copy)
@@ -153,8 +153,7 @@
      * {@inheritDoc}
      */
     protected final void setFacet(final Facet facet) {
-        addPatternFacet(facet);
-        setWhiteSpaceFacet(facet);
+        super.setFacet(facet);
         setLengthFacet(facet);
     }
     
Index: codegen/src/main/java/org/exolab/castor/builder/types/AbstractWhiteSpaceFacet.java
===================================================================
--- codegen/src/main/java/org/exolab/castor/builder/types/AbstractWhiteSpaceFacet.java	(revision 7434)
+++ codegen/src/main/java/org/exolab/castor/builder/types/AbstractWhiteSpaceFacet.java	(working copy)
@@ -112,7 +112,7 @@
      * {@inheritDoc}
      */
     protected void setFacet(final Facet facet) {
-        addPatternFacet(facet);
+        super.setFacet(facet);
         setWhiteSpaceFacet(facet);
     }
 
Index: codegen/src/main/java/org/exolab/castor/builder/types/AbstractRangeFacet.java
===================================================================
--- codegen/src/main/java/org/exolab/castor/builder/types/AbstractRangeFacet.java	(revision 7434)
+++ codegen/src/main/java/org/exolab/castor/builder/types/AbstractRangeFacet.java	(working copy)
@@ -145,8 +145,7 @@
      * {@inheritDoc}
      */
     protected void setFacet(final Facet facet) {
-        addPatternFacet(facet);
-        setWhiteSpaceFacet(facet);
+        super.setFacet(facet);
         setRangeFacet(facet);
     }
 
Index: codegen/src/main/java/org/exolab/castor/builder/types/AbstractPatternFacet.java
===================================================================
--- codegen/src/main/java/org/exolab/castor/builder/types/AbstractPatternFacet.java	(revision 7434)
+++ codegen/src/main/java/org/exolab/castor/builder/types/AbstractPatternFacet.java	(working copy)
@@ -60,6 +60,13 @@
     //--------------------------------------------------------------------------
 
     /**
+     * {@inheritDoc}
+     */
+    protected void setFacet(final Facet facet) {
+        addPatternFacet(facet);
+    }
+
+    /**
      * Transfer given facet if it is a pattern.
      *
      * @param facet The facet to transfer.
Index: codegen/src/main/java/org/exolab/castor/builder/types/AbstractDigitsFacet.java
===================================================================
--- codegen/src/main/java/org/exolab/castor/builder/types/AbstractDigitsFacet.java	(revision 7434)
+++ codegen/src/main/java/org/exolab/castor/builder/types/AbstractDigitsFacet.java	(working copy)
@@ -114,9 +114,7 @@
      * {@inheritDoc}
      */
     protected final void setFacet(final Facet facet) {
-        addPatternFacet(facet);
-        setWhiteSpaceFacet(facet);
-        setRangeFacet(facet);
+        super.setFacet(facet);
         setDigitsFacet(facet);
     }
 
Index: codegen/src/main/java/org/exolab/castor/builder/types/XSType.java
===================================================================
--- codegen/src/main/java/org/exolab/castor/builder/types/XSType.java	(revision 7434)
+++ codegen/src/main/java/org/exolab/castor/builder/types/XSType.java	(working copy)
@@ -295,7 +295,7 @@
      * @param simpleType The SimpleType containing the facets.
      */
     public final void setFacets(final SimpleType simpleType) {
-        Enumeration enumeration = simpleType.getLocalFacets();
+        Enumeration enumeration = simpleType.getEffectiveFacets();
         while (enumeration.hasMoreElements()) {
             setFacet((Facet) enumeration.nextElement());
         }
Index: codegen/src/main/java/org/exolab/castor/builder/factory/EnumerationFactory.java
===================================================================
--- codegen/src/main/java/org/exolab/castor/builder/factory/EnumerationFactory.java	(revision 7434)
+++ codegen/src/main/java/org/exolab/castor/builder/factory/EnumerationFactory.java	(working copy)
@@ -105,12 +105,12 @@
         // reset _maxSuffix value to 0
         _maxSuffix = 0;
         boolean generateConstantDefinitions = true;
-        int numberOfEnumerationFacets = simpleType.getNumberOfFacets("enumeration");
+        int numberOfEnumerationFacets = simpleType.getNumberOfFacets(Facet.ENUMERATION);
         if (numberOfEnumerationFacets > _maxEnumerationsPerClass) {
             generateConstantDefinitions = false;
         }
 
-        Enumeration enumeration = simpleType.getFacets("enumeration");
+        Enumeration enumeration = simpleType.getFacets(Facet.ENUMERATION);
 
         XMLBindingComponent component = new XMLBindingComponent(getConfig(), getGroupNaming());
         if (binding != null) {
@@ -122,7 +122,7 @@
         boolean useValuesAsName = true;
         useValuesAsName = selectNamingScheme(component, enumeration, useValuesAsName);
 
-        enumeration = simpleType.getFacets("enumeration");
+        enumeration = simpleType.getFacets(Facet.ENUMERATION);
 
         JClass jClass = state.getJClass();
         String className = jClass.getLocalName();
@@ -581,7 +581,7 @@
             baseType = _typeConversion.convertType(base, getConfig().useJava50());
         }
 
-        Enumeration enumeration = simpleType.getFacets("enumeration");
+        Enumeration enumeration = simpleType.getFacets(Facet.ENUMERATION);
 
         JClass jClass    = state.getJClass();
         String className = jClass.getLocalName();
@@ -673,7 +673,6 @@
      * @return the identifier for the enum value
      *
      * @author rhett-sutphin@uiowa.edu
-     * @param type
      */
     private String translateEnumValueToIdentifier(final EnumBindingType enumBinding,
                                                   final Facet facet) {