[mapguide-commits] r7182 - in trunk/Tools/Maestro: Maestro.AddIn.Local Maestro.AddIn.Local/Commands Maestro.AddIn.Local/UI OSGeo.MapGuide.MaestroAPI.Local OSGeo.MapGuide.MaestroAPI.Native/Commands
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Nov 1 22:31:02 PDT 2012
Author: jng
Date: 2012-11-01 22:31:02 -0700 (Thu, 01 Nov 2012)
New Revision: 7182
Modified:
trunk/Tools/Maestro/Maestro.AddIn.Local/ACE.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/ConnectionPoolStatusCommand.cs
trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/StartupCommand.cs
trunk/Tools/Maestro/Maestro.AddIn.Local/FoundationUnmanagedApi.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/GEOS.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/GeometryUnmanagedApi.dll
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.Foundation.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Geometry.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.PlatformBase.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Viewer.Desktop.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Viewer.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/PlatformBaseUnmanagedApi.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.cs
trunk/Tools/Maestro/Maestro.AddIn.Local/gd.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/xerces-c_3_1mg.dll
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Commands/LocalGetResourceContents.cs
Log:
mg-desktop binary update (2.4.0.7056 libs with 2.4.0.7152 viewer)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/ACE.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/ConnectionPoolStatusCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/ConnectionPoolStatusCommand.cs 2012-11-01 15:51:51 UTC (rev 7181)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/ConnectionPoolStatusCommand.cs 2012-11-02 05:31:02 UTC (rev 7182)
@@ -30,7 +30,7 @@
{
public override void Run()
{
- MgServiceFactory fact = new MgServiceFactory();
+ var fact = new MgdServiceFactory();
MgdFeatureService featSvc = (MgdFeatureService)fact.CreateService(MgServiceType.FeatureService);
MgByteReader br = featSvc.QueryCacheInfo();
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/StartupCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/StartupCommand.cs 2012-11-01 15:51:51 UTC (rev 7181)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/StartupCommand.cs 2012-11-02 05:31:02 UTC (rev 7182)
@@ -53,7 +53,7 @@
{
try
{
- MgPlatform.Terminate();
+ MgdPlatform.Terminate();
}
catch (MgException ex)
{
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FoundationUnmanagedApi.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/GEOS.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/GeometryUnmanagedApi.dll
===================================================================
(Binary files differ)
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.Foundation.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Geometry.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.PlatformBase.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Viewer.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/PlatformBaseUnmanagedApi.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.cs 2012-11-01 15:51:51 UTC (rev 7181)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.cs 2012-11-02 05:31:02 UTC (rev 7182)
@@ -67,7 +67,7 @@
}
}
}
- var fact = new MgServiceFactory();
+ var fact = new MgdServiceFactory();
viewer.Init(new MgDesktopMapViewerProvider(_map));
viewer.RefreshMap();
}
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/gd.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/xerces-c_3_1mg.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs 2012-11-01 15:51:51 UTC (rev 7181)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs 2012-11-02 05:31:02 UTC (rev 7182)
@@ -55,17 +55,17 @@
return new LocalConnection(initParams);
}
- private MgServiceFactory _fact;
+ private MgdServiceFactory _fact;
protected LocalConnection(NameValueCollection initParams) : base()
{
- _fact = new MgServiceFactory();
+ _fact = new MgdServiceFactory();
_sessionId = Guid.NewGuid().ToString();
_configFile = initParams[PARAM_CONFIG];
var sw = new Stopwatch();
sw.Start();
- MgPlatform.Initialize(_configFile);
+ MgdPlatform.Initialize(_configFile);
sw.Stop();
Trace.TraceInformation("MapGuide Platform initialized in {0}ms", sw.ElapsedMilliseconds);
}
@@ -1186,7 +1186,7 @@
{
var implMap = impl.GetWrappedInstance();
var sel = Convert(implMap, selection);
- var opts = new MgRenderingOptions(format, behaviour, new MgColor(selectionColor));
+ var opts = new MgdRenderingOptions(format, behaviour, new MgColor(selectionColor));
return renderSvc.RenderDynamicOverlay(implMap, sel, opts);
};
return new MgReadOnlyStream(fetch);
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Commands/LocalGetResourceContents.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Commands/LocalGetResourceContents.cs 2012-11-01 15:51:51 UTC (rev 7181)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Commands/LocalGetResourceContents.cs 2012-11-02 05:31:02 UTC (rev 7182)
@@ -39,7 +39,7 @@
public LocalGetResourceContents(LocalConnection conn)
{
this.Parent = conn;
- var fact = new MgServiceFactory();
+ var fact = new MgdServiceFactory();
_resSvc = (MgResourceService)fact.CreateService(MgServiceType.ResourceService);
}
#else
More information about the mapguide-commits
mailing list