[mapguide-commits] r6138 - in trunk/Tools/Maestro: . Maestro Maestro.AddIn.Local Maestro.AddIn.Local/UI OSGeo.MapGuide.MaestroAPI/Mapping Properties

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Tue Sep 20 12:52:32 EDT 2011 

Author: jng
Date: 2011-09-20 09:52:32 -0700 (Tue, 20 Sep 2011)
New Revision: 6138

Modified:
   trunk/Tools/Maestro/Maestro.AddIn.Local/MapGuideDesktopUnmanagedApi.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/MgDesktop.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/MgFoundation.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/MgGeometry.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/MgGwsCommon.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/MgGwsQueryEngine.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/MgGwsResource.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/MgMdfModel.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/MgMdfParser.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/MgPlatformBase.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/MgRenderers.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/MgStylization.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Desktop.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Viewer.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.Designer.cs
   trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.cs
   trunk/Tools/Maestro/Maestro/changelog.txt
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapLayer.cs
   trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs
   trunk/Tools/Maestro/build.bat
Log:
Prep 4.0 beta 2 release

Modified: trunk/Tools/Maestro/Maestro/changelog.txt
===================================================================
--- trunk/Tools/Maestro/Maestro/changelog.txt	2011-09-20 14:21:53 UTC (rev 6137)
+++ trunk/Tools/Maestro/Maestro/changelog.txt	2011-09-20 16:52:32 UTC (rev 6138)
@@ -1,6 +1,14 @@
-4.0 beta 1
+4.0 beta 2
 ----------
 
+ - Support for non-transactional package loading w/ ability to retry failed operations
+ - Style editor support for FDO expressions in color properties 
+ - Fix: assorted issues introduced by the new multi-site support.
+ - Updated mg-desktop binaries for Local Connection mode.
+
+4.0 beta 1
+----------
+
  - Support for working against multiple connections
  - New Local Connection mode, backed by the new mg-desktop library (http://mg-desktop.googlecode.com). This feature is Windows only
  - MgCooker updated to support Local Connections

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MapGuideDesktopUnmanagedApi.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgDesktop.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgFoundation.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgGeometry.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgGwsCommon.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgGwsQueryEngine.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgGwsResource.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgMdfModel.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgMdfParser.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgPlatformBase.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgRenderers.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgStylization.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Desktop.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Viewer.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.Designer.cs	2011-09-20 14:21:53 UTC (rev 6137)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.Designer.cs	2011-09-20 16:52:32 UTC (rev 6138)
@@ -37,10 +37,10 @@
             this.lblMapSize = new System.Windows.Forms.ToolStripStatusLabel();
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.splitContainer2 = new System.Windows.Forms.SplitContainer();
-            this.legend = new MapViewer.MgLegend();
-            this.propertyPane = new MapViewer.MgPropertyPane();
-            this.viewer = new MapViewer.MgMapViewer();
-            this.toolbar = new MapViewer.MgDefaultToolbar();
+            this.legend = new OSGeo.MapGuide.Viewer.MgLegend();
+            this.propertyPane = new OSGeo.MapGuide.Viewer.MgPropertyPane();
+            this.viewer = new OSGeo.MapGuide.Viewer.MgMapViewer();
+            this.toolbar = new OSGeo.MapGuide.Viewer.MgDefaultToolbar();
             this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
             this.statusStrip1.SuspendLayout();
             this.splitContainer1.Panel1.SuspendLayout();
@@ -146,7 +146,7 @@
             // 
             // viewer
             // 
-            this.viewer.ActiveTool = MapViewer.MapActiveTool.None;
+            this.viewer.ActiveTool = OSGeo.MapGuide.Viewer.MapActiveTool.None;
             this.viewer.Cursor = System.Windows.Forms.Cursors.Default;
             this.viewer.Dock = System.Windows.Forms.DockStyle.Fill;
             this.viewer.FeatureTooltipsEnabled = false;
@@ -214,10 +214,10 @@
         private System.Windows.Forms.ToolStripStatusLabel lblMapSize;
         private System.Windows.Forms.SplitContainer splitContainer1;
         private System.Windows.Forms.SplitContainer splitContainer2;
-        private MapViewer.MgLegend legend;
-        private MapViewer.MgPropertyPane propertyPane;
-        private MapViewer.MgMapViewer viewer;
-        private MapViewer.MgDefaultToolbar toolbar;
+        private OSGeo.MapGuide.Viewer.MgLegend legend;
+        private OSGeo.MapGuide.Viewer.MgPropertyPane propertyPane;
+        private OSGeo.MapGuide.Viewer.MgMapViewer viewer;
+        private OSGeo.MapGuide.Viewer.MgDefaultToolbar toolbar;
         private System.Windows.Forms.ToolStripButton toolStripButton1;
     }
 }
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.cs	2011-09-20 14:21:53 UTC (rev 6137)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.cs	2011-09-20 16:52:32 UTC (rev 6138)
@@ -30,7 +30,7 @@
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using MapViewer;
+using OSGeo.MapGuide.Viewer;
 using ICSharpCode.Core;
 
 namespace Maestro.AddIn.Local.UI

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapLayer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapLayer.cs	2011-09-20 14:21:53 UTC (rev 6137)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapLayer.cs	2011-09-20 16:52:32 UTC (rev 6138)
@@ -90,6 +90,7 @@
                 this.QualifiedClassName = vl.FeatureName;
                 this.GeometryPropertyName = vl.Geometry;
                 this.FeatureSourceID = vl.ResourceId;
+                this.Filter = vl.Filter;
             }
             else if (ldf.SubLayer.LayerType == LayerType.Raster)
             {

Modified: trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs	2011-09-20 14:21:53 UTC (rev 6137)
+++ trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs	2011-09-20 16:52:32 UTC (rev 6138)
@@ -35,5 +35,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.0.0.6128")]
-[assembly: AssemblyFileVersion("4.0.0.6128")]
+[assembly: AssemblyVersion("4.0.0.6138")]
+[assembly: AssemblyFileVersion("4.0.0.6138")]

Modified: trunk/Tools/Maestro/build.bat
===================================================================
--- trunk/Tools/Maestro/build.bat	2011-09-20 14:21:53 UTC (rev 6137)
+++ trunk/Tools/Maestro/build.bat	2011-09-20 16:52:32 UTC (rev 6138)
@@ -2,7 +2,7 @@
 SET TYPEACTION=build
 SET TYPEBUILD=Release
 SET PLATFORM=Any CPU
-SET RELEASE_VERSION=4.0b1
+SET RELEASE_VERSION=4.0b2
 SET OLDPATH=%PATH%
 SET PATH=%PATH%;%CD%\Thirdparty\NSIS;C:\Windows\Microsoft.NET\Framework\v3.5
 SET SLNDIR=%CD%

More information about the mapguide-commits mailing list