[mapguide-commits] r7915 - in branches/maestro-5.0.x: Maestro OSGeo.MapGuide.MaestroAPI

[svn_mapguide at osgeo.org]

Author: jng
Date: 2013-11-22 05:16:18 -0800 (Fri, 22 Nov 2013)
New Revision: 7915

Modified:
   branches/maestro-5.0.x/Maestro/Maestro.csproj
   branches/maestro-5.0.x/Maestro/Maestro_All.sln
   branches/maestro-5.0.x/OSGeo.MapGuide.MaestroAPI/XmlValidator.cs
Log:
#2382: Merge to 5.0.x. Also revert solution version back to VS 2010

Modified: branches/maestro-5.0.x/Maestro/Maestro.csproj
===================================================================
--- branches/maestro-5.0.x/Maestro/Maestro.csproj	2013-11-22 13:03:49 UTC (rev 7914)
+++ branches/maestro-5.0.x/Maestro/Maestro.csproj	2013-11-22 13:16:18 UTC (rev 7915)
@@ -257,6 +257,10 @@
       <Link>Schemas\MapDefinition-2.3.0.xsd</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="..\OSGeo.MapGuide.MaestroAPI\Schemas\MapDefinition-2.4.0.xsd">
+      <Link>Schemas\MapDefinition-2.4.0.xsd</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="..\OSGeo.MapGuide.MaestroAPI\Schemas\PlatformCommon-1.0.0.xsd">
       <Link>Schemas\PlatformCommon-1.0.0.xsd</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -353,6 +357,10 @@
       <Link>Schemas\SymbolDefinition-1.1.0.xsd</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="..\OSGeo.MapGuide.MaestroAPI\Schemas\SymbolDefinition-2.4.0.xsd">
+      <Link>Schemas\SymbolDefinition-2.4.0.xsd</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="..\OSGeo.MapGuide.MaestroAPI\Schemas\SymbolLibrary-1.0.0.xsd">
       <Link>Schemas\SymbolLibrary-1.0.0.xsd</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -377,6 +385,10 @@
       <Link>Schemas\WatermarkDefinition-2.3.0.xsd</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="..\OSGeo.MapGuide.MaestroAPI\Schemas\WatermarkDefinition-2.4.0.xsd">
+      <Link>Schemas\WatermarkDefinition-2.4.0.xsd</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="..\OSGeo.MapGuide.MaestroAPI\Schemas\WebLayout-1.0.0.xsd">
       <Link>Schemas\WebLayout-1.0.0.xsd</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

Modified: branches/maestro-5.0.x/Maestro/Maestro_All.sln
===================================================================
--- branches/maestro-5.0.x/Maestro/Maestro_All.sln	2013-11-22 13:03:49 UTC (rev 7914)
+++ branches/maestro-5.0.x/Maestro/Maestro_All.sln	2013-11-22 13:16:18 UTC (rev 7915)
@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2012 for Windows Desktop
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "..\Thirdparty\SharpDevelop\ICSharpCode.Core\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.WinForms", "..\Thirdparty\SharpDevelop\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj", "{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}"

Modified: branches/maestro-5.0.x/OSGeo.MapGuide.MaestroAPI/XmlValidator.cs
===================================================================
--- branches/maestro-5.0.x/OSGeo.MapGuide.MaestroAPI/XmlValidator.cs	2013-11-22 13:03:49 UTC (rev 7914)
+++ branches/maestro-5.0.x/OSGeo.MapGuide.MaestroAPI/XmlValidator.cs	2013-11-22 13:16:18 UTC (rev 7915)
@@ -194,6 +194,16 @@
                         if (wmd != null)
                             xsds.Add("WatermarkDefinition-2.3.0.xsd", wmd); //NOXLATE
                     }
+                    else if (version.StartsWith("2.4.0")) //NOXLATE
+                    {
+                        var sym = GetXsd(xsdPath, "SymbolDefinition-2.4.0.xsd"); //NOXLATE
+                        if (sym != null)
+                            xsds.Add("SymbolDefinition-2.4.0.xsd", sym); //NOXLATE
+
+                        var wmd = GetXsd(xsdPath, "WatermarkDefinition-2.4.0.xsd"); //NOXLATE
+                        if (wmd != null)
+                            xsds.Add("WatermarkDefinition-2.4.0.xsd", wmd); //NOXLATE
+                    }
                 }
 
                 if (res.ResourceType == ResourceTypes.WatermarkDefinition)
@@ -205,6 +215,12 @@
                         if (sym != null)
                             xsds.Add("SymbolDefinition-1.1.0.xsd", sym); //NOXLATE
                     }
+                    else if (version.StartsWith("2.4.0"))
+                    {
+                        var sym = GetXsd(xsdPath, "SymbolDefinition-2.4.0.xsd"); //NOXLATE
+                        if (sym != null)
+                            xsds.Add("SymbolDefinition-2.4.0.xsd", sym); //NOXLATE
+                    }
                 }
 
                 if (res.ResourceType == ResourceTypes.MapDefinition)
@@ -220,6 +236,16 @@
                         if (wmd != null)
                             xsds.Add("WatermarkDefinition-2.3.0.xsd", wmd); //NOXLATE
                     }
+                    else if (version.StartsWith("2.4.0"))
+                    {
+                        var sym = GetXsd(xsdPath, "SymbolDefinition-2.4.0.xsd"); //NOXLATE
+                        if (sym != null)
+                            xsds.Add("SymbolDefinition-2.4.0.xsd", sym); //NOXLATE
+
+                        var wmd = GetXsd(xsdPath, "WatermarkDefinition-2.4.0.xsd"); //NOXLATE
+                        if (wmd != null)
+                            xsds.Add("WatermarkDefinition-2.4.0.xsd", wmd); //NOXLATE
+                    }
                 }
 
                 string xsdName = res.ResourceType.ToString() + "-" + res.ResourceVersion.ToString() + ".xsd"; //NOXLATE