[mapguide-commits] r6353 - in trunk/Tools/Maestro:
Maestro.AddIn.Local Maestro.AddIn.Local/Commands
Maestro.AddIn.Local/Properties Maestro.AddIn.Local/UI Maestro.Base
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Dec 22 11:18:39 EST 2011
Author: jng
Date: 2011-12-22 08:18:39 -0800 (Thu, 22 Dec 2011)
New Revision: 6353
Added:
trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/ConnectionPoolStatusCommand.cs
trunk/Tools/Maestro/Maestro.AddIn.Local/UI/ConnectionPoolStatusDialog.Designer.cs
trunk/Tools/Maestro/Maestro.AddIn.Local/UI/ConnectionPoolStatusDialog.cs
trunk/Tools/Maestro/Maestro.AddIn.Local/UI/ConnectionPoolStatusDialog.resx
Modified:
trunk/Tools/Maestro/Maestro.AddIn.Local/ACE.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/StartupCommand.cs
trunk/Tools/Maestro/Maestro.AddIn.Local/GEOS.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj
trunk/Tools/Maestro/Maestro.AddIn.Local/Manifest.addin
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/Properties/Resources.Designer.cs
trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/Resources.resx
trunk/Tools/Maestro/Maestro.AddIn.Local/gd.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/xerces-c_3_1mg.dll
trunk/Tools/Maestro/Maestro.Base/Maestro.Base.addin
Log:
Update mg-desktop binaries to 22 Dec 2011 release. Also add a new tool to view local connection pool status.
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/ACE.dll
===================================================================
(Binary files differ)
Added: trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/ConnectionPoolStatusCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/ConnectionPoolStatusCommand.cs (rev 0)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/ConnectionPoolStatusCommand.cs 2011-12-22 16:18:39 UTC (rev 6353)
@@ -0,0 +1,40 @@
+#region Disclaimer / License
+// Copyright (C) 2011, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+#endregion
+using System;
+using System.Collections.Generic;
+using System.Text;
+using ICSharpCode.Core;
+using OSGeo.MapGuide;
+using Maestro.AddIn.Local.UI;
+
+namespace Maestro.AddIn.Local.Commands
+{
+ public class ConnectionPoolStatusCommand : AbstractMenuCommand
+ {
+ public override void Run()
+ {
+ MgServiceFactory fact = new MgServiceFactory();
+ MgdFeatureService featSvc = (MgdFeatureService)fact.CreateService(MgServiceType.FeatureService);
+
+ MgByteReader br = featSvc.QueryCacheInfo();
+ new ConnectionPoolStatusDialog(br).ShowDialog();
+ }
+ }
+}
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/StartupCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/StartupCommand.cs 2011-12-21 02:30:00 UTC (rev 6352)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/StartupCommand.cs 2011-12-22 16:18:39 UTC (rev 6353)
@@ -34,6 +34,9 @@
{
public override void Run()
{
+ ResourceService.RegisterNeutralImages(Properties.Resources.ResourceManager);
+ ResourceService.RegisterNeutralStrings(Properties.Resources.ResourceManager);
+
if (!Platform.IsRunningOnMono)
{
ResourcePreviewerFactory.RegisterPreviewer(LocalConnection.PROVIDER_NAME, new LocalPreviewer());
@@ -50,9 +53,7 @@
{
try
{
- var fact = new MgServiceFactory();
- MgdResourceService resSvc = (MgdResourceService)fact.CreateService(MgServiceType.ResourceService);
- resSvc.DeleteSessionFiles();
+ MgPlatform.Terminate();
}
catch (MgException ex)
{
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/GEOS.dll
===================================================================
(Binary files differ)
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj 2011-12-21 02:30:00 UTC (rev 6352)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj 2011-12-22 16:18:39 UTC (rev 6353)
@@ -52,6 +52,7 @@
<Compile Include="..\Properties\SignedAssemblyInfo2.cs">
<Link>SignedAssemblyInfo2.cs</Link>
</Compile>
+ <Compile Include="Commands\ConnectionPoolStatusCommand.cs" />
<Compile Include="Commands\StartupCommand.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
@@ -60,6 +61,12 @@
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Services\LocalPreviewer.cs" />
+ <Compile Include="UI\ConnectionPoolStatusDialog.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UI\ConnectionPoolStatusDialog.Designer.cs">
+ <DependentUpon>ConnectionPoolStatusDialog.cs</DependentUpon>
+ </Compile>
<Compile Include="UI\MapPreviewWindow.cs">
<SubType>Form</SubType>
</Compile>
@@ -998,6 +1005,9 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
+ <EmbeddedResource Include="UI\ConnectionPoolStatusDialog.resx">
+ <DependentUpon>ConnectionPoolStatusDialog.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UI\MapPreviewWindow.resx">
<DependentUpon>MapPreviewWindow.cs</DependentUpon>
</EmbeddedResource>
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/Manifest.addin
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Manifest.addin 2011-12-21 02:30:00 UTC (rev 6352)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Manifest.addin 2011-12-22 16:18:39 UTC (rev 6353)
@@ -17,4 +17,12 @@
<Path name="/Workspace/Autostart">
<Class id="Startup" class="Maestro.AddIn.Local.Commands.StartupCommand" />
</Path>
+
+ <!-- Main Menu Definition -->
+ <Path name="/Workspace/Tools">
+ <MenuItem id="LocalConnectionPoolStatus"
+ insertbefore="CacheView"
+ label="${res:LocalConnectionPoolStatus}"
+ class="Maestro.AddIn.Local.Commands.ConnectionPoolStatusCommand"/>
+ </Path>
</AddIn>
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/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/Resources.Designer.cs 2011-12-21 02:30:00 UTC (rev 6352)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/Resources.Designer.cs 2011-12-22 16:18:39 UTC (rev 6353)
@@ -130,6 +130,15 @@
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Local Connection Pool Status.
+ /// </summary>
+ internal static string LocalConnectionPoolStatus {
+ get {
+ return ResourceManager.GetString("LocalConnectionPoolStatus", resourceCulture);
+ }
+ }
+
internal static System.Drawing.Bitmap magnifier_zoom_fit {
get {
object obj = ResourceManager.GetObject("magnifier-zoom-fit", resourceCulture);
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/Resources.resx 2011-12-21 02:30:00 UTC (rev 6352)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/Resources.resx 2011-12-22 16:18:39 UTC (rev 6353)
@@ -160,4 +160,7 @@
<data name="TiledLayerSupportWarning" xml:space="preserve">
<value>WARNING: The Map Preview does not yet support rendering of tiled layers. Such layers will be rendered as normal layers for the purpose of this preview</value>
</data>
+ <data name="LocalConnectionPoolStatus" xml:space="preserve">
+ <value>Local Connection Pool Status</value>
+ </data>
</root>
\ No newline at end of file
Added: trunk/Tools/Maestro/Maestro.AddIn.Local/UI/ConnectionPoolStatusDialog.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/UI/ConnectionPoolStatusDialog.Designer.cs (rev 0)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/UI/ConnectionPoolStatusDialog.Designer.cs 2011-12-22 16:18:39 UTC (rev 6353)
@@ -0,0 +1,76 @@
+namespace Maestro.AddIn.Local.UI
+{
+ partial class ConnectionPoolStatusDialog
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.txtXml = new System.Windows.Forms.TextBox();
+ this.button1 = new System.Windows.Forms.Button();
+ this.SuspendLayout();
+ //
+ // txtXml
+ //
+ this.txtXml.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txtXml.Location = new System.Drawing.Point(13, 13);
+ this.txtXml.Multiline = true;
+ this.txtXml.Name = "txtXml";
+ this.txtXml.ReadOnly = true;
+ this.txtXml.Size = new System.Drawing.Size(639, 421);
+ this.txtXml.TabIndex = 0;
+ //
+ // button1
+ //
+ this.button1.Location = new System.Drawing.Point(577, 443);
+ this.button1.Name = "button1";
+ this.button1.Size = new System.Drawing.Size(75, 23);
+ this.button1.TabIndex = 1;
+ this.button1.Text = "Close";
+ this.button1.UseVisualStyleBackColor = true;
+ this.button1.Click += new System.EventHandler(this.btnClose_Click);
+ //
+ // ConnectionPoolStatusDialog
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(664, 478);
+ this.ControlBox = false;
+ this.Controls.Add(this.button1);
+ this.Controls.Add(this.txtXml);
+ this.Name = "ConnectionPoolStatusDialog";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "Connection Pool Status";
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.TextBox txtXml;
+ private System.Windows.Forms.Button button1;
+ }
+}
\ No newline at end of file
Added: trunk/Tools/Maestro/Maestro.AddIn.Local/UI/ConnectionPoolStatusDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/UI/ConnectionPoolStatusDialog.cs (rev 0)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/UI/ConnectionPoolStatusDialog.cs 2011-12-22 16:18:39 UTC (rev 6353)
@@ -0,0 +1,89 @@
+#region Disclaimer / License
+// Copyright (C) 2011, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+#endregion
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using OSGeo.MapGuide;
+using System.Xml;
+using System.IO;
+
+namespace Maestro.AddIn.Local.UI
+{
+ public partial class ConnectionPoolStatusDialog : Form
+ {
+ private ConnectionPoolStatusDialog()
+ {
+ InitializeComponent();
+ }
+
+ public ConnectionPoolStatusDialog(MgByteReader reader)
+ : this()
+ {
+ txtXml.Text = FormatXml(reader.ToString());
+ }
+
+ private void btnClose_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+
+ private string FormatXml(string sUnformattedXml)
+ {
+ //load unformatted xml into a dom
+ XmlDocument xd = new XmlDocument();
+ xd.LoadXml(sUnformattedXml);
+
+ //will hold formatted xml
+ StringBuilder sb = new StringBuilder();
+
+ //pumps the formatted xml into the StringBuilder above
+ StringWriter sw = new StringWriter(sb);
+
+ //does the formatting
+ XmlTextWriter xtw = null;
+
+ try
+ {
+ //point the xtw at the StringWriter
+ xtw = new XmlTextWriter(sw);
+
+ //we want the output formatted
+ xtw.Formatting = Formatting.Indented;
+
+ //get the dom to dump its contents into the xtw
+ xd.WriteTo(xtw);
+ }
+ finally
+ {
+ //clean up even if error
+ if (xtw != null)
+ xtw.Close();
+ }
+
+ //return the formatted xml
+ return sb.ToString();
+ }
+
+ }
+}
Added: trunk/Tools/Maestro/Maestro.AddIn.Local/UI/ConnectionPoolStatusDialog.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/UI/ConnectionPoolStatusDialog.resx (rev 0)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/UI/ConnectionPoolStatusDialog.resx 2011-12-22 16:18:39 UTC (rev 6353)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
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/Maestro.Base/Maestro.Base.addin
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Maestro.Base.addin 2011-12-21 02:30:00 UTC (rev 6352)
+++ trunk/Tools/Maestro/Maestro.Base/Maestro.Base.addin 2011-12-22 16:18:39 UTC (rev 6353)
@@ -185,27 +185,7 @@
<MenuItem id="Menu_Tools"
type="Menu"
label="${res:Menu_Tools}">
- <MenuItem id="SiteAdmin"
- label="${res:SiteAdministrator}"
- class="Maestro.Base.Commands.SiteAdministratorCommand"/>
- <MenuItem id="MgCooker"
- label="${res:MgCooker}"
- class="Maestro.Base.Commands.MgCookerCommand"/>
- <MenuItem id="LocalFsPreview"
- label="${res:LocalFsPreview}"
- class="Maestro.Base.Commands.LocalFeatureSourcePreviewCommand"/>
- <MenuItem id="ServerMonitor"
- label="${res:ServerMonitor}"
- icon="system_monitor"
- class="Maestro.Base.Commands.ServerMonitorCommand"/>
- <MenuItem id="CacheView"
- label="${res:CacheView}"
- class="Maestro.Base.Commands.CacheViewerCommand"/>
- <MenuItem type="Separator" />
- <MenuItem id="Menu_Tools_Options"
- label="${res:Menu_Tools_Options}"
- icon="application_task"
- class="Maestro.Base.Commands.OptionsCommand"/>
+ <Include id="ToolList" path="/Workspace/Tools" />
</MenuItem>
<MenuItem id="Menu_Window"
type="Menu"
@@ -672,5 +652,29 @@
class="Maestro.Base.Commands.SiteExplorer.ValidateCommand" />
</Condition>
</Path>
+
+ <Path id="/Workspace/Tools">
+ <MenuItem id="SiteAdmin"
+ label="${res:SiteAdministrator}"
+ class="Maestro.Base.Commands.SiteAdministratorCommand"/>
+ <MenuItem id="MgCooker"
+ label="${res:MgCooker}"
+ class="Maestro.Base.Commands.MgCookerCommand"/>
+ <MenuItem id="LocalFsPreview"
+ label="${res:LocalFsPreview}"
+ class="Maestro.Base.Commands.LocalFeatureSourcePreviewCommand"/>
+ <MenuItem id="ServerMonitor"
+ label="${res:ServerMonitor}"
+ icon="system_monitor"
+ class="Maestro.Base.Commands.ServerMonitorCommand"/>
+ <MenuItem id="CacheView"
+ label="${res:CacheView}"
+ class="Maestro.Base.Commands.CacheViewerCommand"/>
+ <MenuItem type="Separator" />
+ <MenuItem id="Menu_Tools_Options"
+ label="${res:Menu_Tools_Options}"
+ icon="application_task"
+ class="Maestro.Base.Commands.OptionsCommand"/>
+ </Path>
</AddIn>
More information about the mapguide-commits
mailing list