[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fdo-commits
Subject:    [fdo-commits] r5845 - in trunk/Providers: GenericRdbms/Src/UnitTest
From:       svn_fdo () osgeo ! org
Date:       2010-12-07 19:07:01
Message-ID: 20101207190701.9F3ED3900CB () trac ! osgeo ! org
[Download RAW message or body]

Author: brentrobinson
Date: 2010-12-07 11:07:01 -0800 (Tue, 07 Dec 2010)
New Revision: 5845

Modified:
   trunk/Providers/GenericRdbms/Src/UnitTest/apply_no_meta_test1_PostGIS_master.xml
   trunk/Providers/GenericRdbms/Src/UnitTest/apply_no_meta_test1_SQLServerSpatial_master.xml
  trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_MySql_master.txt
   trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_PostGIS_master.txt
   trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_SQLServerSpatial_master.txt
   trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_SqlServer2005_master.txt
   trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_SqlServer2008_master.txt
   trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_SqlServer_master.txt
   trunk/Providers/GenericRdbms/Src/UnitTest/impexp2a_master.txt
   trunk/Providers/GenericRdbms/Src/UnitTest/impexp2b_master.txt
   trunk/Providers/GenericRdbms/Src/UnitTest/spatial_context_test1m_master.xml
   trunk/Providers/GenericRdbms/Src/UnitTest/spatial_context_test1n_master.xml
   trunk/Providers/GenericRdbms/Src/UnitTest/spatial_context_test2m_master.xml
   trunk/Providers/GenericRdbms/Src/UnitTest/spatial_context_test2n_master.xml
   trunk/Providers/GenericRdbms/Src/UnitTest/spatial_context_test3m_master.xml
   trunk/Providers/GenericRdbms/Src/UnitTest/spatial_context_test3n_master.xml
   trunk/Providers/GenericRdbms/Src/UnitTest/spatial_contexts1_SQLServerSpatial_master.txt
  trunk/Providers/GenericRdbms/Src/UnitTest/spatial_contexts2_SQLServerSpatial_master.txt
  trunk/Providers/GenericRdbms/Src/UnitTest/spatial_contexts3_SQLServerSpatial_master.txt
  trunk/Providers/SDF/Src/UnitTest/apply_schema_test1_master.xml
   trunk/Providers/SDF/Src/UnitTest/apply_schema_test2_master.xml
   trunk/Providers/SDF/Src/UnitTest/apply_schema_test3_master.xml
   trunk/Providers/SDF/Src/UnitTest/apply_schema_test4_master.xml
   trunk/Providers/SDF/Src/UnitTest/apply_schema_test5_master.xml
Log:
Ticket#682: Updated provider unit test masters to reflect new fdo to XML simple data \
type mappings.

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/apply_no_meta_test1_PostGIS_master.xml
 ===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/apply_no_meta_test1_PostGIS_master.xml	2010-12-06 \
                09:10:01 UTC (rev 5844)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/apply_no_meta_test1_PostGIS_master.xml	2010-12-07 \
19:07:01 UTC (rev 5845) @@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <fdo:DataStore xmlns:xs="http://www.w3.org/2001/XMLSchema" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" \
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml" \
xmlns:fdo="http://fdo.osgeo.org/schemas" \
xmlns:fds="http://fdo.osgeo.org/schemas/fds">  <xs:schema \
xmlns:Acad="http://fdo.osgeo.org/schemas/feature/Acad" \
targetNamespace="http://fdo.osgeo.org/schemas/feature/Acad" \
elementFormDefault="qualified" attributeFormDefault="unqualified">  <xs:annotation>
@@ -70,7 +70,7 @@
 <xs:sequence>
 <xs:element name="FeatId" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -109,7 +109,7 @@
 <xs:sequence>
 <xs:element name="FeatId" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -153,7 +153,7 @@
 <xs:sequence>
 <xs:element name="FeatId">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -275,7 +275,7 @@
 <xs:sequence>
 <xs:element name="FeatureId" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -334,7 +334,7 @@
 <xs:sequence>
 <xs:element name="Credit-x20-Rating" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -373,7 +373,7 @@
 <xs:sequence>
 <xs:element name="FeatId" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -416,7 +416,7 @@
 <xs:sequence>
 <xs:element name="FeatId" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -445,7 +445,7 @@
 <xs:sequence>
 <xs:element name="PartNum" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -463,7 +463,7 @@
 </xs:element>
 <xs:element name="SerialNum">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -490,7 +490,7 @@
 </xs:element>
 <xs:element name="Volume" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -574,7 +574,7 @@
 <xs:sequence>
 <xs:element name="-x23--x20-Occupied" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -593,7 +593,7 @@
 <xs:sequence>
 <xs:element name="-x23--x20-Rooms" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -619,7 +619,7 @@
 </xs:element>
 <xs:element name="FeatureId" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -643,7 +643,7 @@
 <xs:sequence>
 <xs:element name="FeatureId" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -667,7 +667,7 @@
 <xs:sequence>
 <xs:element name="FeatureId" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -696,7 +696,7 @@
 <xs:sequence>
 <xs:element name="FeatureId" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -780,7 +780,7 @@
 <xs:sequence>
 <xs:element name="FeatId">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -829,7 +829,7 @@
 </xs:element>
 <xs:element name="PolyNum" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -837,7 +837,7 @@
 </xs:element>
 <xs:element name="ZoningType">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -922,7 +922,7 @@
 </xs:element>
 <xs:element name="Threeグケãäplusケãグäplusã" fdo:readOnly="true" \
fdo:autogenerated="true">  <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/apply_no_meta_test1_SQLServerSpatial_master.xml
 ===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/apply_no_meta_test1_SQLServerSpatial_master.xml	2010-12-06 \
                09:10:01 UTC (rev 5844)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/apply_no_meta_test1_SQLServerSpatial_master.xml	2010-12-07 \
19:07:01 UTC (rev 5845) @@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <fdo:DataStore xmlns:xs="http://www.w3.org/2001/XMLSchema" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" \
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml" \
xmlns:fdo="http://fdo.osgeo.org/schemas" \
xmlns:fds="http://fdo.osgeo.org/schemas/fds">  <xs:schema \
xmlns:Acad="http://fdo.osgeo.org/schemas/feature/Acad" \
targetNamespace="http://fdo.osgeo.org/schemas/feature/Acad" \
elementFormDefault="qualified" attributeFormDefault="unqualified">  <xs:annotation>
@@ -51,7 +51,7 @@
 </xs:element>
 <xs:element name="ColourIndex" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="xs:unsignedByte"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -59,7 +59,7 @@
 </xs:element>
 <xs:element name="FeatId" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -96,7 +96,7 @@
 <xs:sequence>
 <xs:element name="FeatId" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -135,7 +135,7 @@
 <xs:sequence>
 <xs:element name="ColourIndex" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="xs:unsignedByte"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -143,7 +143,7 @@
 </xs:element>
 <xs:element name="FeatId" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -177,7 +177,7 @@
 <xs:sequence>
 <xs:element name="FeatId">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -224,7 +224,7 @@
 </xs:element>
 <xs:element name="ColourIndex" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="xs:unsignedByte"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -232,7 +232,7 @@
 </xs:element>
 <xs:element name="FeatId">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -330,7 +330,7 @@
 <xs:sequence>
 <xs:element name="FeatureId" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -354,7 +354,7 @@
 <xs:sequence>
 <xs:element name="FeatId" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -410,7 +410,7 @@
 <xs:sequence>
 <xs:element name="Credit-x20-Rating" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="xs:unsignedByte"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -449,7 +449,7 @@
 <xs:sequence>
 <xs:element name="Credit-x20-Rating" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="xs:unsignedByte"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -488,7 +488,7 @@
 <xs:sequence>
 <xs:element name="Credit-x20-Rating" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="xs:unsignedByte"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -527,7 +527,7 @@
 <xs:sequence>
 <xs:element name="FeatId" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -570,7 +570,7 @@
 <xs:sequence>
 <xs:element name="FeatId" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -599,7 +599,7 @@
 <xs:sequence>
 <xs:element name="FeatId" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -628,7 +628,7 @@
 </xs:element>
 <xs:element name="PartNum" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -646,7 +646,7 @@
 </xs:element>
 <xs:element name="SerialNum">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -673,7 +673,7 @@
 </xs:element>
 <xs:element name="Volume" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -767,7 +767,7 @@
 <xs:sequence>
 <xs:element name="-x23--x20-Occupied" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -775,7 +775,7 @@
 </xs:element>
 <xs:element name="-x23--x20-Rooms" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -801,7 +801,7 @@
 </xs:element>
 <xs:element name="FeatureId" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -825,7 +825,7 @@
 <xs:sequence>
 <xs:element name="-x23--x20-Rooms" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -851,7 +851,7 @@
 </xs:element>
 <xs:element name="FeatureId" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -875,7 +875,7 @@
 <xs:sequence>
 <xs:element name="FeatureId" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -899,7 +899,7 @@
 <xs:sequence>
 <xs:element name="FeatureId" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -928,7 +928,7 @@
 <xs:sequence>
 <xs:element name="FeatureId" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1012,7 +1012,7 @@
 <xs:sequence>
 <xs:element name="FeatId">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1061,7 +1061,7 @@
 </xs:element>
 <xs:element name="PolyNum" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1069,7 +1069,7 @@
 </xs:element>
 <xs:element name="ZoningType">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1149,7 +1149,7 @@
 </xs:element>
 <xs:element name="Threeグケãäplusケãグäplusã" fdo:readOnly="true" \
fdo:autogenerated="true">  <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_MySql_master.txt
===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_MySql_master.txt	2010-12-06 \
                09:10:01 UTC (rev 5844)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_MySql_master.txt	2010-12-07 \
19:07:01 UTC (rev 5845) @@ -106,7 +106,7 @@
 <xs:sequence>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -124,7 +124,7 @@
 </xs:element>
 <xs:element name="TABLE1_ID012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -143,7 +143,7 @@
 <xs:sequence>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -161,7 +161,7 @@
 </xs:element>
 <xs:element name="TABLE1_ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -290,7 +290,7 @@
 <xs:sequence>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -308,7 +308,7 @@
 </xs:element>
 <xs:element name="TABLE7_ID12345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -337,7 +337,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -363,7 +363,7 @@
 </xs:element>
 <xs:element name="UNIQUE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -382,7 +382,7 @@
 <xs:sequence>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -390,7 +390,7 @@
 </xs:element>
 <xs:element name="INT64_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -409,7 +409,7 @@
 <xs:sequence>
 <xs:element name="AUTOINCREMENT_COLUMN" fdo:readOnly="true" \
fdo:autogenerated="true">  <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -433,7 +433,7 @@
 </xs:element>
 <xs:element name="BIT15_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -441,7 +441,7 @@
 </xs:element>
 <xs:element name="BIT16_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -449,7 +449,7 @@
 </xs:element>
 <xs:element name="BIT2_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="xs:unsignedByte"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -457,7 +457,7 @@
 </xs:element>
 <xs:element name="BIT31_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -465,7 +465,7 @@
 </xs:element>
 <xs:element name="BIT32_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -473,7 +473,7 @@
 </xs:element>
 <xs:element name="BIT8_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="xs:unsignedByte"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -481,7 +481,7 @@
 </xs:element>
 <xs:element name="BIT9_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -497,7 +497,7 @@
 </xs:element>
 <xs:element name="BOOL_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -505,7 +505,7 @@
 </xs:element>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="xs:unsignedByte"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -589,7 +589,7 @@
 </xs:element>
 <xs:element name="ID3456789012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -607,7 +607,7 @@
 </xs:element>
 <xs:element name="INT16_COLUMN345678901234567890" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -615,7 +615,7 @@
 </xs:element>
 <xs:element name="INT32_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -623,7 +623,7 @@
 </xs:element>
 <xs:element name="INT64_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -658,7 +658,7 @@
 </xs:element>
 <xs:element name="MEDIUMINT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -852,7 +852,7 @@
 </xs:element>
 <xs:element name="TINYINT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -860,7 +860,7 @@
 </xs:element>
 <xs:element name="UINT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -868,7 +868,7 @@
 </xs:element>
 <xs:element name="USMALLINT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -884,7 +884,7 @@
 </xs:element>
 <xs:element name="YEAR_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -961,7 +961,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -969,7 +969,7 @@
 </xs:element>
 <xs:element name="INT16_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1072,7 +1072,7 @@
 <xs:sequence>
 <xs:element name="ID" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1099,7 +1099,7 @@
 <xs:sequence>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="xs:unsignedByte"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1118,7 +1118,7 @@
 </xs:element>
 <xs:element name="ID3456789012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_PostGIS_master.txt
===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_PostGIS_master.txt	2010-12-06 \
                09:10:01 UTC (rev 5844)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_PostGIS_master.txt	2010-12-07 \
19:07:01 UTC (rev 5845) @@ -112,7 +112,7 @@
 <xs:sequence>
 <xs:element name="TABLE1_ID012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -127,7 +127,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -145,7 +145,7 @@
 </xs:element>
 <xs:element name="TABLE1_ID012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -170,7 +170,7 @@
 <xs:sequence>
 <xs:element name="TABLE1_ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -219,7 +219,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -237,7 +237,7 @@
 </xs:element>
 <xs:element name="TABLE1_ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -282,7 +282,7 @@
 <xs:sequence>
 <xs:element name="TABLE7_ID12345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -297,7 +297,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -315,7 +315,7 @@
 </xs:element>
 <xs:element name="TABLE7_ID12345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -347,7 +347,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -373,7 +373,7 @@
 </xs:element>
 <xs:element name="UNIQUE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -392,7 +392,7 @@
 <xs:sequence>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -400,7 +400,7 @@
 </xs:element>
 <xs:element name="INT64_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -485,7 +485,7 @@
 </xs:element>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -581,7 +581,7 @@
 </xs:element>
 <xs:element name="ID3456789012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -599,7 +599,7 @@
 </xs:element>
 <xs:element name="INT16_COLUMN345678901234567890" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16">
+<xs:restriction base="xs:short">
 <xs:maxExclusive value="20000"/>
 </xs:restriction>
 </xs:simpleType>
@@ -609,7 +609,7 @@
 </xs:element>
 <xs:element name="INT32_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -617,7 +617,7 @@
 </xs:element>
 <xs:element name="INT64_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -801,7 +801,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -809,7 +809,7 @@
 </xs:element>
 <xs:element name="INT16_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -838,7 +838,7 @@
 <xs:sequence>
 <xs:element name="ID" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -867,7 +867,7 @@
 <xs:sequence>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -886,7 +886,7 @@
 </xs:element>
 <xs:element name="ID3456789012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -924,7 +924,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -932,7 +932,7 @@
 </xs:element>
 <xs:element name="INT16_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_SQLServerSpatial_master.txt
 ===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_SQLServerSpatial_master.txt	2010-12-06 \
                09:10:01 UTC (rev 5844)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_SQLServerSpatial_master.txt	2010-12-07 \
19:07:01 UTC (rev 5845) @@ -112,7 +112,7 @@
 <xs:sequence>
 <xs:element name="TABLE1_ID012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -127,7 +127,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -145,7 +145,7 @@
 </xs:element>
 <xs:element name="TABLE1_ID012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -170,7 +170,7 @@
 <xs:sequence>
 <xs:element name="TABLE1_ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -219,7 +219,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -237,7 +237,7 @@
 </xs:element>
 <xs:element name="TABLE1_ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -282,7 +282,7 @@
 <xs:sequence>
 <xs:element name="TABLE7_ID12345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -297,7 +297,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -315,7 +315,7 @@
 </xs:element>
 <xs:element name="TABLE7_ID12345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -347,7 +347,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -373,7 +373,7 @@
 </xs:element>
 <xs:element name="UNIQUE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -392,7 +392,7 @@
 <xs:sequence>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -400,7 +400,7 @@
 </xs:element>
 <xs:element name="INT64_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -443,7 +443,7 @@
 </xs:element>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="xs:unsignedByte"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -490,7 +490,7 @@
 </xs:element>
 <xs:element name="ID3456789012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -508,7 +508,7 @@
 </xs:element>
 <xs:element name="INT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -516,7 +516,7 @@
 </xs:element>
 <xs:element name="INT16_COLUMN345678901234567890" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16">
+<xs:restriction base="xs:short">
 <xs:maxExclusive value="20000"/>
 </xs:restriction>
 </xs:simpleType>
@@ -526,7 +526,7 @@
 </xs:element>
 <xs:element name="INT32_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -534,7 +534,7 @@
 </xs:element>
 <xs:element name="INT64_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -698,7 +698,7 @@
 </xs:element>
 <xs:element name="TINYINT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="xs:unsignedByte"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -795,7 +795,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -803,7 +803,7 @@
 </xs:element>
 <xs:element name="INT16_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -832,7 +832,7 @@
 <xs:sequence>
 <xs:element name="ID" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -861,7 +861,7 @@
 <xs:sequence>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="xs:unsignedByte"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -880,7 +880,7 @@
 </xs:element>
 <xs:element name="ID3456789012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -910,7 +910,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -918,7 +918,7 @@
 </xs:element>
 <xs:element name="INT16_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1150,7 +1150,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1171,7 +1171,7 @@
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1179,7 +1179,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1195,7 +1195,7 @@
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32">
+<xs:restriction base="xs:int">
 <xs:maxExclusive value="1"/>
 </xs:restriction>
 </xs:simpleType>
@@ -1205,7 +1205,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1213,7 +1213,7 @@
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1221,7 +1221,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1256,7 +1256,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1277,7 +1277,7 @@
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1285,7 +1285,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1301,7 +1301,7 @@
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32">
+<xs:restriction base="xs:int">
 <xs:maxExclusive value="2"/>
 </xs:restriction>
 </xs:simpleType>
@@ -1311,7 +1311,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1319,7 +1319,7 @@
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1327,7 +1327,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1362,7 +1362,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1383,7 +1383,7 @@
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1391,7 +1391,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1407,7 +1407,7 @@
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32">
+<xs:restriction base="xs:int">
 <xs:maxExclusive value="3"/>
 </xs:restriction>
 </xs:simpleType>
@@ -1417,7 +1417,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1425,7 +1425,7 @@
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1433,7 +1433,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1468,7 +1468,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1489,7 +1489,7 @@
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1497,7 +1497,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1513,7 +1513,7 @@
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32">
+<xs:restriction base="xs:int">
 <xs:maxExclusive value="4"/>
 </xs:restriction>
 </xs:simpleType>
@@ -1523,7 +1523,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1531,7 +1531,7 @@
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1539,7 +1539,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1574,7 +1574,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1595,7 +1595,7 @@
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1603,7 +1603,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1619,7 +1619,7 @@
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32">
+<xs:restriction base="xs:int">
 <xs:maxExclusive value="5"/>
 </xs:restriction>
 </xs:simpleType>
@@ -1629,7 +1629,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1637,7 +1637,7 @@
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1645,7 +1645,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1674,7 +1674,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1703,7 +1703,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1732,7 +1732,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1761,7 +1761,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1790,7 +1790,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1819,7 +1819,7 @@
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1827,7 +1827,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1856,7 +1856,7 @@
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1864,7 +1864,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1893,7 +1893,7 @@
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1901,7 +1901,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1930,7 +1930,7 @@
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1938,7 +1938,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1967,7 +1967,7 @@
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1975,7 +1975,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_SqlServer2005_master.txt
 ===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_SqlServer2005_master.txt	2010-12-06 \
                09:10:01 UTC (rev 5844)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_SqlServer2005_master.txt	2010-12-07 \
19:07:01 UTC (rev 5845) @@ -112,7 +112,7 @@
 <xs:sequence>
 <xs:element name="TABLE1_ID012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -127,7 +127,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -145,7 +145,7 @@
 </xs:element>
 <xs:element name="TABLE1_ID012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -170,7 +170,7 @@
 <xs:sequence>
 <xs:element name="TABLE1_ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -219,7 +219,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -237,7 +237,7 @@
 </xs:element>
 <xs:element name="TABLE1_ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -282,7 +282,7 @@
 <xs:sequence>
 <xs:element name="TABLE7_ID12345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -297,7 +297,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -315,7 +315,7 @@
 </xs:element>
 <xs:element name="TABLE7_ID12345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -347,7 +347,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -373,7 +373,7 @@
 </xs:element>
 <xs:element name="UNIQUE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -392,7 +392,7 @@
 <xs:sequence>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -400,7 +400,7 @@
 </xs:element>
 <xs:element name="INT64_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -435,7 +435,7 @@
 </xs:element>
 <xs:element name="BOOL_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="xs:unsignedByte"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -443,7 +443,7 @@
 </xs:element>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="xs:unsignedByte"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -490,7 +490,7 @@
 </xs:element>
 <xs:element name="ID3456789012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -508,7 +508,7 @@
 </xs:element>
 <xs:element name="INT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -516,7 +516,7 @@
 </xs:element>
 <xs:element name="INT16_COLUMN345678901234567890" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16">
+<xs:restriction base="xs:short">
 <xs:maxExclusive value="20000"/>
 </xs:restriction>
 </xs:simpleType>
@@ -526,7 +526,7 @@
 </xs:element>
 <xs:element name="INT32_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -534,7 +534,7 @@
 </xs:element>
 <xs:element name="INT64_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -685,7 +685,7 @@
 </xs:element>
 <xs:element name="TINYINT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="xs:unsignedByte"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -769,7 +769,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -777,7 +777,7 @@
 </xs:element>
 <xs:element name="INT16_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -806,7 +806,7 @@
 <xs:sequence>
 <xs:element name="ID" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -835,7 +835,7 @@
 <xs:sequence>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="xs:unsignedByte"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -854,7 +854,7 @@
 </xs:element>
 <xs:element name="ID3456789012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -881,7 +881,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -889,7 +889,7 @@
 </xs:element>
 <xs:element name="INT16_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1121,7 +1121,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1142,7 +1142,7 @@
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1150,7 +1150,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1166,7 +1166,7 @@
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32">
+<xs:restriction base="xs:int">
 <xs:maxExclusive value="1"/>
 </xs:restriction>
 </xs:simpleType>
@@ -1176,7 +1176,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1184,7 +1184,7 @@
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1192,7 +1192,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1227,7 +1227,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1248,7 +1248,7 @@
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1256,7 +1256,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1272,7 +1272,7 @@
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32">
+<xs:restriction base="xs:int">
 <xs:maxExclusive value="2"/>
 </xs:restriction>
 </xs:simpleType>
@@ -1282,7 +1282,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1290,7 +1290,7 @@
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1298,7 +1298,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1333,7 +1333,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1354,7 +1354,7 @@
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1362,7 +1362,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1378,7 +1378,7 @@
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32">
+<xs:restriction base="xs:int">
 <xs:maxExclusive value="3"/>
 </xs:restriction>
 </xs:simpleType>
@@ -1388,7 +1388,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1396,7 +1396,7 @@
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1404,7 +1404,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1439,7 +1439,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1460,7 +1460,7 @@
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1468,7 +1468,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1484,7 +1484,7 @@
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32">
+<xs:restriction base="xs:int">
 <xs:maxExclusive value="4"/>
 </xs:restriction>
 </xs:simpleType>
@@ -1494,7 +1494,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1502,7 +1502,7 @@
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1510,7 +1510,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1545,7 +1545,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1566,7 +1566,7 @@
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1574,7 +1574,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1590,7 +1590,7 @@
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32">
+<xs:restriction base="xs:int">
 <xs:maxExclusive value="5"/>
 </xs:restriction>
 </xs:simpleType>
@@ -1600,7 +1600,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1608,7 +1608,7 @@
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1616,7 +1616,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1645,7 +1645,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1674,7 +1674,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1703,7 +1703,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1732,7 +1732,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1761,7 +1761,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1790,7 +1790,7 @@
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1798,7 +1798,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1827,7 +1827,7 @@
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1835,7 +1835,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1864,7 +1864,7 @@
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1872,7 +1872,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1901,7 +1901,7 @@
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1909,7 +1909,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1938,7 +1938,7 @@
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1946,7 +1946,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_SqlServer2008_master.txt
 ===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_SqlServer2008_master.txt	2010-12-06 \
                09:10:01 UTC (rev 5844)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_SqlServer2008_master.txt	2010-12-07 \
19:07:01 UTC (rev 5845) @@ -112,7 +112,7 @@
 <xs:sequence>
 <xs:element name="TABLE1_ID012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -127,7 +127,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -145,7 +145,7 @@
 </xs:element>
 <xs:element name="TABLE1_ID012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -170,7 +170,7 @@
 <xs:sequence>
 <xs:element name="TABLE1_ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -219,7 +219,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -237,7 +237,7 @@
 </xs:element>
 <xs:element name="TABLE1_ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -282,7 +282,7 @@
 <xs:sequence>
 <xs:element name="TABLE7_ID12345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -297,7 +297,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -315,7 +315,7 @@
 </xs:element>
 <xs:element name="TABLE7_ID12345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -347,7 +347,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -373,7 +373,7 @@
 </xs:element>
 <xs:element name="UNIQUE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -392,7 +392,7 @@
 <xs:sequence>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -400,7 +400,7 @@
 </xs:element>
 <xs:element name="INT64_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -435,7 +435,7 @@
 </xs:element>
 <xs:element name="BOOL_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="xs:unsignedByte"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -443,7 +443,7 @@
 </xs:element>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="xs:unsignedByte"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -490,7 +490,7 @@
 </xs:element>
 <xs:element name="ID3456789012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -508,7 +508,7 @@
 </xs:element>
 <xs:element name="INT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -516,7 +516,7 @@
 </xs:element>
 <xs:element name="INT16_COLUMN345678901234567890" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16">
+<xs:restriction base="xs:short">
 <xs:maxExclusive value="20000"/>
 </xs:restriction>
 </xs:simpleType>
@@ -526,7 +526,7 @@
 </xs:element>
 <xs:element name="INT32_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -534,7 +534,7 @@
 </xs:element>
 <xs:element name="INT64_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -685,7 +685,7 @@
 </xs:element>
 <xs:element name="TINYINT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="xs:unsignedByte"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -769,7 +769,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -777,7 +777,7 @@
 </xs:element>
 <xs:element name="INT16_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -806,7 +806,7 @@
 <xs:sequence>
 <xs:element name="ID" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -835,7 +835,7 @@
 <xs:sequence>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="xs:unsignedByte"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -854,7 +854,7 @@
 </xs:element>
 <xs:element name="ID3456789012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -881,7 +881,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -889,7 +889,7 @@
 </xs:element>
 <xs:element name="INT16_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1121,7 +1121,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1142,7 +1142,7 @@
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1150,7 +1150,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1166,7 +1166,7 @@
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32">
+<xs:restriction base="xs:int">
 <xs:maxExclusive value="1"/>
 </xs:restriction>
 </xs:simpleType>
@@ -1176,7 +1176,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1184,7 +1184,7 @@
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1192,7 +1192,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1227,7 +1227,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1248,7 +1248,7 @@
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1256,7 +1256,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1272,7 +1272,7 @@
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32">
+<xs:restriction base="xs:int">
 <xs:maxExclusive value="2"/>
 </xs:restriction>
 </xs:simpleType>
@@ -1282,7 +1282,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1290,7 +1290,7 @@
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1298,7 +1298,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1333,7 +1333,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1354,7 +1354,7 @@
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1362,7 +1362,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1378,7 +1378,7 @@
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32">
+<xs:restriction base="xs:int">
 <xs:maxExclusive value="3"/>
 </xs:restriction>
 </xs:simpleType>
@@ -1388,7 +1388,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1396,7 +1396,7 @@
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1404,7 +1404,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1439,7 +1439,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1460,7 +1460,7 @@
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1468,7 +1468,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1484,7 +1484,7 @@
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32">
+<xs:restriction base="xs:int">
 <xs:maxExclusive value="4"/>
 </xs:restriction>
 </xs:simpleType>
@@ -1494,7 +1494,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1502,7 +1502,7 @@
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1510,7 +1510,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1545,7 +1545,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1566,7 +1566,7 @@
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1574,7 +1574,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1590,7 +1590,7 @@
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32">
+<xs:restriction base="xs:int">
 <xs:maxExclusive value="5"/>
 </xs:restriction>
 </xs:simpleType>
@@ -1600,7 +1600,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1608,7 +1608,7 @@
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1616,7 +1616,7 @@
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1645,7 +1645,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1674,7 +1674,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1703,7 +1703,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1732,7 +1732,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1761,7 +1761,7 @@
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1790,7 +1790,7 @@
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1798,7 +1798,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1827,7 +1827,7 @@
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1835,7 +1835,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1864,7 +1864,7 @@
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1872,7 +1872,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1901,7 +1901,7 @@
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1909,7 +1909,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1938,7 +1938,7 @@
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -1946,7 +1946,7 @@
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_SqlServer_master.txt
===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_SqlServer_master.txt	2010-12-06 \
                09:10:01 UTC (rev 5844)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_SqlServer_master.txt	2010-12-07 \
19:07:01 UTC (rev 5845) @@ -112,7 +112,7 @@
 <xs:sequence>
 <xs:element name="TABLE1_ID012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -127,7 +127,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -145,7 +145,7 @@
 </xs:element>
 <xs:element name="TABLE1_ID012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -170,7 +170,7 @@
 <xs:sequence>
 <xs:element name="TABLE1_ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -219,7 +219,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -237,7 +237,7 @@
 </xs:element>
 <xs:element name="TABLE1_ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -282,7 +282,7 @@
 <xs:sequence>
 <xs:element name="TABLE7_ID12345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -297,7 +297,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -315,7 +315,7 @@
 </xs:element>
 <xs:element name="TABLE7_ID12345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -347,7 +347,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -373,7 +373,7 @@
 </xs:element>
 <xs:element name="UNIQUE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -392,7 +392,7 @@
 <xs:sequence>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -400,7 +400,7 @@
 </xs:element>
 <xs:element name="INT64_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -435,7 +435,7 @@
 </xs:element>
 <xs:element name="BOOL_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="xs:unsignedByte"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -443,7 +443,7 @@
 </xs:element>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="xs:unsignedByte"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -490,7 +490,7 @@
 </xs:element>
 <xs:element name="ID3456789012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -508,7 +508,7 @@
 </xs:element>
 <xs:element name="INT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -516,7 +516,7 @@
 </xs:element>
 <xs:element name="INT16_COLUMN345678901234567890" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16">
+<xs:restriction base="xs:short">
 <xs:maxExclusive value="20000"/>
 </xs:restriction>
 </xs:simpleType>
@@ -526,7 +526,7 @@
 </xs:element>
 <xs:element name="INT32_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -534,7 +534,7 @@
 </xs:element>
 <xs:element name="INT64_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -685,7 +685,7 @@
 </xs:element>
 <xs:element name="TINYINT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="xs:unsignedByte"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -769,7 +769,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -777,7 +777,7 @@
 </xs:element>
 <xs:element name="INT16_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -806,7 +806,7 @@
 <xs:sequence>
 <xs:element name="ID" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -835,7 +835,7 @@
 <xs:sequence>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="xs:unsignedByte"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -854,7 +854,7 @@
 </xs:element>
 <xs:element name="ID3456789012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -881,7 +881,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -889,7 +889,7 @@
 </xs:element>
 <xs:element name="INT16_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="xs:short"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/impexp2a_master.txt
===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/impexp2a_master.txt	2010-12-06 09:10:01 \
                UTC (rev 5844)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/impexp2a_master.txt	2010-12-07 19:07:01 \
UTC (rev 5845) @@ -67,7 +67,7 @@
 </xs:element>
 <xs:element name="Prop1">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -140,7 +140,7 @@
 </xs:element>
 <xs:element name="Prop1" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -158,7 +158,7 @@
 </xs:element>
 <xs:element name="Prop3" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/impexp2b_master.txt
===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/impexp2b_master.txt	2010-12-06 09:10:01 \
                UTC (rev 5844)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/impexp2b_master.txt	2010-12-07 19:07:01 \
UTC (rev 5845) @@ -94,7 +94,7 @@
 </xs:element>
 <xs:element name="Prop1">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -167,7 +167,7 @@
 </xs:element>
 <xs:element name="Prop1" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -185,7 +185,7 @@
 </xs:element>
 <xs:element name="Prop3" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/spatial_context_test1m_master.xml
===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/spatial_context_test1m_master.xml	2010-12-06 \
                09:10:01 UTC (rev 5844)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/spatial_context_test1m_master.xml	2010-12-07 \
19:07:01 UTC (rev 5845) @@ -526,7 +526,7 @@
 </xs:element>
 <xs:element name="Prop1" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/spatial_context_test1n_master.xml
===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/spatial_context_test1n_master.xml	2010-12-06 \
                09:10:01 UTC (rev 5844)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/spatial_context_test1n_master.xml	2010-12-07 \
19:07:01 UTC (rev 5845) @@ -331,7 +331,7 @@
 </xs:element>
 <xs:element name="Prop1" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/spatial_context_test2m_master.xml
===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/spatial_context_test2m_master.xml	2010-12-06 \
                09:10:01 UTC (rev 5844)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/spatial_context_test2m_master.xml	2010-12-07 \
19:07:01 UTC (rev 5845) @@ -526,7 +526,7 @@
 </xs:element>
 <xs:element name="Prop1" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/spatial_context_test2n_master.xml
===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/spatial_context_test2n_master.xml	2010-12-06 \
                09:10:01 UTC (rev 5844)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/spatial_context_test2n_master.xml	2010-12-07 \
19:07:01 UTC (rev 5845) @@ -331,7 +331,7 @@
 </xs:element>
 <xs:element name="Prop1" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/spatial_context_test3m_master.xml
===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/spatial_context_test3m_master.xml	2010-12-06 \
                09:10:01 UTC (rev 5844)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/spatial_context_test3m_master.xml	2010-12-07 \
19:07:01 UTC (rev 5845) @@ -587,7 +587,7 @@
 </xs:element>
 <xs:element name="Prop1" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/spatial_context_test3n_master.xml
===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/spatial_context_test3n_master.xml	2010-12-06 \
                09:10:01 UTC (rev 5844)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/spatial_context_test3n_master.xml	2010-12-07 \
19:07:01 UTC (rev 5845) @@ -388,7 +388,7 @@
 </xs:element>
 <xs:element name="Prop1" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="xs:long"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -417,7 +417,7 @@
 </xs:element>
 <xs:element name="id">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -451,7 +451,7 @@
 </xs:element>
 <xs:element name="id">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/spatial_contexts1_SQLServerSpatial_master.txt
 ===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/spatial_contexts1_SQLServerSpatial_master.txt	2010-12-06 \
                09:10:01 UTC (rev 5844)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/spatial_contexts1_SQLServerSpatial_master.txt	2010-12-07 \
19:07:01 UTC (rev 5845) @@ -145,7 +145,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -204,7 +204,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -252,7 +252,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -300,7 +300,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -341,7 +341,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/spatial_contexts2_SQLServerSpatial_master.txt
 ===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/spatial_contexts2_SQLServerSpatial_master.txt	2010-12-06 \
                09:10:01 UTC (rev 5844)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/spatial_contexts2_SQLServerSpatial_master.txt	2010-12-07 \
19:07:01 UTC (rev 5845) @@ -145,7 +145,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -204,7 +204,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -252,7 +252,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -300,7 +300,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -341,7 +341,7 @@
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/spatial_contexts3_SQLServerSpatial_master.txt
 ===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/spatial_contexts3_SQLServerSpatial_master.txt	2010-12-06 \
                09:10:01 UTC (rev 5844)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/spatial_contexts3_SQLServerSpatial_master.txt	2010-12-07 \
19:07:01 UTC (rev 5845) @@ -147,7 +147,7 @@
 <xs:sequence>
 <xs:element name="id">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -182,7 +182,7 @@
 <xs:sequence>
 <xs:element name="id">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -212,7 +212,7 @@
 <xs:sequence>
 <xs:element name="id">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -242,7 +242,7 @@
 <xs:sequence>
 <xs:element name="id">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -272,7 +272,7 @@
 <xs:sequence>
 <xs:element name="id">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>
@@ -302,7 +302,7 @@
 <xs:sequence>
 <xs:element name="id">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="xs:int"/>
 </xs:simpleType>
 <xs:annotation>
 <xs:documentation/>

Modified: trunk/Providers/SDF/Src/UnitTest/apply_schema_test1_master.xml
===================================================================
--- trunk/Providers/SDF/Src/UnitTest/apply_schema_test1_master.xml	2010-12-06 \
                09:10:01 UTC (rev 5844)
+++ trunk/Providers/SDF/Src/UnitTest/apply_schema_test1_master.xml	2010-12-07 \
19:07:01 UTC (rev 5845) @@ -19,7 +19,7 @@
                <xs:sequence>
                   <xs:element name="FeatId" fdo:readOnly="true" \
fdo:autogenerated="true">  <xs:simpleType>
-                        <xs:restriction base="fdo:int32"/>
+                        <xs:restriction base="xs:int"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation>id</xs:documentation>
@@ -37,7 +37,7 @@
                   </xs:element>
                   <xs:element name="ColourIndex" minOccurs="0">
                      <xs:simpleType>
-                        <xs:restriction base="fdo:byte"/>
+                        <xs:restriction base="xs:unsignedByte"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation>Acad Colour</xs:documentation>
@@ -109,7 +109,7 @@
                <xs:sequence>
                   <xs:element name="FeatId" fdo:readOnly="true" \
fdo:autogenerated="true">  <xs:simpleType>
-                        <xs:restriction base="fdo:int32"/>
+                        <xs:restriction base="xs:int"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation>id</xs:documentation>
@@ -184,7 +184,7 @@
                   </xs:element>
                   <xs:element name="PartNum" minOccurs="0">
                      <xs:simpleType>
-                        <xs:restriction base="fdo:int16"/>
+                        <xs:restriction base="xs:short"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>
@@ -200,7 +200,7 @@
                   </xs:element>
                   <xs:element name="SerialNum">
                      <xs:simpleType>
-                        <xs:restriction base="fdo:int64"/>
+                        <xs:restriction base="xs:long"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>
@@ -255,7 +255,7 @@
                   </xs:element>
                   <xs:element name="FeatureId" fdo:readOnly="true" \
fdo:autogenerated="true">  <xs:simpleType>
-                        <xs:restriction base="fdo:int32"/>
+                        <xs:restriction base="xs:int"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>
@@ -298,7 +298,7 @@
                   </xs:element>
                   <xs:element name="Type">
                      <xs:simpleType>
-                        <xs:restriction base="fdo:int32"/>
+                        <xs:restriction base="xs:int"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>
@@ -323,7 +323,7 @@
                <xs:sequence>
                   <xs:element name="Number">
                      <xs:simpleType>
-                        <xs:restriction base="fdo:int32"/>
+                        <xs:restriction base="xs:int"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>
@@ -417,7 +417,7 @@
                   </xs:element>
                   <xs:element name="Credit-x20-Rating" fdo:readOnly="true" \
minOccurs="0">  <xs:simpleType>
-                        <xs:restriction base="fdo:byte"/>
+                        <xs:restriction base="xs:unsignedByte"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>

Modified: trunk/Providers/SDF/Src/UnitTest/apply_schema_test2_master.xml
===================================================================
--- trunk/Providers/SDF/Src/UnitTest/apply_schema_test2_master.xml	2010-12-06 \
                09:10:01 UTC (rev 5844)
+++ trunk/Providers/SDF/Src/UnitTest/apply_schema_test2_master.xml	2010-12-07 \
19:07:01 UTC (rev 5845) @@ -19,7 +19,7 @@
                <xs:sequence>
                   <xs:element name="FeatId" fdo:readOnly="true" \
fdo:autogenerated="true">  <xs:simpleType>
-                        <xs:restriction base="fdo:int32"/>
+                        <xs:restriction base="xs:int"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation>id</xs:documentation>
@@ -37,7 +37,7 @@
                   </xs:element>
                   <xs:element name="ColourIndex" minOccurs="0">
                      <xs:simpleType>
-                        <xs:restriction base="fdo:byte"/>
+                        <xs:restriction base="xs:unsignedByte"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation>Acad Colour</xs:documentation>
@@ -95,7 +95,7 @@
                <xs:sequence>
                   <xs:element name="FeatId" fdo:readOnly="true" \
fdo:autogenerated="true">  <xs:simpleType>
-                        <xs:restriction base="fdo:int32"/>
+                        <xs:restriction base="xs:int"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation>id</xs:documentation>
@@ -170,7 +170,7 @@
                   </xs:element>
                   <xs:element name="PartNum" minOccurs="0">
                      <xs:simpleType>
-                        <xs:restriction base="fdo:int16"/>
+                        <xs:restriction base="xs:short"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>
@@ -186,7 +186,7 @@
                   </xs:element>
                   <xs:element name="SerialNum">
                      <xs:simpleType>
-                        <xs:restriction base="fdo:int64"/>
+                        <xs:restriction base="xs:long"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>
@@ -236,7 +236,7 @@
                <xs:sequence>
                   <xs:element name="Number">
                      <xs:simpleType>
-                        <xs:restriction base="fdo:int32"/>
+                        <xs:restriction base="xs:int"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>
@@ -292,7 +292,7 @@
                   </xs:element>
                   <xs:element name="Credit-x20-Rating" fdo:readOnly="true" \
minOccurs="0">  <xs:simpleType>
-                        <xs:restriction base="fdo:byte"/>
+                        <xs:restriction base="xs:unsignedByte"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>

Modified: trunk/Providers/SDF/Src/UnitTest/apply_schema_test3_master.xml
===================================================================
--- trunk/Providers/SDF/Src/UnitTest/apply_schema_test3_master.xml	2010-12-06 \
                09:10:01 UTC (rev 5844)
+++ trunk/Providers/SDF/Src/UnitTest/apply_schema_test3_master.xml	2010-12-07 \
19:07:01 UTC (rev 5845) @@ -19,7 +19,7 @@
                <xs:sequence>
                   <xs:element name="FeatId" fdo:readOnly="true" \
fdo:autogenerated="true">  <xs:simpleType>
-                        <xs:restriction base="fdo:int32"/>
+                        <xs:restriction base="xs:int"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation>id</xs:documentation>
@@ -37,7 +37,7 @@
                   </xs:element>
                   <xs:element name="ColourIndex" minOccurs="0">
                      <xs:simpleType>
-                        <xs:restriction base="fdo:byte"/>
+                        <xs:restriction base="xs:unsignedByte"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation>Acad Colour</xs:documentation>
@@ -95,7 +95,7 @@
                <xs:sequence>
                   <xs:element name="FeatId" fdo:readOnly="true" \
fdo:autogenerated="true">  <xs:simpleType>
-                        <xs:restriction base="fdo:int32"/>
+                        <xs:restriction base="xs:int"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation>id</xs:documentation>
@@ -170,7 +170,7 @@
                   </xs:element>
                   <xs:element name="PartNum" minOccurs="0">
                      <xs:simpleType>
-                        <xs:restriction base="fdo:int16"/>
+                        <xs:restriction base="xs:short"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>
@@ -186,7 +186,7 @@
                   </xs:element>
                   <xs:element name="SerialNum">
                      <xs:simpleType>
-                        <xs:restriction base="fdo:int64"/>
+                        <xs:restriction base="xs:long"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>
@@ -244,7 +244,7 @@
                <xs:sequence>
                   <xs:element name="Number">
                      <xs:simpleType>
-                        <xs:restriction base="fdo:int32"/>
+                        <xs:restriction base="xs:int"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>
@@ -300,7 +300,7 @@
                   </xs:element>
                   <xs:element name="Credit-x20-Rating" fdo:readOnly="true" \
minOccurs="0">  <xs:simpleType>
-                        <xs:restriction base="fdo:byte"/>
+                        <xs:restriction base="xs:unsignedByte"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>
@@ -355,7 +355,7 @@
                <xs:sequence>
                   <xs:element name="FeatId" fdo:readOnly="true" \
fdo:autogenerated="true">  <xs:simpleType>
-                        <xs:restriction base="fdo:int32"/>
+                        <xs:restriction base="xs:int"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>
@@ -400,7 +400,7 @@
                   </xs:element>
                   <xs:element name="Type">
                      <xs:simpleType>
-                        <xs:restriction base="fdo:int32"/>
+                        <xs:restriction base="xs:int"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>

Modified: trunk/Providers/SDF/Src/UnitTest/apply_schema_test4_master.xml
===================================================================
--- trunk/Providers/SDF/Src/UnitTest/apply_schema_test4_master.xml	2010-12-06 \
                09:10:01 UTC (rev 5844)
+++ trunk/Providers/SDF/Src/UnitTest/apply_schema_test4_master.xml	2010-12-07 \
19:07:01 UTC (rev 5845) @@ -19,7 +19,7 @@
                <xs:sequence>
                   <xs:element name="FeatId" fdo:readOnly="true" \
fdo:autogenerated="true">  <xs:simpleType>
-                        <xs:restriction base="fdo:int32"/>
+                        <xs:restriction base="xs:int"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation>id</xs:documentation>
@@ -37,7 +37,7 @@
                   </xs:element>
                   <xs:element name="ColourIndex" minOccurs="0">
                      <xs:simpleType>
-                        <xs:restriction base="fdo:byte"/>
+                        <xs:restriction base="xs:unsignedByte"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation>Acad Colour</xs:documentation>
@@ -109,7 +109,7 @@
                <xs:sequence>
                   <xs:element name="FeatId" fdo:readOnly="true" \
fdo:autogenerated="true">  <xs:simpleType>
-                        <xs:restriction base="fdo:int32"/>
+                        <xs:restriction base="xs:int"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation>id</xs:documentation>
@@ -184,7 +184,7 @@
                   </xs:element>
                   <xs:element name="PartNum" minOccurs="0">
                      <xs:simpleType>
-                        <xs:restriction base="fdo:int16"/>
+                        <xs:restriction base="xs:short"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>
@@ -200,7 +200,7 @@
                   </xs:element>
                   <xs:element name="SerialNum">
                      <xs:simpleType>
-                        <xs:restriction base="fdo:int64"/>
+                        <xs:restriction base="xs:long"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>
@@ -258,7 +258,7 @@
                <xs:sequence>
                   <xs:element name="Number">
                      <xs:simpleType>
-                        <xs:restriction base="fdo:int32"/>
+                        <xs:restriction base="xs:int"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>
@@ -314,7 +314,7 @@
                   </xs:element>
                   <xs:element name="Credit-x20-Rating" fdo:readOnly="true" \
minOccurs="0">  <xs:simpleType>
-                        <xs:restriction base="fdo:byte"/>
+                        <xs:restriction base="xs:unsignedByte"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>
@@ -369,7 +369,7 @@
                <xs:sequence>
                   <xs:element name="FeatId" fdo:readOnly="true" \
fdo:autogenerated="true">  <xs:simpleType>
-                        <xs:restriction base="fdo:int32"/>
+                        <xs:restriction base="xs:int"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>
@@ -414,7 +414,7 @@
                   </xs:element>
                   <xs:element name="Type">
                      <xs:simpleType>
-                        <xs:restriction base="fdo:int32"/>
+                        <xs:restriction base="xs:int"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>

Modified: trunk/Providers/SDF/Src/UnitTest/apply_schema_test5_master.xml
===================================================================
--- trunk/Providers/SDF/Src/UnitTest/apply_schema_test5_master.xml	2010-12-06 \
                09:10:01 UTC (rev 5844)
+++ trunk/Providers/SDF/Src/UnitTest/apply_schema_test5_master.xml	2010-12-07 \
19:07:01 UTC (rev 5845) @@ -19,7 +19,7 @@
                <xs:sequence>
                   <xs:element name="FeatId" fdo:readOnly="true" \
fdo:autogenerated="true">  <xs:simpleType>
-                        <xs:restriction base="fdo:int32"/>
+                        <xs:restriction base="xs:int"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation>id</xs:documentation>
@@ -37,7 +37,7 @@
                   </xs:element>
                   <xs:element name="ColourIndex" minOccurs="0">
                      <xs:simpleType>
-                        <xs:restriction base="fdo:byte"/>
+                        <xs:restriction base="xs:unsignedByte"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation>Acad Colour</xs:documentation>
@@ -109,7 +109,7 @@
                <xs:sequence>
                   <xs:element name="FeatId" fdo:readOnly="true" \
fdo:autogenerated="true">  <xs:simpleType>
-                        <xs:restriction base="fdo:int32"/>
+                        <xs:restriction base="xs:int"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation>id</xs:documentation>
@@ -184,7 +184,7 @@
                   </xs:element>
                   <xs:element name="PartNum" minOccurs="0">
                      <xs:simpleType>
-                        <xs:restriction base="fdo:int16"/>
+                        <xs:restriction base="xs:short"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>
@@ -200,7 +200,7 @@
                   </xs:element>
                   <xs:element name="SerialNum">
                      <xs:simpleType>
-                        <xs:restriction base="fdo:int64"/>
+                        <xs:restriction base="xs:long"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>
@@ -255,7 +255,7 @@
                   </xs:element>
                   <xs:element name="FeatureId" fdo:readOnly="true" \
fdo:autogenerated="true">  <xs:simpleType>
-                        <xs:restriction base="fdo:int32"/>
+                        <xs:restriction base="xs:int"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>
@@ -298,7 +298,7 @@
                   </xs:element>
                   <xs:element name="Type">
                      <xs:simpleType>
-                        <xs:restriction base="fdo:int32"/>
+                        <xs:restriction base="xs:int"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>
@@ -323,7 +323,7 @@
                <xs:sequence>
                   <xs:element name="Number">
                      <xs:simpleType>
-                        <xs:restriction base="fdo:int32"/>
+                        <xs:restriction base="xs:int"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>
@@ -417,7 +417,7 @@
                   </xs:element>
                   <xs:element name="Credit-x20-Rating" fdo:readOnly="true" \
minOccurs="0">  <xs:simpleType>
-                        <xs:restriction base="fdo:byte"/>
+                        <xs:restriction base="xs:unsignedByte"/>
                      </xs:simpleType>
                      <xs:annotation>
                         <xs:documentation/>

_______________________________________________
fdo-commits mailing list
fdo-commits@lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/fdo-commits


[prev in list] [next in list] [prev in thread] [next in thread]