2004-10-22 Atsushi Enomoto <atsushi@ximian.com>
authorAtsushi Eno <atsushieno@gmail.com>
Fri, 22 Oct 2004 17:47:52 +0000 (17:47 -0000)
committerAtsushi Eno <atsushieno@gmail.com>
Fri, 22 Oct 2004 17:47:52 +0000 (17:47 -0000)
InternalPool.cs,
XmlChar.cs,
XmlStoredResolver.cs: Initial Checkin.

svn path=/trunk/mcs/; revision=35253

mcs/class/Mono.Xml.Ext/Mono.Xml/ChangeLog [new file with mode: 0755]
mcs/class/Mono.Xml.Ext/Mono.Xml/InternalPool.cs [new file with mode: 0755]
mcs/class/Mono.Xml.Ext/Mono.Xml/XmlChar.cs [new file with mode: 0755]
mcs/class/Mono.Xml.Ext/Mono.Xml/XmlStoredResolver.cs [new file with mode: 0755]

diff --git a/mcs/class/Mono.Xml.Ext/Mono.Xml/ChangeLog b/mcs/class/Mono.Xml.Ext/Mono.Xml/ChangeLog
new file mode 100755 (executable)
index 0000000..06a89c0
--- /dev/null
@@ -0,0 +1,6 @@
+2004-10-22  Atsushi Enomoto <atsushi@ximian.com>
+
+       InternalPool.cs,
+       XmlChar.cs,
+       XmlStoredResolver.cs: Initial Checkin.
+
diff --git a/mcs/class/Mono.Xml.Ext/Mono.Xml/InternalPool.cs b/mcs/class/Mono.Xml.Ext/Mono.Xml/InternalPool.cs
new file mode 100755 (executable)
index 0000000..2d1ccaf
--- /dev/null
@@ -0,0 +1,211 @@
+
+using System;
+using System.Collections;
+using System.Xml;
+using System.Xml.Schema;
+
+namespace Mono.Xml
+{
+       internal class InternalPool
+       {
+               public const string XdtNamespace = "http://www.w3.org/2003/11/xpath-datatypes";
+
+               internal static readonly XmlQualifiedName XsAnyTypeName
+                       = new XmlQualifiedName ("any", XmlSchema.Namespace);
+               internal static readonly XmlSchemaComplexType XsAnyType
+                       = XmlSchemaType.GetBuiltInComplexType (XsAnyTypeName);
+
+               internal static readonly XmlQualifiedName XdtUntypedAtomicName
+                       = new XmlQualifiedName ("untypedAtomic", XdtNamespace);
+               internal static readonly XmlSchemaSimpleType XdtUntypedAtomic
+                       = XmlSchemaType.GetBuiltInSimpleType (XdtUntypedAtomicName);
+
+               internal static readonly XmlQualifiedName XsStringName
+                       = new XmlQualifiedName ("string", XmlSchema.Namespace);
+               internal static readonly XmlSchemaSimpleType XsString
+                       = XmlSchemaType.GetBuiltInSimpleType (XsStringName);
+               internal static readonly XmlQualifiedName XsNormalizedStringName
+                       = new XmlQualifiedName ("normalizedString", XmlSchema.Namespace);
+               internal static readonly XmlSchemaSimpleType XsNormalizedString
+                       = XmlSchemaType.GetBuiltInSimpleType (XsNormalizedStringName);
+               internal static readonly XmlQualifiedName XsTokenName
+                       = new XmlQualifiedName ("token", XmlSchema.Namespace);
+               internal static readonly XmlSchemaSimpleType XsToken
+                       = XmlSchemaType.GetBuiltInSimpleType (XsTokenName);
+               internal static readonly XmlQualifiedName XsIDName
+                       = new XmlQualifiedName ("ID", XmlSchema.Namespace);
+               internal static readonly XmlSchemaSimpleType XsID
+                       = XmlSchemaType.GetBuiltInSimpleType (XsIDName);
+               internal static readonly XmlQualifiedName XsIDREFName
+                       = new XmlQualifiedName ("IDREF", XmlSchema.Namespace);
+               internal static readonly XmlSchemaSimpleType XsIDREF
+                       = XmlSchemaType.GetBuiltInSimpleType (XsIDREFName);
+               internal static readonly XmlQualifiedName XsIDREFSName
+                       = new XmlQualifiedName ("IDREFS", XmlSchema.Namespace);
+               internal static readonly XmlSchemaSimpleType XsIDREFS
+                       = XmlSchemaType.GetBuiltInSimpleType (XsIDREFSName);
+               internal static readonly XmlQualifiedName XsQNameName
+                       = new XmlQualifiedName ("QName", XmlSchema.Namespace);
+               internal static readonly XmlSchemaSimpleType XsQName
+                       = XmlSchemaType.GetBuiltInSimpleType (XsQNameName);
+               internal static readonly XmlQualifiedName XsBooleanName
+                       = new XmlQualifiedName ("boolean", XmlSchema.Namespace);
+               internal static readonly XmlSchemaSimpleType XsBoolean
+                       = XmlSchemaType.GetBuiltInSimpleType (XsBooleanName);
+
+               internal static readonly XmlQualifiedName XsDurationName
+                       = new XmlQualifiedName ("duration", XmlSchema.Namespace);
+               internal static readonly XmlSchemaSimpleType XsDuration
+                       = XmlSchemaType.GetBuiltInSimpleType (XsDurationName);
+               internal static readonly XmlQualifiedName XdtDayTimeDurationName
+                       = new XmlQualifiedName ("dayTimeDuration", InternalPool.XdtNamespace);
+               internal static readonly XmlSchemaSimpleType XdtDayTimeDuration
+                       = XmlSchemaType.GetBuiltInSimpleType (XdtDayTimeDurationName);
+               internal static readonly XmlQualifiedName XdtYearMonthDurationName
+                       = new XmlQualifiedName ("yearMonthDuration", InternalPool.XdtNamespace);
+               internal static readonly XmlSchemaSimpleType XdtYearMonthDuration
+                       = XmlSchemaType.GetBuiltInSimpleType (XdtYearMonthDurationName);
+
+               internal static readonly XmlQualifiedName XsDateTimeName
+                       = new XmlQualifiedName ("dateTime", XmlSchema.Namespace);
+               internal static readonly XmlSchemaSimpleType XsDateTime
+                       = XmlSchemaType.GetBuiltInSimpleType (XsDateTimeName);
+
+               internal static readonly XmlQualifiedName XsFloatName
+                       = new XmlQualifiedName ("float", XmlSchema.Namespace);
+               internal static readonly XmlSchemaSimpleType XsFloat
+                       = XmlSchemaType.GetBuiltInSimpleType (XsFloatName);
+               internal static readonly XmlQualifiedName XsDoubleName
+                       = new XmlQualifiedName ("double", XmlSchema.Namespace);
+               internal static readonly XmlSchemaSimpleType XsDouble
+                       = XmlSchemaType.GetBuiltInSimpleType (XsDoubleName);
+               internal static readonly XmlQualifiedName XsDecimalName
+                       = new XmlQualifiedName ("decimal", XmlSchema.Namespace);
+               internal static readonly XmlSchemaSimpleType XsDecimal
+                       = XmlSchemaType.GetBuiltInSimpleType (XsDecimalName);
+               internal static readonly XmlQualifiedName XsIntegerName
+                       = new XmlQualifiedName ("integer", XmlSchema.Namespace);
+               internal static readonly XmlSchemaSimpleType XsInteger
+                       = XmlSchemaType.GetBuiltInSimpleType (XsIntegerName);
+
+               internal static readonly XmlQualifiedName XsLongName
+                       = new XmlQualifiedName ("long", XmlSchema.Namespace);
+               internal static readonly XmlSchemaSimpleType XsLong
+                       = XmlSchemaType.GetBuiltInSimpleType (XsLongName);
+               internal static readonly XmlQualifiedName XsIntName
+                       = new XmlQualifiedName ("int", XmlSchema.Namespace);
+               internal static readonly XmlSchemaSimpleType XsInt
+                       = XmlSchemaType.GetBuiltInSimpleType (XsIntName);
+               internal static readonly XmlQualifiedName XsShortName
+                       = new XmlQualifiedName ("short", XmlSchema.Namespace);
+               internal static readonly XmlSchemaSimpleType XsShort
+                       = XmlSchemaType.GetBuiltInSimpleType (XsShortName);
+               internal static readonly XmlQualifiedName XsUnsignedLongName
+                       = new XmlQualifiedName ("unsignedLong", XmlSchema.Namespace);
+               internal static readonly XmlSchemaSimpleType XsUnsignedLong
+                       = XmlSchemaType.GetBuiltInSimpleType (XsUnsignedLongName);
+               internal static readonly XmlQualifiedName XsUnsignedIntName
+                       = new XmlQualifiedName ("unsignedInt", XmlSchema.Namespace);
+               internal static readonly XmlSchemaSimpleType XsUnsignedInt
+                       = XmlSchemaType.GetBuiltInSimpleType (XsUnsignedIntName);
+               internal static readonly XmlQualifiedName XsUnsignedShortName
+                       = new XmlQualifiedName ("unsignedShort", XmlSchema.Namespace);
+               internal static readonly XmlSchemaSimpleType XsUnsignedShort
+                       = XmlSchemaType.GetBuiltInSimpleType (XsUnsignedShortName);
+
+               // Methods
+
+               public static XmlQualifiedName ParseQName (string name, IXmlNamespaceResolver resolver)
+               {
+                       int index = name.IndexOf (':');
+                       if (index < 0)
+                               return new XmlQualifiedName (name);
+                       string ns = resolver.LookupNamespace (name.Substring (0, index));
+                       if (ns == null)
+                               throw new ArgumentException ("Invalid qualified name.");
+                       return new XmlQualifiedName (name.Substring (index + 1), ns);
+               }
+
+               public static XmlSchemaType GetBuiltInType (XmlQualifiedName name)
+               {
+                       XmlSchemaType t = XmlSchemaType.GetBuiltInSimpleType (name);
+                       if (t != null)
+                               return t;
+                       return XmlSchemaType.GetBuiltInComplexType (name);
+               }
+
+               public static XmlSchemaType GetBuiltInType (XmlTypeCode type)
+               {
+                       XmlSchemaType t = XmlSchemaType.GetBuiltInSimpleType (type);
+                       if (t != null)
+                               return t;
+                       return XmlSchemaType.GetBuiltInComplexType (type);
+               }
+
+               internal static Type RuntimeTypeFromXmlTypeCode (XmlTypeCode typeCode)
+               {
+                       switch (typeCode) {
+                       case XmlTypeCode.Int:
+                               return typeof (int);
+                       case XmlTypeCode.Decimal:
+                               return typeof (decimal);
+                       case XmlTypeCode.Double:
+                               return typeof (double);
+                       case XmlTypeCode.Float:
+                               return typeof (float);
+                       case XmlTypeCode.Long:
+                               return typeof (long);
+                       case XmlTypeCode.Short:
+                               return typeof (short);
+                       case XmlTypeCode.UnsignedShort:
+                               return typeof (ushort);
+                       case XmlTypeCode.UnsignedInt:
+                               return typeof (uint);
+                       case XmlTypeCode.String:
+                               return typeof (string);
+                       case XmlTypeCode.DateTime:
+                               return typeof (DateTime);
+                       case XmlTypeCode.Boolean:
+                               return typeof (bool);
+                       case XmlTypeCode.Item:
+                               return typeof (object);
+                       }
+                       throw new NotSupportedException (String.Format ("XQuery internal error: Cannot infer Runtime Type from XmlTypeCode {0}.", typeCode));
+               }
+
+               internal static XmlTypeCode XmlTypeCodeFromRuntimeType (Type cliType, bool raiseError)
+               {
+                       switch (Type.GetTypeCode (cliType)) {
+                       case TypeCode.Int32:
+                               return XmlTypeCode.Int;
+                       case TypeCode.Decimal:
+                               return XmlTypeCode.Decimal;
+                       case TypeCode.Double:
+                               return XmlTypeCode.Double;
+                       case TypeCode.Single:
+                               return XmlTypeCode.Float;
+                       case TypeCode.Int64:
+                               return XmlTypeCode.Long;
+                       case TypeCode.Int16:
+                               return XmlTypeCode.Short;
+                       case TypeCode.UInt16:
+                               return XmlTypeCode.UnsignedShort;
+                       case TypeCode.UInt32:
+                               return XmlTypeCode.UnsignedInt;
+                       case TypeCode.String:
+                               return XmlTypeCode.String;
+                       case TypeCode.DateTime:
+                               return XmlTypeCode.DateTime;
+                       case TypeCode.Boolean:
+                               return XmlTypeCode.Boolean;
+                       case TypeCode.Object:
+                               return XmlTypeCode.Item;
+                       }
+                       if (raiseError)
+                               throw new NotSupportedException (String.Format ("XQuery internal error: Cannot infer XmlTypeCode from Runtime Type {0}", cliType));
+                       else
+                               return XmlTypeCode.None;
+               }
+       }
+}
+
diff --git a/mcs/class/Mono.Xml.Ext/Mono.Xml/XmlChar.cs b/mcs/class/Mono.Xml.Ext/Mono.Xml/XmlChar.cs
new file mode 100755 (executable)
index 0000000..252fc1f
--- /dev/null
@@ -0,0 +1,692 @@
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+using System;\r
+\r
+namespace System.Xml\r
+{\r
+       /// <summary>\r
+       /// http://www.w3.org/TR/REC-xml\r
+       /// </summary>\r
+       /// <remarks>\r
+       /// Includes code and Ideas from  org.apache.xerces.util.XMLChar class of Xerces 2.0.1\r
+       /// However, No surrogate support is included in this class.\r
+       /// This class is currently public. Make it internal after testing completes\r
+       /// </remarks>\r
+       internal class XmlChar//XmlConstructs\r
+       {\r
+               internal static readonly char [] WhitespaceChars = {' ', '\n', '\t', '\r'};
+\r
+               /** Character flags. */\r
+               internal static readonly byte [] CHARS = new byte [1 << 16];\r
+\r
+               /** Valid character mask. */\r
+               internal const int VALID = 0x01;\r
+\r
+               /** Space character mask. */\r
+               internal const int SPACE = 0x02;\r
+\r
+               /** Name start character mask. */\r
+               internal const int NAME_START = 0x04;\r
+\r
+               /** Name character mask. */\r
+               internal const int NAME = 0x08;\r
+\r
+               /** Pubid character mask. */\r
+               internal const int PUBID = 0x10;\r
+               /** \r
+                        * Content character mask. Special characters are those that can\r
+                        * be considered the start of markup, such as '&lt;' and '&amp;'. \r
+                        * The various newline characters are considered special as well.\r
+                        * All other valid XML characters can be considered content.\r
+                        * <p>\r
+                        * This is an optimization for the inner loop of character scanning.\r
+                        */\r
+               internal const int CONTENT = 0x20;\r
+\r
+               /** NCName start character mask. */\r
+               internal const int NCNAME_START = 0x40;\r
+\r
+               /** NCName character mask. */\r
+               internal const int NCNAME = 0x80;\r
+       \r
+               static XmlChar()\r
+               {\r
+                       //\r
+                       // [2] Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] |\r
+                       //              [#xE000-#xFFFD] | [#x10000-#x10FFFF]\r
+                       //\r
+                       int[] charRange = { \r
+                                                                 0x0009, 0x000A, 0x000D, 0x000D, 0x0020, 0xD7FF, 0xE000, 0xFFFD,\r
+                       };\r
+\r
+                       //\r
+                       // [3] S ::= (#x20 | #x9 | #xD | #xA)+\r
+                       //\r
+                       int[] spaceChar = { \r
+                                                                 0x0020, 0x0009, 0x000D, 0x000A,\r
+                       };\r
+\r
+                       //\r
+                       // [4] NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' |\r
+                       //                  CombiningChar | Extender\r
+                       //\r
+                       int[] nameChar = { \r
+                                                                0x002D, 0x002E, // '-' and '.'\r
+                       };\r
+\r
+                       //\r
+                       // [5] Name ::= (Letter | '_' | ':') (NameChar)*\r
+                       //\r
+\r
+                       int[] nameStartChar = { \r
+                                                                         0x003A, 0x005F, // ':' and '_'\r
+                       };\r
+\r
+                       //\r
+                       // [13] PubidChar ::= #x20 | 0xD | 0xA | [a-zA-Z0-9] | [-'()+,./:=?;!*#@$_%]\r
+                       //\r
+\r
+                       int[] pubidChar = {\r
+                                                                 0x000A, 0x000D, 0x0020, 0x0021, 0x0023, 0x0024, 0x0025, 0x003D,\r
+                                                                 0x005F\r
+                                                         };\r
+\r
+                       int[] pubidRange = {\r
+                                                                  0x0027, 0x003B, 0x003F, 0x005A, 0x0061, 0x007A\r
+                                                          };\r
+\r
+                       //\r
+                       // [84] Letter ::= BaseChar | Ideographic\r
+                       //\r
+\r
+                       int[] letterRange = {\r
+                                                                       // BaseChar\r
+                                                                       0x0041, 0x005A, 0x0061, 0x007A, 0x00C0, 0x00D6, 0x00D8, 0x00F6,\r
+                                                                       0x00F8, 0x0131, 0x0134, 0x013E, 0x0141, 0x0148, 0x014A, 0x017E,\r
+                                                                       0x0180, 0x01C3, 0x01CD, 0x01F0, 0x01F4, 0x01F5, 0x01FA, 0x0217,\r
+                                                                       0x0250, 0x02A8, 0x02BB, 0x02C1, 0x0388, 0x038A, 0x038E, 0x03A1,\r
+                                                                       0x03A3, 0x03CE, 0x03D0, 0x03D6, 0x03E2, 0x03F3, 0x0401, 0x040C,\r
+                                                                       0x040E, 0x044F, 0x0451, 0x045C, 0x045E, 0x0481, 0x0490, 0x04C4,\r
+                                                                       0x04C7, 0x04C8, 0x04CB, 0x04CC, 0x04D0, 0x04EB, 0x04EE, 0x04F5,\r
+                                                                       0x04F8, 0x04F9, 0x0531, 0x0556, 0x0561, 0x0586, 0x05D0, 0x05EA,\r
+                                                                       0x05F0, 0x05F2, 0x0621, 0x063A, 0x0641, 0x064A, 0x0671, 0x06B7,\r
+                                                                       0x06BA, 0x06BE, 0x06C0, 0x06CE, 0x06D0, 0x06D3, 0x06E5, 0x06E6,\r
+                                                                       0x0905, 0x0939, 0x0958, 0x0961, 0x0985, 0x098C, 0x098F, 0x0990,\r
+                                                                       0x0993, 0x09A8, 0x09AA, 0x09B0, 0x09B6, 0x09B9, 0x09DC, 0x09DD,\r
+                                                                       0x09DF, 0x09E1, 0x09F0, 0x09F1, 0x0A05, 0x0A0A, 0x0A0F, 0x0A10,\r
+                                                                       0x0A13, 0x0A28, 0x0A2A, 0x0A30, 0x0A32, 0x0A33, 0x0A35, 0x0A36,\r
+                                                                       0x0A38, 0x0A39, 0x0A59, 0x0A5C, 0x0A72, 0x0A74, 0x0A85, 0x0A8B,\r
+                                                                       0x0A8F, 0x0A91, 0x0A93, 0x0AA8, 0x0AAA, 0x0AB0, 0x0AB2, 0x0AB3,\r
+                                                                       0x0AB5, 0x0AB9, 0x0B05, 0x0B0C, 0x0B0F, 0x0B10, 0x0B13, 0x0B28,\r
+                                                                       0x0B2A, 0x0B30, 0x0B32, 0x0B33, 0x0B36, 0x0B39, 0x0B5C, 0x0B5D,\r
+                                                                       0x0B5F, 0x0B61, 0x0B85, 0x0B8A, 0x0B8E, 0x0B90, 0x0B92, 0x0B95,\r
+                                                                       0x0B99, 0x0B9A, 0x0B9E, 0x0B9F, 0x0BA3, 0x0BA4, 0x0BA8, 0x0BAA,\r
+                                                                       0x0BAE, 0x0BB5, 0x0BB7, 0x0BB9, 0x0C05, 0x0C0C, 0x0C0E, 0x0C10,\r
+                                                                       0x0C12, 0x0C28, 0x0C2A, 0x0C33, 0x0C35, 0x0C39, 0x0C60, 0x0C61,\r
+                                                                       0x0C85, 0x0C8C, 0x0C8E, 0x0C90, 0x0C92, 0x0CA8, 0x0CAA, 0x0CB3,\r
+                                                                       0x0CB5, 0x0CB9, 0x0CE0, 0x0CE1, 0x0D05, 0x0D0C, 0x0D0E, 0x0D10,\r
+                                                                       0x0D12, 0x0D28, 0x0D2A, 0x0D39, 0x0D60, 0x0D61, 0x0E01, 0x0E2E,\r
+                                                                       0x0E32, 0x0E33, 0x0E40, 0x0E45, 0x0E81, 0x0E82, 0x0E87, 0x0E88,\r
+                                                                       0x0E94, 0x0E97, 0x0E99, 0x0E9F, 0x0EA1, 0x0EA3, 0x0EAA, 0x0EAB,\r
+                                                                       0x0EAD, 0x0EAE, 0x0EB2, 0x0EB3, 0x0EC0, 0x0EC4, 0x0F40, 0x0F47,\r
+                                                                       0x0F49, 0x0F69, 0x10A0, 0x10C5, 0x10D0, 0x10F6, 0x1102, 0x1103,\r
+                                                                       0x1105, 0x1107, 0x110B, 0x110C, 0x110E, 0x1112, 0x1154, 0x1155,\r
+                                                                       0x115F, 0x1161, 0x116D, 0x116E, 0x1172, 0x1173, 0x11AE, 0x11AF,\r
+                                                                       0x11B7, 0x11B8, 0x11BC, 0x11C2, 0x1E00, 0x1E9B, 0x1EA0, 0x1EF9,\r
+                                                                       0x1F00, 0x1F15, 0x1F18, 0x1F1D, 0x1F20, 0x1F45, 0x1F48, 0x1F4D,\r
+                                                                       0x1F50, 0x1F57, 0x1F5F, 0x1F7D, 0x1F80, 0x1FB4, 0x1FB6, 0x1FBC,\r
+                                                                       0x1FC2, 0x1FC4, 0x1FC6, 0x1FCC, 0x1FD0, 0x1FD3, 0x1FD6, 0x1FDB,\r
+                                                                       0x1FE0, 0x1FEC, 0x1FF2, 0x1FF4, 0x1FF6, 0x1FFC, 0x212A, 0x212B,\r
+                                                                       0x2180, 0x2182, 0x3041, 0x3094, 0x30A1, 0x30FA, 0x3105, 0x312C,\r
+                                                                       0xAC00, 0xD7A3,\r
+                                                                       // Ideographic\r
+                                                                       0x3021, 0x3029, 0x4E00, 0x9FA5,\r
+                       };\r
+                       int[] letterChar = {\r
+                                                                  // BaseChar\r
+                                                                  0x0386, 0x038C, 0x03DA, 0x03DC, 0x03DE, 0x03E0, 0x0559, 0x06D5,\r
+                                                                  0x093D, 0x09B2, 0x0A5E, 0x0A8D, 0x0ABD, 0x0AE0, 0x0B3D, 0x0B9C,\r
+                                                                  0x0CDE, 0x0E30, 0x0E84, 0x0E8A, 0x0E8D, 0x0EA5, 0x0EA7, 0x0EB0,\r
+                                                                  0x0EBD, 0x1100, 0x1109, 0x113C, 0x113E, 0x1140, 0x114C, 0x114E,\r
+                                                                  0x1150, 0x1159, 0x1163, 0x1165, 0x1167, 0x1169, 0x1175, 0x119E,\r
+                                                                  0x11A8, 0x11AB, 0x11BA, 0x11EB, 0x11F0, 0x11F9, 0x1F59, 0x1F5B,\r
+                                                                  0x1F5D, 0x1FBE, 0x2126, 0x212E,\r
+                                                                  // Ideographic\r
+                                                                  0x3007,\r
+                       };\r
+\r
+                       //\r
+                       // [87] CombiningChar ::= ...\r
+                       //\r
+\r
+                       int[] combiningCharRange = {\r
+                                                                                  0x0300, 0x0345, 0x0360, 0x0361, 0x0483, 0x0486, 0x0591, 0x05A1,\r
+                                                                                  0x05A3, 0x05B9, 0x05BB, 0x05BD, 0x05C1, 0x05C2, 0x064B, 0x0652,\r
+                                                                                  0x06D6, 0x06DC, 0x06DD, 0x06DF, 0x06E0, 0x06E4, 0x06E7, 0x06E8,\r
+                                                                                  0x06EA, 0x06ED, 0x0901, 0x0903, 0x093E, 0x094C, 0x0951, 0x0954,\r
+                                                                                  0x0962, 0x0963, 0x0981, 0x0983, 0x09C0, 0x09C4, 0x09C7, 0x09C8,\r
+                                                                                  0x09CB, 0x09CD, 0x09E2, 0x09E3, 0x0A40, 0x0A42, 0x0A47, 0x0A48,\r
+                                                                                  0x0A4B, 0x0A4D, 0x0A70, 0x0A71, 0x0A81, 0x0A83, 0x0ABE, 0x0AC5,\r
+                                                                                  0x0AC7, 0x0AC9, 0x0ACB, 0x0ACD, 0x0B01, 0x0B03, 0x0B3E, 0x0B43,\r
+                                                                                  0x0B47, 0x0B48, 0x0B4B, 0x0B4D, 0x0B56, 0x0B57, 0x0B82, 0x0B83,\r
+                                                                                  0x0BBE, 0x0BC2, 0x0BC6, 0x0BC8, 0x0BCA, 0x0BCD, 0x0C01, 0x0C03,\r
+                                                                                  0x0C3E, 0x0C44, 0x0C46, 0x0C48, 0x0C4A, 0x0C4D, 0x0C55, 0x0C56,\r
+                                                                                  0x0C82, 0x0C83, 0x0CBE, 0x0CC4, 0x0CC6, 0x0CC8, 0x0CCA, 0x0CCD,\r
+                                                                                  0x0CD5, 0x0CD6, 0x0D02, 0x0D03, 0x0D3E, 0x0D43, 0x0D46, 0x0D48,\r
+                                                                                  0x0D4A, 0x0D4D, 0x0E34, 0x0E3A, 0x0E47, 0x0E4E, 0x0EB4, 0x0EB9,\r
+                                                                                  0x0EBB, 0x0EBC, 0x0EC8, 0x0ECD, 0x0F18, 0x0F19, 0x0F71, 0x0F84,\r
+                                                                                  0x0F86, 0x0F8B, 0x0F90, 0x0F95, 0x0F99, 0x0FAD, 0x0FB1, 0x0FB7,\r
+                                                                                  0x20D0, 0x20DC, 0x302A, 0x302F,\r
+                       };\r
+\r
+                       int[] combiningCharChar = {\r
+                                                                                 0x05BF, 0x05C4, 0x0670, 0x093C, 0x094D, 0x09BC, 0x09BE, 0x09BF,\r
+                                                                                 0x09D7, 0x0A02, 0x0A3C, 0x0A3E, 0x0A3F, 0x0ABC, 0x0B3C, 0x0BD7,\r
+                                                                                 0x0D57, 0x0E31, 0x0EB1, 0x0F35, 0x0F37, 0x0F39, 0x0F3E, 0x0F3F,\r
+                                                                                 0x0F97, 0x0FB9, 0x20E1, 0x3099, 0x309A,\r
+                       };\r
+\r
+                       //\r
+                       // [88] Digit ::= ...\r
+                       //\r
+\r
+                       int[] digitRange = {\r
+                                                                  0x0030, 0x0039, 0x0660, 0x0669, 0x06F0, 0x06F9, 0x0966, 0x096F,\r
+                                                                  0x09E6, 0x09EF, 0x0A66, 0x0A6F, 0x0AE6, 0x0AEF, 0x0B66, 0x0B6F,\r
+                                                                  0x0BE7, 0x0BEF, 0x0C66, 0x0C6F, 0x0CE6, 0x0CEF, 0x0D66, 0x0D6F,\r
+                                                                  0x0E50, 0x0E59, 0x0ED0, 0x0ED9, 0x0F20, 0x0F29,\r
+                       };\r
+\r
+                       //\r
+                       // [89] Extender ::= ...\r
+                       //\r
+\r
+                       int[] extenderRange = {\r
+                                                                         0x3031, 0x3035, 0x309D, 0x309E, 0x30FC, 0x30FE,\r
+                       };\r
+\r
+                       int[] extenderChar = {\r
+                                                                        0x00B7, 0x02D0, 0x02D1, 0x0387, 0x0640, 0x0E46, 0x0EC6, 0x3005,\r
+                       };\r
+\r
+                       //\r
+                       // SpecialChar ::= '<', '&', '\n', '\r', ']'\r
+                       //\r
+\r
+                       int[] specialChar = {\r
+                                                                       '<', '&', '\n', '\r', ']',\r
+                       };\r
+\r
+                       //\r
+                       // Initialize\r
+                       //\r
+\r
+                       // set valid characters\r
+                       for (int i = 0; i < charRange.Length; i += 2) \r
+                       {\r
+                               for (int j = charRange[i]; j <= charRange[i + 1]; j++) \r
+                               {\r
+                                       CHARS[j] = (byte)(CHARS[j] | VALID | CONTENT);\r
+                               }\r
+                       }\r
+\r
+                       // remove special characters\r
+                       for (int i = 0; i < specialChar.Length; i++) \r
+                       {\r
+                               CHARS[specialChar[i]] = (byte)(CHARS[specialChar[i]] & ~CONTENT);\r
+                       }\r
+\r
+                       // set space characters\r
+                       for (int i = 0; i < spaceChar.Length; i++) \r
+                       {\r
+                               CHARS[spaceChar[i]] = (byte)(CHARS[spaceChar[i]] | SPACE);\r
+                       }\r
+\r
+                       // set name start characters\r
+                       for (int i = 0; i < nameStartChar.Length; i++) \r
+                       {\r
+                               CHARS[nameStartChar[i]] = (byte)(CHARS[nameStartChar[i]] | NAME_START | NAME | \r
+                                       NCNAME_START | NCNAME);\r
+                       }\r
+                       for (int i = 0; i < letterRange.Length; i += 2) \r
+                       {\r
+                               for (int j = letterRange[i]; j <= letterRange[i + 1]; j++) \r
+                               {\r
+                                       CHARS[j] = (byte)(CHARS[j] | NAME_START | NAME |        NCNAME_START | NCNAME);\r
+                               }\r
+                       }\r
+                       for (int i = 0; i < letterChar.Length; i++) \r
+                       {\r
+                               CHARS[letterChar[i]] = (byte)(CHARS[letterChar[i]] | NAME_START | NAME |\r
+                                       NCNAME_START | NCNAME);\r
+                       }\r
+\r
+                       // set name characters\r
+                       for (int i = 0; i < nameChar.Length; i++) \r
+                       {\r
+                               CHARS[nameChar[i]] = (byte)(CHARS[nameChar[i]] | NAME | NCNAME);\r
+                       }\r
+                       for (int i = 0; i < digitRange.Length; i += 2) \r
+                       {\r
+                               for (int j = digitRange[i]; j <= digitRange[i + 1]; j++) \r
+                               {\r
+                                       CHARS[j] = (byte)(CHARS[j] | NAME | NCNAME);\r
+                               }\r
+                       }\r
+                       for (int i = 0; i < combiningCharRange.Length; i += 2) \r
+                       {\r
+                               for (int j = combiningCharRange[i]; j <= combiningCharRange[i + 1]; j++) \r
+                               {\r
+                                       CHARS[j] = (byte)(CHARS[j] | NAME | NCNAME);\r
+                               }\r
+                       }\r
+                       for (int i = 0; i < combiningCharChar.Length; i++) \r
+                       {\r
+                               CHARS[combiningCharChar[i]] = (byte)(CHARS[combiningCharChar[i]] | NAME | NCNAME);\r
+                       }\r
+                       for (int i = 0; i < extenderRange.Length; i += 2) \r
+                       {\r
+                               for (int j = extenderRange[i]; j <= extenderRange[i + 1]; j++) \r
+                               {\r
+                                       CHARS[j] = (byte)(CHARS[j] | NAME | NCNAME);\r
+                               }\r
+                       }\r
+                       for (int i = 0; i < extenderChar.Length; i++) \r
+                       {\r
+                               CHARS[extenderChar[i]] = (byte)(CHARS[extenderChar[i]] | NAME | NCNAME);\r
+                       }\r
+\r
+                       // remove ':' from allowable NCNAME_START and NCNAME chars\r
+                       CHARS[':'] = (byte)(CHARS[':'] & ~(NCNAME_START | NCNAME));\r
+\r
+                       // set Pubid characters\r
+                       for (int i = 0; i < pubidChar.Length; i++) \r
+                       {\r
+                               CHARS[pubidChar[i]] = (byte)(CHARS[pubidChar[i]] | PUBID);\r
+                       }\r
+                       for (int i = 0; i < pubidRange.Length; i += 2) \r
+                       {\r
+                               for (int j = pubidRange[i]; j <= pubidRange[i + 1]; j++) \r
+                               {\r
+                                       CHARS[j] = (byte)(CHARS[j] | PUBID);\r
+                               }\r
+                       }\r
+               }\r
+\r
+               private XmlChar()\r
+               {\r
+               }\r
+\r
+\r
+               //Static Methods\r
+\r
+               /// <summary>\r
+               /// Returns true if the specified character is valid.\r
+               /// </summary>\r
+               /// <param name="c">The character to check.</param>\r
+               public static bool IsValid(char c) \r
+               {\r
+                       return c > 0 && ((CHARS[c] & VALID) != 0);\r
+               }\r
+\r
+               public static bool IsValid (int c) \r
+               {\r
+                       if (c > 0xffff)\r
+                               return c < 0x110000;\r
+                       return c > 0 && ((CHARS[c] & VALID) != 0);\r
+               }\r
+\r
+               /// <summary>\r
+               /// Returns true if the specified character is invalid.\r
+               /// </summary>\r
+               /// <param name="c">The character to check.</param>\r
+               public static bool IsInvalid(char c) \r
+               {\r
+                       return !IsValid(c);\r
+               }\r
+\r
+               public static bool IsInvalid(int c) \r
+               {\r
+                       return !IsValid(c);\r
+               }\r
+\r
+               /// <summary>\r
+               /// Returns true if the specified character can be considered content.\r
+               /// </summary>\r
+               /// <param name="c">The character to check.</param>\r
+               public static bool IsContent(char c) \r
+               {\r
+                       return (CHARS[c] & CONTENT) != 0;\r
+               }\r
+\r
+               public static bool IsContent(int c) \r
+               {\r
+                       return c > 0 && c < CHARS.Length && (CHARS[c] & CONTENT) != 0;\r
+               }\r
+\r
+               /// <summary>\r
+               /// Returns true if the specified character can be considered markup.\r
+               /// Markup characters include '&lt;', '&amp;', and '%'.\r
+               /// </summary>\r
+               /// <param name="c">The character to check.</param>\r
+               public static bool IsMarkup(char c) \r
+               {\r
+                       return c == '<' || c == '&' || c == '%';\r
+               }\r
+\r
+               public static bool IsMarkup(int c) \r
+               {\r
+                       return c > 0 && c < CHARS.Length && (c == '<' || c == '&' || c == '%');\r
+               }\r
+\r
+               /// <summary>\r
+               /// Returns true if the specified character is a space character\r
+               /// as defined by production [3] in the XML 1.0 specification. \r
+               /// </summary>\r
+               /// <param name="c">The character to check.</param>\r
+               /// <returns></returns>\r
+               public static bool IsWhitespace (char c) \r
+               {\r
+                       return (CHARS[c] & SPACE) != 0;\r
+               }\r
+\r
+               public static bool IsWhitespace (int c) \r
+               {\r
+                       return c > 0 && c < CHARS.Length && (CHARS[c] & SPACE) != 0;\r
+               }\r
+\r
+               /// <summary>\r
+               /// Returns true if the specified character is a valid name start\r
+               /// character as defined by production [5] in the XML 1.0 specification.\r
+               /// </summary>\r
+               /// <param name="c">The character to check.</param>\r
+               public static bool IsFirstNameChar (char c) \r
+               {\r
+                       return (CHARS[c] & NAME_START) != 0;\r
+               } \r
+\r
+               public static bool IsFirstNameChar (int c) \r
+               {\r
+                       return c > 0 && c < CHARS.Length && (CHARS[c] & NAME_START) != 0;\r
+               } \r
+\r
+               /// <summary>\r
+               /// Returns true if the specified character is a valid name\r
+               /// character as defined by production [4] in the XML 1.0 specification.\r
+               /// </summary>\r
+               /// <param name="c">The character to check.</param>\r
+               public static bool IsNameChar(char c) \r
+               {\r
+                       return (CHARS[c] & NAME) != 0;\r
+               } \r
+\r
+               public static bool IsNameChar(int c) \r
+               {\r
+                       return c > 0 && c < CHARS.Length && (CHARS[c] & NAME) != 0;\r
+               } \r
+\r
+               /// <summary>\r
+               /// Returns true if the specified character is a valid NCName start\r
+               /// character as defined by production [4] in Namespaces in XML\r
+               /// recommendation.\r
+               /// </summary>\r
+               /// <param name="c">The character to check.</param>\r
+               /// <returns></returns>\r
+               public static bool IsNCNameStart(char c) \r
+               {\r
+                       return (CHARS[c] & NCNAME_START) != 0;\r
+               }\r
+\r
+               public static bool IsNCNameStart(int c) \r
+               {\r
+                       return c > 0 && c < CHARS.Length && (CHARS[c] & NCNAME_START) != 0;\r
+               }\r
+\r
+               /// <summary>\r
+               /// Returns true if the specified character is a valid NCName\r
+               /// character as defined by production [5] in Namespaces in XML\r
+               /// recommendation.\r
+               /// </summary>\r
+               /// <param name="c"></param>\r
+               /// <returns></returns>\r
+               public static bool IsNCNameChar(char c) \r
+               {\r
+                       return (CHARS[c] & NCNAME) != 0;\r
+               } \r
+\r
+               public static bool IsNCNameChar(int c) \r
+               {\r
+                       return c > 0 && c < CHARS.Length && (CHARS[c] & NCNAME) != 0;\r
+               } \r
+\r
+               /// <summary>\r
+               /// Returns true if the specified character is a valid Pubid\r
+               /// character as defined by production [13] in the XML 1.0 specification.\r
+               /// </summary>\r
+               /// <param name="c">The character to check</param>\r
+               public static bool IsPubidChar (char c) \r
+               {\r
+                       return (CHARS[c] & PUBID) != 0;\r
+               }\r
+\r
+               public static bool IsPubidChar (int c) \r
+               {\r
+                       return c > 0 && c < CHARS.Length && (CHARS[c] & PUBID) != 0;\r
+               }\r
+\r
+               /// <summary>\r
+               /// Check to see if a string is a valid Name according to [5]\r
+               /// in the XML 1.0 Recommendation\r
+               /// </summary>\r
+               /// <param name="name">The string to check</param>\r
+               public static bool IsValidName(String name, out Exception err) \r
+               {\r
+                       err = null;\r
+                       if (name.Length == 0)\r
+                       {\r
+                               err = new XmlException("Name can not be an empty string",null);\r
+                               return false;\r
+                       }\r
+                       char ch = name[0];\r
+                       if( IsFirstNameChar (ch) == false)\r
+                       {\r
+                               err = new XmlException("The character '"+ch+"' cannot start a Name",null);\r
+                               return false;\r
+                       }\r
+                       for (int i = 1; i < name.Length; i++ ) \r
+                       {\r
+                               ch = name[i];\r
+                               if( IsNameChar (ch) == false )\r
+                               {\r
+                                       err = new XmlException("The character '"+ch+"' is not allowed in a Name",null);\r
+                                       return false;\r
+                               }\r
+                       }\r
+                       return true;\r
+               }\r
+\r
+               public static int IsValidName (string name)\r
+               {\r
+                       if (name.Length == 0)\r
+                               return 0;\r
+                       if (!IsFirstNameChar (name [0]))\r
+                               return 0;\r
+                       for (int i=1; i<name.Length; i++)\r
+                               if (!IsNameChar (name [i]))\r
+                                       return i;\r
+                       return -1;\r
+               }\r
+\r
+               /// <summary>\r
+               /// Check to see if a string is a valid NCName according to [4]\r
+               /// from the XML Namespaces 1.0 Recommendation\r
+               /// </summary>\r
+               /// <param name="ncName">The string to check</param>\r
+               public static bool IsValidNCName(String ncName, out Exception err) \r
+               {\r
+                       err = null;\r
+                       if (ncName.Length == 0)\r
+                       {\r
+                               err = new XmlException("NCName can not be an empty string",null);\r
+                               return false;\r
+                       }\r
+                       char ch = ncName[0];\r
+                       if( IsNCNameStart(ch) == false)\r
+                       {\r
+                               err = new XmlException("The character '"+ch+"' cannot start a NCName",null);\r
+                               return false;\r
+                       }\r
+                       for (int i = 1; i < ncName.Length; i++ ) \r
+                       {\r
+                               ch = ncName[i];\r
+                               if( IsNCNameChar (ch) == false )\r
+                               {\r
+                                       err = new XmlException("The character '"+ch+"' is not allowed in a NCName",null);\r
+                                       return false;\r
+                               }\r
+                       }\r
+                       return true;\r
+               }\r
+\r
+               /// <summary>\r
+               /// Check to see if a string is a valid Nmtoken according to [7]\r
+               /// in the XML 1.0 Recommendation\r
+               /// </summary>\r
+               /// <param name="nmtoken">The string to check.</param>\r
+               public static bool IsValidNmtoken(String nmtoken, out Exception err) \r
+               {\r
+                       err = null;\r
+                       if (nmtoken.Length == 0)\r
+                       {\r
+                               err = new XmlException("NMTOKEN can not be an empty string", null);\r
+                               return false;\r
+                       }\r
+                       for (int i = 0; i < nmtoken.Length; i++ ) \r
+                       {\r
+                               char ch = nmtoken[i];\r
+                               if(  ! IsNameChar (ch) )\r
+                               {\r
+                                       err = new XmlException("The character '"+ch+"' is not allowed in a NMTOKEN",null);\r
+                                       return false;\r
+                               }\r
+                       }\r
+                       return true;\r
+               }\r
+\r
+               // encodings\r
+\r
+               /// <summary>\r
+               /// Returns true if the encoding name is a valid IANA encoding.\r
+               /// This method does not verify that there is a decoder available\r
+               /// for this encoding, only that the characters are valid for an\r
+               /// IANA encoding name.\r
+               /// </summary>\r
+               /// <param name="ianaEncoding">The encoding to check.</param>\r
+               /// <returns></returns>\r
+               public static bool IsValidIANAEncoding(String ianaEncoding) \r
+               {\r
+                       if (ianaEncoding != null) \r
+                       {\r
+                               int length = ianaEncoding.Length;\r
+                               if (length > 0) \r
+                               {\r
+                                       char c = ianaEncoding[0];\r
+                                       if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')) \r
+                                       {\r
+                                               for (int i = 1; i < length; i++) \r
+                                               {\r
+                                                       c = ianaEncoding[i];\r
+                                                       if ((c < 'A' || c > 'Z') && (c < 'a' || c > 'z') &&\r
+                                                               (c < '0' || c > '9') && c != '.' && c != '_' &&\r
+                                                               c != '-') \r
+                                                       {\r
+                                                               return false;\r
+                                                       }\r
+                                               }\r
+                                               return true;\r
+                                       }\r
+                               }\r
+                       }\r
+                       return false;\r
+               }\r
+\r
+               public static bool IsName (string str)\r
+               {\r
+                       if (str.Length == 0)\r
+                               return false;\r
+                       if (!IsFirstNameChar (str [0]))\r
+                               return false;\r
+                       for (int i = 1; i < str.Length; i++)\r
+                               if (!IsNameChar (str [i]))\r
+                                       return false;\r
+                       return true;\r
+               }\r
+\r
+               public static bool IsNCName (string str)\r
+               {\r
+                       if (str.Length == 0)\r
+                               return false;\r
+                       if (!IsFirstNameChar (str [0]))\r
+                               return false;\r
+                       for (int i = 0; i < str.Length; i++)\r
+                               if (!IsNCNameChar (str [i]))\r
+                                       return false;\r
+                       return true;\r
+               }\r
+\r
+               public static bool IsNmToken (string str)\r
+               {\r
+                       if (str.Length == 0)\r
+                               return false;\r
+                       for (int i = 0; i < str.Length; i++)\r
+                               if (!IsNameChar (str [i]))\r
+                                       return false;\r
+                       return true;\r
+               }\r
+\r
+               public static bool IsWhitespace (string str)\r
+               {\r
+                       for (int i = 0; i < str.Length; i++)
+                               if (!IsWhitespace (str [i])) return false;
+                               \r
+                       return true;\r
+               }\r
+\r
+               public static int GetPredefinedEntity (string name)\r
+               {\r
+                       switch (name) {\r
+                       case "amp":\r
+                               return '&';\r
+                       case "lt":\r
+                               return '<';\r
+                       case "gt":\r
+                               return '>';\r
+                       case "quot":\r
+                               return '"';\r
+                       case "apos":\r
+                               return '\'';\r
+                       default:\r
+                               return -1;\r
+                       }\r
+               }\r
+       }\r
+}\r
diff --git a/mcs/class/Mono.Xml.Ext/Mono.Xml/XmlStoredResolver.cs b/mcs/class/Mono.Xml.Ext/Mono.Xml/XmlStoredResolver.cs
new file mode 100755 (executable)
index 0000000..eba3b4c
--- /dev/null
@@ -0,0 +1,81 @@
+//\r
+// XmlStoredResolver.cs\r
+//\r
+// Author: Atsushi Enomoto <atsushi@ximian.com>\r
+//\r
+// This code is too short to have "creativity". (thus, there must be no \r
+// copyright on this code). Feel free to use anywhere.\r
+//\r
+// Use like this:\r
+//\r
+//     XmlDocument doc = new XmlDocument ();\r
+//     XmlStoredResolver r = new XmlStoredResolver (new XmlUrlResolver ());\r
+//     r.Add ("http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd",\r
+//             "svg10.dtd");\r
+//     doc.XmlResolver = r;\r
+//\r
+using System;\r
+using System.Collections;\r
+using System.Net;\r
+using System.Xml;\r
+\r
+namespace Mono.Xml.Ext\r
+{\r
+       public class XmlStoredResolver : XmlResolver\r
+       {\r
+               XmlResolver external;\r
+               XmlResolver local;\r
+               IDictionary uriTable;\r
+\r
+               public XmlStoredResolver (XmlResolver resolver)\r
+                       : this (resolver, resolver, new Hashtable ())\r
+               {\r
+               }\r
+\r
+               public XmlStoredResolver (XmlResolver resolver, IDictionary uriTable)\r
+                       : this (resolver, resolver, uriTable)\r
+               {\r
+               }\r
+\r
+               public XmlStoredResolver (XmlResolver external, XmlResolver local)\r
+                       : this (external, local, new Hashtable ())\r
+               {\r
+               }\r
+               \r
+               public XmlStoredResolver (XmlResolver external, XmlResolver local, IDictionary uriTable)\r
+               {\r
+                       this.external = external;\r
+                       this.local = local;\r
+                       this.uriTable = uriTable;\r
+               }\r
+\r
+               public override ICredentials Credentials {\r
+                       set {\r
+                               external.Credentials = value;\r
+                               if (local != external)\r
+                                       local.Credentials = value;\r
+                       }\r
+               }\r
+\r
+               public IDictionary Mapping {\r
+                       get { return uriTable; }\r
+               }\r
+\r
+               public void Add (string nominalUri, string actualLocation)\r
+               {\r
+                       uriTable.Add (\r
+                               external.ResolveUri (null, nominalUri).ToString (),\r
+                               local.ResolveUri (null, actualLocation).ToString ());\r
+               }\r
+\r
+               public override object GetEntity (Uri uri, string role, Type returnType)\r
+               {\r
+                       string uriString = uri.ToString ();\r
+                       string actualLocation = (string) uriTable [uriString];\r
+                       if (actualLocation == null)\r
+                               return external.GetEntity (uri, role, returnType);\r
+                       else\r
+                               return local.GetEntity (local.ResolveUri (null, actualLocation), role, returnType);\r
+               }\r
+       }\r
+}\r