[mapguide-commits] r6488 - in trunk/Tools/MgInstantSetup:
InstantSetup InstantSetup.Core
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Feb 7 22:47:39 EST 2012
Author: jng
Date: 2012-02-07 19:47:39 -0800 (Tue, 07 Feb 2012)
New Revision: 6488
Modified:
trunk/Tools/MgInstantSetup/InstantSetup.Core/AbstractSetupConfigurationProcess.cs
trunk/Tools/MgInstantSetup/InstantSetup.Core/AppCmd.cs
trunk/Tools/MgInstantSetup/InstantSetup.Core/IISSetupConfigurationProcess.cs
trunk/Tools/MgInstantSetup/InstantSetup/Form1.Designer.cs
trunk/Tools/MgInstantSetup/InstantSetup/Form1.cs
Log:
Added a checkbox to indicate if the mapguide instance to be configured is 64-bit. There's a configuration code path in IIS that is dependent on this setting.
Modified: trunk/Tools/MgInstantSetup/InstantSetup/Form1.Designer.cs
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup/Form1.Designer.cs 2012-02-07 16:09:07 UTC (rev 6487)
+++ trunk/Tools/MgInstantSetup/InstantSetup/Form1.Designer.cs 2012-02-08 03:47:39 UTC (rev 6488)
@@ -31,6 +31,7 @@
this.btnConfigure = new System.Windows.Forms.Button();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.TAB_APACHE = new System.Windows.Forms.TabPage();
+ this.TAB_IIS7 = new System.Windows.Forms.TabPage();
this.label1 = new System.Windows.Forms.Label();
this.txtServiceName = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
@@ -42,7 +43,7 @@
this.txtBatchOutput = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.chkWriteMentorDictPath = new System.Windows.Forms.CheckBox();
- this.TAB_IIS7 = new System.Windows.Forms.TabPage();
+ this.chk64Bit = new System.Windows.Forms.CheckBox();
this.tabControl1.SuspendLayout();
this.SuspendLayout();
//
@@ -64,10 +65,10 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.tabControl1.Controls.Add(this.TAB_APACHE);
this.tabControl1.Controls.Add(this.TAB_IIS7);
- this.tabControl1.Location = new System.Drawing.Point(13, 87);
+ this.tabControl1.Location = new System.Drawing.Point(13, 111);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(527, 416);
+ this.tabControl1.Size = new System.Drawing.Size(527, 392);
this.tabControl1.TabIndex = 1;
//
// TAB_APACHE
@@ -75,11 +76,21 @@
this.TAB_APACHE.Location = new System.Drawing.Point(4, 22);
this.TAB_APACHE.Name = "TAB_APACHE";
this.TAB_APACHE.Padding = new System.Windows.Forms.Padding(3);
- this.TAB_APACHE.Size = new System.Drawing.Size(519, 390);
+ this.TAB_APACHE.Size = new System.Drawing.Size(519, 366);
this.TAB_APACHE.TabIndex = 1;
this.TAB_APACHE.Text = "Apache";
this.TAB_APACHE.UseVisualStyleBackColor = true;
//
+ // TAB_IIS7
+ //
+ this.TAB_IIS7.Location = new System.Drawing.Point(4, 22);
+ this.TAB_IIS7.Name = "TAB_IIS7";
+ this.TAB_IIS7.Padding = new System.Windows.Forms.Padding(3);
+ this.TAB_IIS7.Size = new System.Drawing.Size(519, 390);
+ this.TAB_IIS7.TabIndex = 2;
+ this.TAB_IIS7.Text = "IIS7";
+ this.TAB_IIS7.UseVisualStyleBackColor = true;
+ //
// label1
//
this.label1.AutoSize = true;
@@ -183,21 +194,23 @@
this.chkWriteMentorDictPath.UseVisualStyleBackColor = true;
this.chkWriteMentorDictPath.CheckedChanged += new System.EventHandler(this.chkWriteMentorDictPath_CheckedChanged);
//
- // TAB_IIS7
+ // chk64Bit
//
- this.TAB_IIS7.Location = new System.Drawing.Point(4, 22);
- this.TAB_IIS7.Name = "TAB_IIS7";
- this.TAB_IIS7.Padding = new System.Windows.Forms.Padding(3);
- this.TAB_IIS7.Size = new System.Drawing.Size(519, 390);
- this.TAB_IIS7.TabIndex = 2;
- this.TAB_IIS7.Text = "IIS7";
- this.TAB_IIS7.UseVisualStyleBackColor = true;
+ this.chk64Bit.AutoSize = true;
+ this.chk64Bit.Location = new System.Drawing.Point(156, 87);
+ this.chk64Bit.Name = "chk64Bit";
+ this.chk64Bit.Size = new System.Drawing.Size(201, 17);
+ this.chk64Bit.TabIndex = 12;
+ this.chk64Bit.Text = "This is a 64-bit instance of MapGuide";
+ this.chk64Bit.UseVisualStyleBackColor = true;
+ this.chk64Bit.CheckedChanged += new System.EventHandler(this.chk64Bit_CheckedChanged);
//
// Form1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(552, 544);
+ this.Controls.Add(this.chk64Bit);
this.Controls.Add(this.chkWriteMentorDictPath);
this.Controls.Add(this.button1);
this.Controls.Add(this.txtBatchOutput);
@@ -235,6 +248,7 @@
private System.Windows.Forms.Label label3;
private System.Windows.Forms.CheckBox chkWriteMentorDictPath;
private System.Windows.Forms.TabPage TAB_IIS7;
+ private System.Windows.Forms.CheckBox chk64Bit;
}
}
Modified: trunk/Tools/MgInstantSetup/InstantSetup/Form1.cs
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup/Form1.cs 2012-02-07 16:09:07 UTC (rev 6487)
+++ trunk/Tools/MgInstantSetup/InstantSetup/Form1.cs 2012-02-08 03:47:39 UTC (rev 6488)
@@ -111,5 +111,10 @@
txtBatchOutput.Text = folderBrowser.SelectedPath;
}
}
+
+ private void chk64Bit_CheckedChanged(object sender, EventArgs e)
+ {
+ _iis7Conf.Config.Is64BitMapGuide = _apacheConf.Config.Is64BitMapGuide = chk64Bit.Checked;
+ }
}
}
Modified: trunk/Tools/MgInstantSetup/InstantSetup.Core/AbstractSetupConfigurationProcess.cs
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup.Core/AbstractSetupConfigurationProcess.cs 2012-02-07 16:09:07 UTC (rev 6487)
+++ trunk/Tools/MgInstantSetup/InstantSetup.Core/AbstractSetupConfigurationProcess.cs 2012-02-08 03:47:39 UTC (rev 6488)
@@ -49,6 +49,11 @@
this.ServerSitePort = 2822;
}
+ /// <summary>
+ /// Gets or sets whether the installation of MapGuide to be configured is 64-bit
+ /// </summary>
+ public bool Is64BitMapGuide { get; set; }
+
public bool WriteMentorDictionaryPath { get; set; }
public string BatchFileOutputDirectory { get; set; }
Modified: trunk/Tools/MgInstantSetup/InstantSetup.Core/AppCmd.cs
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup.Core/AppCmd.cs 2012-02-07 16:09:07 UTC (rev 6487)
+++ trunk/Tools/MgInstantSetup/InstantSetup.Core/AppCmd.cs 2012-02-08 03:47:39 UTC (rev 6488)
@@ -193,7 +193,7 @@
return Process.Start(psi);
}
- internal void SetupCore()
+ internal void SetupCore(bool b64BitMapGuide)
{
Process p = null;
p = StartAppCmdProcess(string.Format(CREATE_FASTCGI, _phpDir));
@@ -229,8 +229,11 @@
p = StartAppCmdProcess(string.Format(SET_MAPAGENT_ISAPI_ACCESS, _webExtensionsRootDir));
Trace.TraceInformation(p.StandardOutput.ReadToEnd()); p.WaitForExit();
//if (p.ExitCode != 0) Debugger.Break();
- p = StartAppCmdProcess(string.Format(SET_32BIT_APP_POOL, _appPoolName));
- Trace.TraceInformation(p.StandardOutput.ReadToEnd()); p.WaitForExit();
+ if (!b64BitMapGuide)
+ {
+ p = StartAppCmdProcess(string.Format(SET_32BIT_APP_POOL, _appPoolName));
+ Trace.TraceInformation(p.StandardOutput.ReadToEnd()); p.WaitForExit();
+ }
//if (p.ExitCode != 0) Debugger.Break();
p = StartAppCmdProcess(string.Format(SET_MAPGUIDE_VDIR_APP_POOL, _webSite, _virtualDir, _appPoolName));
Trace.TraceInformation(p.StandardOutput.ReadToEnd()); p.WaitForExit();
Modified: trunk/Tools/MgInstantSetup/InstantSetup.Core/IISSetupConfigurationProcess.cs
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup.Core/IISSetupConfigurationProcess.cs 2012-02-07 16:09:07 UTC (rev 6487)
+++ trunk/Tools/MgInstantSetup/InstantSetup.Core/IISSetupConfigurationProcess.cs 2012-02-08 03:47:39 UTC (rev 6488)
@@ -70,7 +70,7 @@
protected override void ConfigureWebServer()
{
var cmd = new AppCmd(this.AppCmdPath, this.WebSiteName, this.VirtualDirectoryName, this.ApplicationPool, this.WebTierRootDir, this.WebTierPhpDir);
- cmd.SetupCore();
+ cmd.SetupCore(this.Is64BitMapGuide);
if (this.EnableDotNet)
cmd.SetDefaultDotNetViewer();
else if (this.EnablePhp)
More information about the mapguide-commits
mailing list