[mapguide-commits] r8547 - in trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI: . Resource

[svn_mapguide at osgeo.org]

Author: jng
Date: 2015-02-18 08:00:36 -0800 (Wed, 18 Feb 2015)
New Revision: 8547

Modified:
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/ResourceSchemaChain.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/XmlValidator.cs
Log:
#2515: Update XML validators to recognize 3.0.0 schema chains

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/ResourceSchemaChain.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/ResourceSchemaChain.cs	2015-02-18 13:36:04 UTC (rev 8546)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/ResourceSchemaChain.cs	2015-02-18 16:00:36 UTC (rev 8547)
@@ -57,6 +57,8 @@
                     return new string[] { schema, "WatermarkDefinition-2.3.0.xsd" }; //NOXLATE
                 case "MapDefinition-2.4.0.xsd": //NOXLATE
                     return new string[] { schema, "WatermarkDefinition-2.4.0.xsd" }; //NOXLATE
+                case "MapDefinition-3.0.0.xsd": //NOXLATE
+                    return new string[] { schema, "WatermarkDefinition-2.4.0.xsd" }; //NOXLATE
             }
             return new string[] { schema, "PlatformCommon-1.0.0.xsd" }; //NOXLATE
         }

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/XmlValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/XmlValidator.cs	2015-02-18 13:36:04 UTC (rev 8546)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/XmlValidator.cs	2015-02-18 16:00:36 UTC (rev 8547)
@@ -236,7 +236,7 @@
                         if (wmd != null)
                             xsds.Add("WatermarkDefinition-2.3.0.xsd", wmd); //NOXLATE
                     }
-                    else if (version.StartsWith("2.4.0"))
+                    else if (version.StartsWith("2.4.0") || version.StartsWith("3.0.0"))
                     {
                         var sym = GetXsd(xsdPath, "SymbolDefinition-2.4.0.xsd"); //NOXLATE
                         if (sym != null)