[mapguide-commits] r8480 - in trunk/Tools/Maestro: MaestroAPITests OSGeo.MapGuide.MaestroAPI.Http

[svn_mapguide at osgeo.org]

Author: jng
Date: 2014-12-29 00:03:30 -0800 (Mon, 29 Dec 2014)
New Revision: 8480

Modified:
   trunk/Tools/Maestro/MaestroAPITests/RuntimeMapTests.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Files.Designer.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/RequestBuilder.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Strings.Designer.cs
Log:
Liberate the Maestro HTTP connection provider from System.Web and re-target towards the .net 4.0 client profile.

Modified: trunk/Tools/Maestro/MaestroAPITests/RuntimeMapTests.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/RuntimeMapTests.cs	2014-12-29 04:46:11 UTC (rev 8479)
+++ trunk/Tools/Maestro/MaestroAPITests/RuntimeMapTests.cs	2014-12-29 08:03:30 UTC (rev 8480)
@@ -1155,6 +1155,7 @@
         {
             //Create a 200 layer, 50 group map. This is not part of the benchmark
             var mdf = Utility.CreateMapDefinition(_conn, "LargeMap");
+            mdf.ResourceID = "Library://UnitTests/LargeMapTest/LargeMap.MapDefinition";
             string root = "Library://UnitTests/LargeMapTest/";
 
             //We have to create 200 unique layer definitions (same content) otherwise only one GetResourceContent

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Files.Designer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Files.Designer.cs	2014-12-29 04:46:11 UTC (rev 8479)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Files.Designer.cs	2014-12-29 08:03:30 UTC (rev 8480)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34209
+//     Runtime Version:4.0.30319.18444
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj	2014-12-29 04:46:11 UTC (rev 8479)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj	2014-12-29 08:03:30 UTC (rev 8480)
@@ -20,8 +20,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -64,9 +63,7 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/RequestBuilder.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/RequestBuilder.cs	2014-12-29 04:46:11 UTC (rev 8479)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/RequestBuilder.cs	2014-12-29 08:03:30 UTC (rev 8480)
@@ -233,9 +233,18 @@
             return EncodeParameters(param, true);
         }
 
+        static string UrlEncode(string name)
+        {
+            if (name == null)
+                return string.Empty;
+            return System.Uri.EscapeDataString(name);
+        }
+
         private string EncodeParameter(string name, string value)
         {
-            return System.Web.HttpUtility.UrlEncode(name) + "=" + System.Web.HttpUtility.UrlEncode(value);
+            if (name == null)
+                return string.Empty;
+            return UrlEncode(name) + "=" + UrlEncode(value);
         }
 
         public string GetMapDWF(string id)

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Strings.Designer.cs	2014-12-29 04:46:11 UTC (rev 8479)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Strings.Designer.cs	2014-12-29 08:03:30 UTC (rev 8480)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34209
+//     Runtime Version:4.0.30319.18444
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.