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

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-05-22 09:58:48 -0700 (Tue, 22 May 2012)
New Revision: 6685

Modified:
   branches/maestro-4.0.x/Maestro/changelog.txt
   branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI/Enums.cs
Log:
Backport r6684 to 4.0.x

Modified: branches/maestro-4.0.x/Maestro/changelog.txt
===================================================================
--- branches/maestro-4.0.x/Maestro/changelog.txt	2012-05-22 16:52:13 UTC (rev 6684)
+++ branches/maestro-4.0.x/Maestro/changelog.txt	2012-05-22 16:58:48 UTC (rev 6685)
@@ -1,5 +1,6 @@
 4.0.2
 -----
+ - Fix: Watermarks not showing up as a resource type in Create Package dialog
  - Fix: HttpServerConnection no longer re-creates MapGuide session on any exception thrown, only ones relating to session expiry.
  - Fix: Avoid using full schema walks wherever possible. Will improve performance on large data stores.
  - Fix: Broken Server Status Monitor

Modified: branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI/Enums.cs
===================================================================
--- branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI/Enums.cs	2012-05-22 16:52:13 UTC (rev 6684)
+++ branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI/Enums.cs	2012-05-22 16:58:48 UTC (rev 6685)
@@ -114,19 +114,7 @@
 
         static SiteResourceType()
         {
-            _resTypes = new ResourceTypes[]
-            {
-                ResourceTypes.ApplicationDefinition,
-                ResourceTypes.DrawingSource,
-                ResourceTypes.FeatureSource,
-                ResourceTypes.LayerDefinition,
-                ResourceTypes.LoadProcedure,
-                ResourceTypes.MapDefinition,
-                ResourceTypes.PrintLayout,
-                ResourceTypes.SymbolDefinition,
-                ResourceTypes.SymbolLibrary,
-                ResourceTypes.WebLayout
-            };
+            _resTypes = (ResourceTypes[])Enum.GetValues(typeof(ResourceTypes));
         }
 
         /// <summary>