[mapguide-commits] r6127 - in trunk/Tools/Maestro: LocalConfigure
LocalConfigure/Properties LocalConfigure/Resources
Maestro.AddIn.Local Maestro.AddIn.Local/Commands MgCooker
OSGeo.MapGuide.MaestroAPI.Local/Properties
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Sep 7 08:30:02 EDT 2011
Author: jng
Date: 2011-09-07 05:30:02 -0700 (Wed, 07 Sep 2011)
New Revision: 6127
Added:
trunk/Tools/Maestro/LocalConfigure/Resources/ProviderEntry.txt
Modified:
trunk/Tools/Maestro/LocalConfigure/LocalConfigure.csproj
trunk/Tools/Maestro/LocalConfigure/Program.cs
trunk/Tools/Maestro/LocalConfigure/Properties/Resources.Designer.cs
trunk/Tools/Maestro/LocalConfigure/Properties/Resources.resx
trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/StartupCommand.cs
trunk/Tools/Maestro/Maestro.AddIn.Local/MapGuideDesktopUnmanagedApi.dll
trunk/Tools/Maestro/Maestro.AddIn.Local/MgDesktop.dll
trunk/Tools/Maestro/MgCooker/SetupRun.cs
trunk/Tools/Maestro/MgCooker/SetupRun.designer.cs
trunk/Tools/Maestro/MgCooker/SetupRun.resx
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/Properties/AssemblyInfo.cs
Log:
- Update MgDesktop binaries
- Update MgCooker UI to handle Local connections. Command-line support is yet to be implemented
Modified: trunk/Tools/Maestro/LocalConfigure/LocalConfigure.csproj
===================================================================
--- trunk/Tools/Maestro/LocalConfigure/LocalConfigure.csproj 2011-09-07 10:32:51 UTC (rev 6126)
+++ trunk/Tools/Maestro/LocalConfigure/LocalConfigure.csproj 2011-09-07 12:30:02 UTC (rev 6127)
@@ -59,6 +59,9 @@
<ItemGroup>
<None Include="Resources\Platform.ini" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="Resources\ProviderEntry.txt" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Modified: trunk/Tools/Maestro/LocalConfigure/Program.cs
===================================================================
--- trunk/Tools/Maestro/LocalConfigure/Program.cs 2011-09-07 10:32:51 UTC (rev 6126)
+++ trunk/Tools/Maestro/LocalConfigure/Program.cs 2011-09-07 12:30:02 UTC (rev 6127)
@@ -22,6 +22,7 @@
using System.Text;
using ICSharpCode.Core;
using System.IO;
+using System.Xml;
namespace LocalConfigure
{
@@ -30,9 +31,10 @@
static void Main(string[] args)
{
var path = Path.Combine(FileUtility.ApplicationRootPath, "Platform.ini");
+ var providersPath = Path.Combine(FileUtility.ApplicationRootPath, "ConnectionProviders.xml");
+ var addInPath = Path.Combine(FileUtility.ApplicationRootPath, "AddIns\\Local");
if (!File.Exists(path))
{
- var addInPath = Path.Combine(FileUtility.ApplicationRootPath, "AddIns\\Local");
var appData = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
StringBuilder sb = new StringBuilder(Properties.Resources.Platform);
@@ -47,6 +49,27 @@
{
Console.WriteLine("Platform.ini already exists. Nothing to do");
}
+
+ if (File.Exists(providersPath))
+ {
+ var doc = new XmlDocument();
+ doc.Load(providersPath);
+ var nodes = doc.GetElementsByTagName("Name");
+ foreach (XmlNode n in nodes)
+ {
+ if (n.InnerText == "Maestro.Local")
+ {
+ Console.WriteLine("ConnectionProviders.xml already has Maestro.Local registered. Nothing to do");
+ return;
+ }
+ }
+
+ var root = doc.DocumentElement;
+ root.InnerXml += Properties.Resources.ProviderEntry.Replace("%ADDINDIR%", addInPath);
+
+ doc.Save(providersPath);
+ Console.WriteLine("Maestro.Local registered in ConnectionProviders.xml");
+ }
}
}
}
Modified: trunk/Tools/Maestro/LocalConfigure/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/LocalConfigure/Properties/Resources.Designer.cs 2011-09-07 10:32:51 UTC (rev 6126)
+++ trunk/Tools/Maestro/LocalConfigure/Properties/Resources.Designer.cs 2011-09-07 12:30:02 UTC (rev 6127)
@@ -81,5 +81,19 @@
return ResourceManager.GetString("Platform", resourceCulture);
}
}
+
+ /// <summary>
+ /// Looks up a localized string similar to <ConnectionProvider>
+ /// <Name>Maestro.Local</Name>
+ /// <Description>Connection that wraps the mg-desktop library</Description>
+ /// <Assembly>%ADDINDIR%\OSGeo.MapGuide.MaestroAPI.Local.dll</Assembly>
+ /// <Type>OSGeo.MapGuide.MaestroAPI.Local.LocalConnection</Type>
+ ///</ConnectionProvider>.
+ /// </summary>
+ internal static string ProviderEntry {
+ get {
+ return ResourceManager.GetString("ProviderEntry", resourceCulture);
+ }
+ }
}
}
Modified: trunk/Tools/Maestro/LocalConfigure/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/LocalConfigure/Properties/Resources.resx 2011-09-07 10:32:51 UTC (rev 6126)
+++ trunk/Tools/Maestro/LocalConfigure/Properties/Resources.resx 2011-09-07 12:30:02 UTC (rev 6127)
@@ -121,4 +121,7 @@
<data name="Platform" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Platform.ini;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
</data>
+ <data name="ProviderEntry" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\ProviderEntry.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ </data>
</root>
\ No newline at end of file
Added: trunk/Tools/Maestro/LocalConfigure/Resources/ProviderEntry.txt
===================================================================
--- trunk/Tools/Maestro/LocalConfigure/Resources/ProviderEntry.txt (rev 0)
+++ trunk/Tools/Maestro/LocalConfigure/Resources/ProviderEntry.txt 2011-09-07 12:30:02 UTC (rev 6127)
@@ -0,0 +1,6 @@
+<ConnectionProvider>
+ <Name>Maestro.Local</Name>
+ <Description>Connection that wraps the mg-desktop library</Description>
+ <Assembly>%ADDINDIR%\OSGeo.MapGuide.MaestroAPI.Local.dll</Assembly>
+ <Type>OSGeo.MapGuide.MaestroAPI.Local.LocalConnection</Type>
+</ConnectionProvider>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/StartupCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/StartupCommand.cs 2011-09-07 10:32:51 UTC (rev 6126)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/StartupCommand.cs 2011-09-07 12:30:02 UTC (rev 6127)
@@ -36,10 +36,6 @@
{
if (!Platform.IsRunningOnMono)
{
- ConnectionProviderRegistry.RegisterProvider(
- LocalConnection.ProviderInfo,
- LocalConnection.Create);
-
ResourcePreviewerFactory.RegisterPreviewer(LocalConnection.PROVIDER_NAME, new LocalPreviewer());
System.Windows.Forms.Application.ApplicationExit += new EventHandler(OnAppExit);
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/MgCooker/SetupRun.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/SetupRun.cs 2011-09-07 10:32:51 UTC (rev 6126)
+++ trunk/Tools/Maestro/MgCooker/SetupRun.cs 2011-09-07 12:30:02 UTC (rev 6127)
@@ -55,13 +55,19 @@
: this()
{
m_connection = connection;
+
+ grpDifferentConnection.Enabled = chkUseDifferentConnection.Enabled = !m_connection.ProviderName.ToUpper().Equals("MAESTRO.LOCAL");
m_commandlineargs = args;
m_coordinateOverrides = new Dictionary<string, IEnvelope>();
//HttpServerConnection hc = connection as HttpServerConnection;
- var url = connection.GetCustomProperty("BaseUrl");
- if (url != null)
- MapAgent.Text = url.ToString();
+ try
+ {
+ var url = connection.GetCustomProperty("BaseUrl");
+ if (url != null)
+ MapAgent.Text = url.ToString();
+ }
+ catch { }
if (m_commandlineargs.ContainsKey("mapdefinitions"))
m_commandlineargs.Remove("mapdefinitions");
@@ -167,55 +173,56 @@
private void button1_Click(object sender, EventArgs e)
{
- IServerConnection con = null;
-
- if (UseNativeAPI.Checked)
+ IServerConnection con = m_connection;
+ if (chkUseDifferentConnection.Checked)
{
- string webconfig = System.IO.Path.Combine(Application.StartupPath, "webconfig.ini");
- if (!System.IO.File.Exists(webconfig))
+ if (UseNativeAPI.Checked)
{
- MessageBox.Show(this, string.Format(Properties.Resources.MissingWebConfigFile, webconfig), Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
- return;
- }
+ string webconfig = System.IO.Path.Combine(Application.StartupPath, "webconfig.ini");
+ if (!System.IO.File.Exists(webconfig))
+ {
+ MessageBox.Show(this, string.Format(Properties.Resources.MissingWebConfigFile, webconfig), Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
- try
- {
- var initP = new NameValueCollection();
+ try
+ {
+ var initP = new NameValueCollection();
- initP["ConfigFile"] = webconfig;
- initP["Username"] = Username.Text;
- initP["Password"] = Password.Text;
+ initP["ConfigFile"] = webconfig;
+ initP["Username"] = Username.Text;
+ initP["Password"] = Password.Text;
- con = ConnectionProviderRegistry.CreateConnection("Maestro.LocalNative", initP);
+ con = ConnectionProviderRegistry.CreateConnection("Maestro.LocalNative", initP);
+ }
+ catch (Exception ex)
+ {
+ string msg = NestedExceptionMessageProcessor.GetFullMessage(ex);
+ MessageBox.Show(this, string.Format(Properties.Resources.ConnectionError, msg), Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
}
- catch (Exception ex)
+ else
{
- string msg = NestedExceptionMessageProcessor.GetFullMessage(ex);
- MessageBox.Show(this, string.Format(Properties.Resources.ConnectionError, msg), Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
- return;
- }
- }
- else
- {
- try
- {
- var initP = new NameValueCollection();
+ try
+ {
+ var initP = new NameValueCollection();
- initP["Url"] = MapAgent.Text;
- initP["Username"] = Username.Text;
- initP["Password"] = Password.Text;
- initP["AllowUntestedVersion"] = "true";
+ initP["Url"] = MapAgent.Text;
+ initP["Username"] = Username.Text;
+ initP["Password"] = Password.Text;
+ initP["AllowUntestedVersion"] = "true";
- con = ConnectionProviderRegistry.CreateConnection("Maestro.Http", initP);
+ con = ConnectionProviderRegistry.CreateConnection("Maestro.Http", initP);
+ }
+ catch (Exception ex)
+ {
+ string msg = NestedExceptionMessageProcessor.GetFullMessage(ex);
+ MessageBox.Show(this, string.Format(Properties.Resources.ConnectionError, msg), Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
}
- catch (Exception ex)
- {
- string msg = NestedExceptionMessageProcessor.GetFullMessage(ex);
- MessageBox.Show(this, string.Format(Properties.Resources.ConnectionError, msg), Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
- return;
- }
}
-
try
{
BatchSettings bx = new BatchSettings(con);
Modified: trunk/Tools/Maestro/MgCooker/SetupRun.designer.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/SetupRun.designer.cs 2011-09-07 10:32:51 UTC (rev 6126)
+++ trunk/Tools/Maestro/MgCooker/SetupRun.designer.cs 2011-09-07 12:30:02 UTC (rev 6127)
@@ -49,7 +49,7 @@
this.label10 = new System.Windows.Forms.Label();
this.txtLowerX = new System.Windows.Forms.TextBox();
this.label11 = new System.Windows.Forms.Label();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.grpDifferentConnection = new System.Windows.Forms.GroupBox();
this.UseNativeAPI = new System.Windows.Forms.CheckBox();
this.Password = new System.Windows.Forms.TextBox();
this.Username = new System.Windows.Forms.TextBox();
@@ -73,10 +73,11 @@
this.MaxColLimit = new System.Windows.Forms.NumericUpDown();
this.label7 = new System.Windows.Forms.Label();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
+ this.chkUseDifferentConnection = new System.Windows.Forms.CheckBox();
this.panel1.SuspendLayout();
this.panel2.SuspendLayout();
this.BoundsOverride.SuspendLayout();
- this.groupBox1.SuspendLayout();
+ this.grpDifferentConnection.SuspendLayout();
this.groupBox3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.ThreadCount)).BeginInit();
this.groupBox2.SuspendLayout();
@@ -142,7 +143,7 @@
// panel2
//
this.panel2.Controls.Add(this.BoundsOverride);
- this.panel2.Controls.Add(this.groupBox1);
+ this.panel2.Controls.Add(this.grpDifferentConnection);
this.panel2.Controls.Add(this.groupBox3);
this.panel2.Controls.Add(this.groupBox2);
resources.ApplyResources(this.panel2, "panel2");
@@ -224,18 +225,19 @@
resources.ApplyResources(this.label11, "label11");
this.label11.Name = "label11";
//
- // groupBox1
+ // grpDifferentConnection
//
- resources.ApplyResources(this.groupBox1, "groupBox1");
- this.groupBox1.Controls.Add(this.UseNativeAPI);
- this.groupBox1.Controls.Add(this.Password);
- this.groupBox1.Controls.Add(this.Username);
- this.groupBox1.Controls.Add(this.MapAgent);
- this.groupBox1.Controls.Add(this.label3);
- this.groupBox1.Controls.Add(this.label2);
- this.groupBox1.Controls.Add(this.label1);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.TabStop = false;
+ resources.ApplyResources(this.grpDifferentConnection, "grpDifferentConnection");
+ this.grpDifferentConnection.Controls.Add(this.chkUseDifferentConnection);
+ this.grpDifferentConnection.Controls.Add(this.UseNativeAPI);
+ this.grpDifferentConnection.Controls.Add(this.Password);
+ this.grpDifferentConnection.Controls.Add(this.Username);
+ this.grpDifferentConnection.Controls.Add(this.MapAgent);
+ this.grpDifferentConnection.Controls.Add(this.label3);
+ this.grpDifferentConnection.Controls.Add(this.label2);
+ this.grpDifferentConnection.Controls.Add(this.label1);
+ this.grpDifferentConnection.Name = "grpDifferentConnection";
+ this.grpDifferentConnection.TabStop = false;
//
// UseNativeAPI
//
@@ -413,10 +415,16 @@
resources.ApplyResources(this.label7, "label7");
this.label7.Name = "label7";
//
+ // chkUseDifferentConnection
+ //
+ resources.ApplyResources(this.chkUseDifferentConnection, "chkUseDifferentConnection");
+ this.chkUseDifferentConnection.Name = "chkUseDifferentConnection";
+ this.chkUseDifferentConnection.UseVisualStyleBackColor = true;
+ //
// SetupRun
//
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
resources.ApplyResources(this, "$this");
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.Controls.Add(this.MapTree);
this.Controls.Add(this.panel2);
this.Controls.Add(this.panel1);
@@ -425,8 +433,8 @@
this.panel2.ResumeLayout(false);
this.BoundsOverride.ResumeLayout(false);
this.BoundsOverride.PerformLayout();
- this.groupBox1.ResumeLayout(false);
- this.groupBox1.PerformLayout();
+ this.grpDifferentConnection.ResumeLayout(false);
+ this.grpDifferentConnection.PerformLayout();
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.ThreadCount)).EndInit();
@@ -453,7 +461,7 @@
private System.Windows.Forms.SaveFileDialog saveFileDialog1;
private System.Windows.Forms.ImageList imageList1;
private System.Windows.Forms.Panel panel2;
- private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.GroupBox grpDifferentConnection;
private System.Windows.Forms.CheckBox UseNativeAPI;
private System.Windows.Forms.TextBox Password;
private System.Windows.Forms.TextBox Username;
@@ -488,5 +496,6 @@
private System.Windows.Forms.Label label11;
private System.Windows.Forms.Button ResetBounds;
private System.Windows.Forms.Label ModfiedOverrideWarning;
+ private System.Windows.Forms.CheckBox chkUseDifferentConnection;
}
}
\ No newline at end of file
Modified: trunk/Tools/Maestro/MgCooker/SetupRun.resx
===================================================================
--- trunk/Tools/Maestro/MgCooker/SetupRun.resx 2011-09-07 10:32:51 UTC (rev 6126)
+++ trunk/Tools/Maestro/MgCooker/SetupRun.resx 2011-09-07 12:30:02 UTC (rev 6127)
@@ -238,61 +238,61 @@
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
- ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
- DAAAAk1TRnQBSQFMAgEBBAEAAUQBAAFEAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACC
+ DAAAAk1TRnQBSQFMAgEBBAEAAUwBAAFMAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABIAMAAQEBAAEgBgABIP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8AKgADHAEoAyQBNgMk
ATYDJAE2AyQBNgMkATYDJAE2AyQBNgMkATYDJAE2AyQBNgMkATYDGwEmHAADFgEeAVsCWAHGAx0BKgMC
- AQOgAAP9Af8D/QH/A/0B/wP9Af8D/QH/A/0B/wP9Af8D/QH/A/0B/wP9Af8D/QH/A/0B/wMbASYcAAGI
- Am0B9wH0AeYB4QH/Ac0BvAG7Af0BjgGGAYUB+QFNAkwBkQMRAReYAAP9Af8B9QHoAeQB/wH0AeUB4AH/
+ AQOgAAP9Af8D/QH/A/0B/wP9Af8D/QH/A/0B/wP9Af8D/QH/A/0B/wP9Af8D/QH/A/0B/wMbASYcAAGH
+ Am0B9wH0AeYB4QH/AcoBuwG6Af0BjQGFAYQB+QFNAkwBkQMRAReYAAP9Af8B9QHoAeQB/wH0AeUB4AH/
AfIB4gHdAf8B8QHgAdkB/wHwAd0B1gH/Ae8B2wHTAf8B7gHZAdEB/wHuAdgB0AH/Ae4B2AHQAf8B7gHY
AdAB/wP9Af8DGwEmGAABLAIrAUMB9QHoAeMB/wH0AeYB4QH/AfMB5AHfAf8B8gHjAd0B/wHyAeEB2wH/
- AawBnQGaAfoBagJaAfABNgI1AVgDCwEPDAADHQEqAx0BKiAAAwUBBwMdASoDHQEqTAAD/QH/AfcB7QHp
- Af8B9gHqAeYB/wH0AecB4wH/Ad0BtQGwAf8BvQFsAWcB/wG+AXABawH/AeMBwgG8Af8B7wHaAdIB/wHu
- AdgB0AH/Ae4B2AHQAf8D/QH/AxsBJhgAAZMCfAH4AfUB6AHjAf8B9AHmAeEB/wHzAeQB3wH/AfIB4wHd
- Af8B8gHhAdsB/wHxAd8B2QH/AfAB3QHXAf8B7wHcAdUB/wGgAYwBhgH6AVkCVwHCCwAB/ygAAzABTAMA
- Af9MAAP9Af8B+AHwAe0B/wHtAdcB0gH/AbkBiQFqAf8BWgGTASoB/wHqAbEBMgH/AegBrgEpAf8B6wHB
- AV0B/wGxAVQBTwH/Ae4B2QHSAf8B7gHZAdIB/wP9Af8DGwEmFAADQAFwAfUB6QHlAf8B9QHoAeMB/wH0
+ AakBmwGYAfoBaQJaAfABNgI1AVgDCwEPDAADHQEqAx0BKiAAAwUBBwMdASoDHQEqTAAD/QH/AfcB7QHp
+ Af8B9gHqAeYB/wH0AecB4wH/Ad0BtQGwAf8BvQFrAWYB/wG+AW8BagH/AeMBwgG8Af8B7wHaAdIB/wHu
+ AdgB0AH/Ae4B2AHQAf8D/QH/AxsBJhgAAZECewH4AfUB6AHjAf8B9AHmAeEB/wHzAeQB3wH/AfIB4wHd
+ Af8B8gHhAdsB/wHxAd8B2QH/AfAB3QHXAf8B7wHcAdUB/wGeAYkBgwH6AVkCVwHCCwAB/ygAAzABTAMA
+ Af9MAAP9Af8B+AHwAe0B/wHtAdcB0gH/AbkBiQFpAf8BWQGTASkB/wHqAbEBMQH/AegBrgEoAf8B6wHB
+ AVwB/wGxAVMBTgH/Ae4B2QHSAf8B7gHZAdIB/wP9Af8DGwEmFAADQAFwAfUB6QHlAf8B9QHoAeMB/wH0
AeYB4QH/AfMB5AHfAf8B8gHjAd0B/wHyAeEB2wH/AfEB3wHZAf8B8AHdAdcB/wHvAdwB1QH/Ae8B2gHT
Af8DOAFcCwAB/wgAAUYCRQF/AwAEAQECA0UBfQQAAygBPAMlATcEAAMvAUoDAAH/DAADEQEXA1gB0QMA
- Af8DKAE8EAADOAFcAwAB/xgAA/0B/wH2AeoB5gH/AegBvwGcAf8B+wHLAV0B/wE3Aa0BRAH/AU8BnQEl
- Af8B/gHEAT0B/wH+Ab4BKAH/AfYBtgEeAf8BlwFtAUoB/wHwAd0B1gH/A/0B/wMbASYUAAGaAYoBiAH4
+ Af8DKAE8EAADOAFcAwAB/xgAA/0B/wH2AeoB5gH/AegBvwGcAf8B+wHLAVwB/wE2Aa0BQwH/AU4BnQEk
+ Af8B/gHEATwB/wH+Ab4BJwH/AfYBtgEdAf8BlwFsAUkB/wHwAd0B1gH/A/0B/wMbASYUAAGYAYcBhQH4
AfUB6QHlAf8B9QHoAeMB/wH0AeYB4QH/AfMB5AHfAf8B8gHjAd0B/wHyAeEB2wH/AfEB3wHZAf8B8AHd
- AdcB/wHvAdwB1QH/AXsCYgH2AwQBBgsAAf8LAAH/A0UBfQNIAYUDAAH/BwAB/wMAAf8EAAMvAUoDAAH/
- EAADQgF0AwAB/xQAAw0BEQFaAlkB1RgAA/0B/wG5AVoBRQH/AfoBzgFpAf8BpAG2AVEB/wE3Aa0BRQH/
- ATYBrQFEAf8ByQG/AVMB/wH+AcQBPAH/Af4BwAEtAf8BNQGlATwB/wG8AWwBaQH/A/0B/wMbASYQAANQ
- AZ4B9gHrAecB/wH1AekB5QH/AfUB6AHjAf8B9AHmAeEB/wHzAeQB3wH/AfIB4wHdAf8B8gHhAdsB/wHx
- Ad8B2QH/AfAB3QHXAf8BvwG1AbEB/AMoATwPAAH/KAADLwFKAwAB/xAAA0IBdAMAAf80AAP9Af8B6gHD
- AaEB/wH9AdYBhAH/AZsBtgFXAf8BNQGfASoB/wHxAdgBkQH/Af0B0QFtAf8BnAGwAT4B/wE3Aa0BRQH/
- ATcBrQFFAf8BmAFoAUcB/wP9Af8DGwEmEAABnwGKAYkB9wH2AesB5wH/AfUB6QHlAf8B9QHoAeMB/wH0
- AeYB4QH/AfMB5AHfAf8B8gHjAd0B/wHyAeEB2wH/AfEB3wHZAf8B8AHdAdcB/wFqAlkB6wMBAQIPAAH/
- KAADLwFKAwAB/xAAA0IBdAMAAf8UAAMCAQMDUQGhGAAD/QH/AfoB4gG5Af8BOAGaASEB/wLUAZsB/wH9
- AeMBtQH/Af0B3QGdAf8B/QHUAXYB/wHkAcgBWwH/ATYBrAFDAf8BTQGcASIB/wGeAYoBWAH/A/0B/wMb
- ASYMAAFcAlkByQH3Ae0B6QH/AfYB6wHnAf8B9QHpAeUB/wH1AegB4wH/AfQB5gHhAf8B8wHkAd8B/wHy
- AeMB3QH/AfIB4QHbAf8B8QHfAdkB/wGvAZ8BnAH6AxsBJhMAAf8oAAMvAUoDAAH/EAADQgF0AwAB/xQA
- Az4BawMAAf8YAAP9Af8BagGQATIB/wE3Aa0BRQH/ATcBrQFFAf8BrwHBAXEB/wH9AdsBlQH/Af0B0wFx
- Af8B/gHKAU8B/wE/AZoBIQH/ATUBlwEcAf8BnAFqAUgB/wP9Af8DGwEmCAADBAEFAbMBpAGjAfoB9wHt
- AekB/wH2AesB5wH/AfUB6QHlAf8B9QHoAeMB/wH0AeYB4QH/AfMB5AHfAf8B8gHjAd0B/wHyAeEB2wH/
- AfEB3wHZAf8BXQJZAdIXAAH/KAADLwFKAwAB/xAAA0IBdgMAAf80AAP9Af8BvgFsAUwB/wE3Aa0BRQH/
- ATYBowEzAf8BNgGtAUQB/wHAAcIBZAH/Af4BzgFfAf8B/gHGAUEB/wFWAZQBEwH/AcIBugFDAf8BxQGB
- AXUB/wP9Af8DGwEmCAABZQJYAecB+AHuAesB/wH3Ae0B6QH/AfYB6wHnAf8B9QHpAeUB/wH1AegB4wH/
- AfQB5gHhAf8B8wHkAd8B/wHyAeMB3QH/AfIB4QHbAf8BngGQAY0B+AMTARoXAAH/KAADLwFKAwAB/wwA
- AwgBCwFaAlQB3gMAAf80AAP9Af8B9wHtAekB/wFyAZABNgH/AacBtQFLAf8BNwGTARUB/wGqAbcBTQH/
- AUoBngEmAf8B8gHCAT4B/wH+Ab0BIwH/AcUBdQFhAf8B+QHxAe4B/wP9Af8DGwEmBAADEgEZAbUCpgH6
- AfgB7gHrAf8B9wHtAekB/wH2AesB5wH/AfUB6QHlAf8B9QHoAeMB/wH0AeYB4QH/AfMB5AHfAf8B8gHj
- Ad0B/wHyAeEB2wH/A1QBrxgAAVcCUQHfAUkCSAGHIAADCwEPA1UBtwFXAlEB30wAA/0B/wH5AfEB7gH/
- AfIB4QHbAf8BrQGGAVIB/wHuAdgBiwH/AUsBngEmAf8BNgGtAUQB/wE8AZQBGAH/AbsBXwFLAf8B+AHw
- Ae0B/wH5AfEB7gH/A/0B/wMbASYIAAMBAQIBUgJRAacBmQKLAfkB9gHrAecB/wH1AekB5QH/AfUB6AHj
- Af8B9AHmAeEB/wHzAeQB3wH/AfIB4wHdAf8BmgGHAYEB+AMOAROYAAP9Af8B+QHxAe4B/wH5AfEB7gH/
- AfkB8QHuAf8B7AHSAckB/wHSAZUBggH/AdQBmgGJAf8B8gHhAdwB/wH5AfEB7gH/AfkB8QHuAf8B+QHx
- Ae4B/wP9Af8DGwEmFAADHQEpAWECVgHkAaYBkAGOAfkB9AHmAeEB/wHzAeQB3wH/AfIB4wHdAf8BSQJI
- AYicAAP9Af8B+gH2AfQB/wH6AfYB9AH/AfoB9gH0Af8B+gH2AfQB/wH6AfYB9AH/AfoB9gH0Af8B+gH2
- AfQB/wH6AfYB9AH/AfoB9gH0Af8B+gH2AfQB/wP9Af8DGwEmIAADPgFrAZYCfAH6AZMCewH4AwcBCpwA
- AaUCoAH/AaQBoAGfAf8BpAKfAf8BowKeAf8BogKdAf8BoQKcAf8BoAKbAf8BnwKaAf8BnQKZAf8BnAGY
- AZcB/wGbApYB/wGZApUB/8gAAUIBTQE+BwABPgMAASgDAAFAAwABIAMAAQEBAAEBBgABARYAA/+BAAHA
- AQEB/AE/BP8BwAEBAfwBDwT/AcABAQH4AQEBzwHxAv8BwAEBAfgBAAHfAfkC/wHAAQEB8AEAAdgBSQHD
- Ac8BwAEBAfABAAHYAUkB5wHPAcABAQHgAQEB3wH5AecB/wHAAQEB4AEBAd8B+QHnAc8BwAEBAcABAwHf
- AfkB5wHPAcABAQGAAQcB3wH5AecB/wHAAQEBgAEHAd8B+QHHAf8BwAEBAQABDwHPAfEC/wHAAQEBgAEP
- BP8BwAEBAfABHwT/AcABAQH+AR8E/wHAAQMG/ws=
+ AdcB/wHvAdwB1QH/AXkCYgH2AwQBBgsAAf8LAAH/A0UBfQNIAYUDAAH/BwAB/wMAAf8EAAMvAUoDAAH/
+ EAADQgF0AwAB/xQAAw0BEQNaAdUYAAP9Af8BuQFZAUQB/wH6Ac4BaAH/AaQBtgFQAf8BNgGtAUQB/wE1
+ Aa0BQwH/AckBvwFSAf8B/gHEATsB/wH+AcABLAH/ATQBpQE7Af8BvAFrAWgB/wP9Af8DGwEmEAADUAGe
+ AfYB6wHnAf8B9QHpAeUB/wH1AegB4wH/AfQB5gHhAf8B8wHkAd8B/wHyAeMB3QH/AfIB4QHbAf8B8QHf
+ AdkB/wHwAd0B1wH/Ab0BswGvAfwDKAE8DwAB/ygAAy8BSgMAAf8QAANCAXQDAAH/NAAD/QH/AeoBwwGh
+ Af8B/QHWAYQB/wGbAbYBVgH/ATQBnwEpAf8B8QHYAZEB/wH9AdEBbAH/AZwBsAE9Af8BNgGtAUQB/wE2
+ Aa0BRAH/AZgBZwFGAf8D/QH/AxsBJhAAAZsBiQGIAfcB9gHrAecB/wH1AekB5QH/AfUB6AHjAf8B9AHm
+ AeEB/wHzAeQB3wH/AfIB4wHdAf8B8gHhAdsB/wHxAd8B2QH/AfAB3QHXAf8BaQJZAesDAQECDwAB/ygA
+ Ay8BSgMAAf8QAANCAXQDAAH/FAADAgEDA1EBoRgAA/0B/wH6AeIBuQH/ATcBmgEgAf8C1AGbAf8B/QHj
+ AbUB/wH9Ad0BnQH/Af0B1AF1Af8B5AHIAVoB/wE1AawBQgH/AUwBnAEhAf8BngGKAVcB/wP9Af8DGwEm
+ DAABXAJZAckB9wHtAekB/wH2AesB5wH/AfUB6QHlAf8B9QHoAeMB/wH0AeYB4QH/AfMB5AHfAf8B8gHj
+ Ad0B/wHyAeEB2wH/AfEB3wHZAf8BrAGdAZoB+gMbASYTAAH/KAADLwFKAwAB/xAAA0IBdAMAAf8UAAM+
+ AWsDAAH/GAAD/QH/AWkBkAExAf8BNgGtAUQB/wE2Aa0BRAH/Aa8BwQFwAf8B/QHbAZUB/wH9AdMBcAH/
+ Af4BygFOAf8BPgGaASAB/wE0AZcBGwH/AZwBaQFHAf8D/QH/AxsBJggAAwQBBQGvAaIBoQH6AfcB7QHp
+ Af8B9gHrAecB/wH1AekB5QH/AfUB6AHjAf8B9AHmAeEB/wHzAeQB3wH/AfIB4wHdAf8B8gHhAdsB/wHx
+ Ad8B2QH/AV0CWQHSFwAB/ygAAy8BSgMAAf8QAANCAXYDAAH/NAAD/QH/Ab4BawFLAf8BNgGtAUQB/wE1
+ AaMBMgH/ATUBrQFDAf8BwAHCAWMB/wH+Ac4BXgH/Af4BxgFAAf8BVQGUARIB/wHCAboBQgH/AcUBgQF0
+ Af8D/QH/AxsBJggAAWQCWgHnAfgB7gHrAf8B9wHtAekB/wH2AesB5wH/AfUB6QHlAf8B9QHoAeMB/wH0
+ AeYB4QH/AfMB5AHfAf8B8gHjAd0B/wHyAeEB2wH/AZsBjQGKAfgDEwEaFwAB/ygAAy8BSgMAAf8MAAMI
+ AQsBWgJVAd4DAAH/NAAD/QH/AfcB7QHpAf8BcQGQATUB/wGnAbUBSgH/ATYBkwEUAf8BqgG3AUwB/wFJ
+ AZ4BJQH/AfIBwgE9Af8B/gG9ASIB/wHFAXQBYAH/AfkB8QHuAf8D/QH/AxsBJgQAAxIBGQGwAqQB+gH4
+ Ae4B6wH/AfcB7QHpAf8B9gHrAecB/wH1AekB5QH/AfUB6AHjAf8B9AHmAeEB/wHzAeQB3wH/AfIB4wHd
+ Af8B8gHhAdsB/wNUAa8YAAFXAlQB3wFJAkgBhyAAAwsBDwNVAbcBVwJUAd9MAAP9Af8B+QHxAe4B/wHy
+ AeEB2wH/Aa0BhgFRAf8B7gHYAYsB/wFKAZ4BJQH/ATUBrQFDAf8BOwGUARcB/wG7AV4BSgH/AfgB8AHt
+ Af8B+QHxAe4B/wP9Af8DGwEmCAADAQECAVICUQGnAZUCigH5AfYB6wHnAf8B9QHpAeUB/wH1AegB4wH/
+ AfQB5gHhAf8B8wHkAd8B/wHyAeMB3QH/AZgBhAF+AfgDDgETmAAD/QH/AfkB8QHuAf8B+QHxAe4B/wH5
+ AfEB7gH/AewB0gHJAf8B0gGVAYIB/wHUAZoBiQH/AfIB4QHcAf8B+QHxAe4B/wH5AfEB7gH/AfkB8QHu
+ Af8D/QH/AxsBJhQAAx0BKQFhAlgB5AGiAY4BjQH5AfQB5gHhAf8B8wHkAd8B/wHyAeMB3QH/AUkCSAGI
+ nAAD/QH/AfoB9gH0Af8B+gH2AfQB/wH6AfYB9AH/AfoB9gH0Af8B+gH2AfQB/wH6AfYB9AH/AfoB9gH0
+ Af8B+gH2AfQB/wH6AfYB9AH/AfoB9gH0Af8D/QH/AxsBJiAAAz4BawGTAnsB+gGRAnoB+AMHAQqcAAGl
+ AqAB/wGkAaABnwH/AaQCnwH/AaMCngH/AaICnQH/AaECnAH/AaACmwH/AZ8CmgH/AZ0CmQH/AZwBmAGX
+ Af8BmwKWAf8BmQKVAf/IAAFCAU0BPgcAAT4DAAEoAwABQAMAASADAAEBAQABAQYAAQEWAAP/gQABwAEB
+ AfwBPwT/AcABAQH8AQ8E/wHAAQEB+AEBAc8B8QL/AcABAQH4AQAB3wH5Av8BwAEBAfABAAHYAUkBwwHP
+ AcABAQHwAQAB2AFJAecBzwHAAQEB4AEBAd8B+QHnAf8BwAEBAeABAQHfAfkB5wHPAcABAQHAAQMB3wH5
+ AecBzwHAAQEBgAEHAd8B+QHnAf8BwAEBAYABBwHfAfkBxwH/AcABAQEAAQ8BzwHxAv8BwAEBAYABDwT/
+ AcABAQHwAR8E/wHAAQEB/gEfBP8BwAEDBv8L
</value>
</data>
<data name="MapTree.Location" type="System.Drawing.Point, System.Drawing">
@@ -592,9 +592,36 @@
<data name=">>BoundsOverride.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <data name="groupBox1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <data name="grpDifferentConnection.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
+ <data name="chkUseDifferentConnection.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="chkUseDifferentConnection.Location" type="System.Drawing.Point, System.Drawing">
+ <value>11, 0</value>
+ </data>
+ <data name="chkUseDifferentConnection.Size" type="System.Drawing.Size, System.Drawing">
+ <value>142, 17</value>
+ </data>
+ <data name="chkUseDifferentConnection.TabIndex" type="System.Int32, mscorlib">
+ <value>7</value>
+ </data>
+ <data name="chkUseDifferentConnection.Text" xml:space="preserve">
+ <value>Use different connection</value>
+ </data>
+ <data name=">>chkUseDifferentConnection.Name" xml:space="preserve">
+ <value>chkUseDifferentConnection</value>
+ </data>
+ <data name=">>chkUseDifferentConnection.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>chkUseDifferentConnection.Parent" xml:space="preserve">
+ <value>grpDifferentConnection</value>
+ </data>
+ <data name=">>chkUseDifferentConnection.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
<data name="UseNativeAPI.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@@ -623,10 +650,10 @@
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>UseNativeAPI.Parent" xml:space="preserve">
- <value>groupBox1</value>
+ <value>grpDifferentConnection</value>
</data>
<data name=">>UseNativeAPI.ZOrder" xml:space="preserve">
- <value>0</value>
+ <value>1</value>
</data>
<data name="Password.Location" type="System.Drawing.Point, System.Drawing">
<value>88, 72</value>
@@ -647,10 +674,10 @@
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>Password.Parent" xml:space="preserve">
- <value>groupBox1</value>
+ <value>grpDifferentConnection</value>
</data>
<data name=">>Password.ZOrder" xml:space="preserve">
- <value>1</value>
+ <value>2</value>
</data>
<data name="Username.Location" type="System.Drawing.Point, System.Drawing">
<value>88, 48</value>
@@ -674,10 +701,10 @@
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>Username.Parent" xml:space="preserve">
- <value>groupBox1</value>
+ <value>grpDifferentConnection</value>
</data>
<data name=">>Username.ZOrder" xml:space="preserve">
- <value>2</value>
+ <value>3</value>
</data>
<data name="MapAgent.Location" type="System.Drawing.Point, System.Drawing">
<value>88, 24</value>
@@ -701,10 +728,10 @@
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>MapAgent.Parent" xml:space="preserve">
- <value>groupBox1</value>
+ <value>grpDifferentConnection</value>
</data>
<data name=">>MapAgent.ZOrder" xml:space="preserve">
- <value>3</value>
+ <value>4</value>
</data>
<data name="label3.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -728,10 +755,10 @@
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label3.Parent" xml:space="preserve">
- <value>groupBox1</value>
+ <value>grpDifferentConnection</value>
</data>
<data name=">>label3.ZOrder" xml:space="preserve">
- <value>4</value>
+ <value>5</value>
</data>
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -755,10 +782,10 @@
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label2.Parent" xml:space="preserve">
- <value>groupBox1</value>
+ <value>grpDifferentConnection</value>
</data>
<data name=">>label2.ZOrder" xml:space="preserve">
- <value>5</value>
+ <value>6</value>
</data>
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -782,33 +809,30 @@
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label1.Parent" xml:space="preserve">
- <value>groupBox1</value>
+ <value>grpDifferentConnection</value>
</data>
<data name=">>label1.ZOrder" xml:space="preserve">
- <value>6</value>
+ <value>7</value>
</data>
- <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+ <data name="grpDifferentConnection.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 8</value>
</data>
- <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="grpDifferentConnection.Size" type="System.Drawing.Size, System.Drawing">
<value>248, 128</value>
</data>
- <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+ <data name="grpDifferentConnection.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
</data>
- <data name="groupBox1.Text" xml:space="preserve">
- <value>MapAgent</value>
+ <data name=">>grpDifferentConnection.Name" xml:space="preserve">
+ <value>grpDifferentConnection</value>
</data>
- <data name=">>groupBox1.Name" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>groupBox1.Type" xml:space="preserve">
+ <data name=">>grpDifferentConnection.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>groupBox1.Parent" xml:space="preserve">
+ <data name=">>grpDifferentConnection.Parent" xml:space="preserve">
<value>panel2</value>
</data>
- <data name=">>groupBox1.ZOrder" xml:space="preserve">
+ <data name=">>grpDifferentConnection.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="groupBox3.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
@@ -1234,9 +1258,6 @@
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
- <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
- <value>6, 13</value>
- </data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>565, 578</value>
</data>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/Properties/AssemblyInfo.cs 2011-09-07 10:32:51 UTC (rev 6126)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/Properties/AssemblyInfo.cs 2011-09-07 12:30:02 UTC (rev 6127)
@@ -1,6 +1,8 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Local;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@@ -17,4 +19,6 @@
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("1a33e84e-0180-4b3f-bae5-51b1a62f6bd1")]
\ No newline at end of file
+[assembly: Guid("1a33e84e-0180-4b3f-bae5-51b1a62f6bd1")]
+
+[assembly: MaestroApiProvider("Maestro.Local", "Maestro connection wrapper for mg-desktop library", typeof(LocalConnection), true)]
\ No newline at end of file
More information about the mapguide-commits
mailing list