[mapguide-commits] r7842 - in trunk/Tools/MgInstantSetup: InstantSetup InstantSetup/Properties InstantSetup.Core InstantSetup.Core/Properties

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Fri Sep 6 02:11:46 PDT 2013


Author: jng
Date: 2013-09-06 02:11:46 -0700 (Fri, 06 Sep 2013)
New Revision: 7842

Modified:
   trunk/Tools/MgInstantSetup/InstantSetup.Core/ApacheSetupConfigurationProcess.cs
   trunk/Tools/MgInstantSetup/InstantSetup.Core/Properties/AssemblyInfo.cs
   trunk/Tools/MgInstantSetup/InstantSetup/ApacheConfigCtrl.Designer.cs
   trunk/Tools/MgInstantSetup/InstantSetup/ApacheConfigCtrl.cs
   trunk/Tools/MgInstantSetup/InstantSetup/Form1.Designer.cs
   trunk/Tools/MgInstantSetup/InstantSetup/Properties/AssemblyInfo.cs
Log:
Update MgInstantSetup to support custom apache directory name

Modified: trunk/Tools/MgInstantSetup/InstantSetup/ApacheConfigCtrl.Designer.cs
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup/ApacheConfigCtrl.Designer.cs	2013-09-06 08:13:34 UTC (rev 7841)
+++ trunk/Tools/MgInstantSetup/InstantSetup/ApacheConfigCtrl.Designer.cs	2013-09-06 09:11:46 UTC (rev 7842)
@@ -49,6 +49,8 @@
             this.groupBox4 = new System.Windows.Forms.GroupBox();
             this.rdJava = new System.Windows.Forms.RadioButton();
             this.rdPhp = new System.Windows.Forms.RadioButton();
+            this.txtPhysicalDirectory = new System.Windows.Forms.TextBox();
+            this.label8 = new System.Windows.Forms.Label();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numSitePort)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numClientPort)).BeginInit();
@@ -147,6 +149,8 @@
             // 
             this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                         | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBox2.Controls.Add(this.txtPhysicalDirectory);
+            this.groupBox2.Controls.Add(this.label8);
             this.groupBox2.Controls.Add(this.txtServiceName);
             this.groupBox2.Controls.Add(this.label7);
             this.groupBox2.Controls.Add(this.numHttpdPort);
@@ -155,7 +159,7 @@
             this.groupBox2.Controls.Add(this.label4);
             this.groupBox2.Location = new System.Drawing.Point(4, 126);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(440, 114);
+            this.groupBox2.Size = new System.Drawing.Size(440, 133);
             this.groupBox2.TabIndex = 1;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "General";
@@ -164,7 +168,7 @@
             // 
             this.txtServiceName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                         | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtServiceName.Location = new System.Drawing.Point(154, 77);
+            this.txtServiceName.Location = new System.Drawing.Point(154, 97);
             this.txtServiceName.Name = "txtServiceName";
             this.txtServiceName.Size = new System.Drawing.Size(229, 20);
             this.txtServiceName.TabIndex = 11;
@@ -173,7 +177,7 @@
             // label7
             // 
             this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(23, 80);
+            this.label7.Location = new System.Drawing.Point(23, 100);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(74, 13);
             this.label7.TabIndex = 10;
@@ -181,7 +185,7 @@
             // 
             // numHttpdPort
             // 
-            this.numHttpdPort.Location = new System.Drawing.Point(154, 51);
+            this.numHttpdPort.Location = new System.Drawing.Point(154, 71);
             this.numHttpdPort.Maximum = new decimal(new int[] {
             65536,
             0,
@@ -195,7 +199,7 @@
             // label6
             // 
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(23, 53);
+            this.label6.Location = new System.Drawing.Point(23, 73);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(93, 13);
             this.label6.TabIndex = 8;
@@ -205,7 +209,7 @@
             // 
             this.txtVirtualDirectory.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                         | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtVirtualDirectory.Location = new System.Drawing.Point(154, 25);
+            this.txtVirtualDirectory.Location = new System.Drawing.Point(154, 45);
             this.txtVirtualDirectory.Name = "txtVirtualDirectory";
             this.txtVirtualDirectory.Size = new System.Drawing.Size(229, 20);
             this.txtVirtualDirectory.TabIndex = 1;
@@ -214,7 +218,7 @@
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(23, 28);
+            this.label4.Location = new System.Drawing.Point(23, 48);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(112, 13);
             this.label4.TabIndex = 0;
@@ -228,9 +232,9 @@
             this.groupBox3.Controls.Add(this.chkEnableJava);
             this.groupBox3.Controls.Add(this.numTomcatPort);
             this.groupBox3.Controls.Add(this.label5);
-            this.groupBox3.Location = new System.Drawing.Point(4, 303);
+            this.groupBox3.Location = new System.Drawing.Point(4, 318);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(440, 66);
+            this.groupBox3.Size = new System.Drawing.Size(440, 62);
             this.groupBox3.TabIndex = 2;
             this.groupBox3.TabStop = false;
             // 
@@ -273,9 +277,9 @@
                         | System.Windows.Forms.AnchorStyles.Right)));
             this.groupBox4.Controls.Add(this.rdJava);
             this.groupBox4.Controls.Add(this.rdPhp);
-            this.groupBox4.Location = new System.Drawing.Point(4, 247);
+            this.groupBox4.Location = new System.Drawing.Point(4, 265);
             this.groupBox4.Name = "groupBox4";
-            this.groupBox4.Size = new System.Drawing.Size(440, 50);
+            this.groupBox4.Size = new System.Drawing.Size(440, 47);
             this.groupBox4.TabIndex = 3;
             this.groupBox4.TabStop = false;
             this.groupBox4.Text = "Preferred Default Viewer";
@@ -304,6 +308,25 @@
             this.rdPhp.UseVisualStyleBackColor = true;
             this.rdPhp.CheckedChanged += new System.EventHandler(this.defaultViewerCheckedChanged);
             // 
+            // txtPhysicalDirectory
+            // 
+            this.txtPhysicalDirectory.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtPhysicalDirectory.Location = new System.Drawing.Point(154, 19);
+            this.txtPhysicalDirectory.Name = "txtPhysicalDirectory";
+            this.txtPhysicalDirectory.Size = new System.Drawing.Size(229, 20);
+            this.txtPhysicalDirectory.TabIndex = 13;
+            this.txtPhysicalDirectory.TextChanged += new System.EventHandler(this.txtPhysicalDirectory_TextChanged);
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Location = new System.Drawing.Point(23, 22);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(122, 13);
+            this.label8.TabIndex = 12;
+            this.label8.Text = "Physical Directory Name";
+            // 
             // ApacheConfigCtrl
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -313,7 +336,7 @@
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.groupBox1);
             this.Name = "ApacheConfigCtrl";
-            this.Size = new System.Drawing.Size(447, 372);
+            this.Size = new System.Drawing.Size(447, 383);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numSitePort)).EndInit();
@@ -354,5 +377,7 @@
         private System.Windows.Forms.GroupBox groupBox4;
         private System.Windows.Forms.RadioButton rdJava;
         private System.Windows.Forms.RadioButton rdPhp;
+        private System.Windows.Forms.TextBox txtPhysicalDirectory;
+        private System.Windows.Forms.Label label8;
     }
 }

Modified: trunk/Tools/MgInstantSetup/InstantSetup/ApacheConfigCtrl.cs
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup/ApacheConfigCtrl.cs	2013-09-06 08:13:34 UTC (rev 7841)
+++ trunk/Tools/MgInstantSetup/InstantSetup/ApacheConfigCtrl.cs	2013-09-06 09:11:46 UTC (rev 7842)
@@ -39,6 +39,7 @@
             numClientPort.Value = apacheConf.ServerClientPort;
             numSitePort.Value = apacheConf.ServerSitePort;
 
+            txtPhysicalDirectory.Text = apacheConf.ApacheDirName;
             txtVirtualDirectory.Text = apacheConf.VirtualDirectoryName;
             numHttpdPort.Value = apacheConf.ApachePortNumber;
             txtServiceName.Text = apacheConf.HttpdServiceName;
@@ -90,6 +91,11 @@
             ApacheConfig.VirtualDirectoryName = txtVirtualDirectory.Text;
         }
 
+        private void txtPhysicalDirectory_TextChanged(object sender, EventArgs e)
+        {
+            ApacheConfig.ApacheDirName = txtPhysicalDirectory.Text;
+        }
+
         private void txtServiceName_TextChanged(object sender, EventArgs e)
         {
             ApacheConfig.HttpdServiceName = txtServiceName.Text;

Modified: trunk/Tools/MgInstantSetup/InstantSetup/Form1.Designer.cs
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup/Form1.Designer.cs	2013-09-06 08:13:34 UTC (rev 7841)
+++ trunk/Tools/MgInstantSetup/InstantSetup/Form1.Designer.cs	2013-09-06 09:11:46 UTC (rev 7842)
@@ -56,15 +56,19 @@
             this.txtFdoDir = new System.Windows.Forms.TextBox();
             this.label4 = new System.Windows.Forms.Label();
             this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
+            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.tabControl1.SuspendLayout();
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
+            this.splitContainer1.Panel1.SuspendLayout();
+            this.splitContainer1.Panel2.SuspendLayout();
+            this.splitContainer1.SuspendLayout();
             this.SuspendLayout();
             // 
             // btnConfigure
             // 
             this.btnConfigure.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnConfigure.Location = new System.Drawing.Point(672, 563);
+            this.btnConfigure.Location = new System.Drawing.Point(830, 563);
             this.btnConfigure.Name = "btnConfigure";
             this.btnConfigure.Size = new System.Drawing.Size(75, 23);
             this.btnConfigure.TabIndex = 0;
@@ -80,7 +84,7 @@
             this.tabControl1.Location = new System.Drawing.Point(3, 16);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(474, 423);
+            this.tabControl1.Size = new System.Drawing.Size(580, 428);
             this.tabControl1.TabIndex = 1;
             // 
             // TAB_APACHE
@@ -88,7 +92,7 @@
             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(466, 397);
+            this.TAB_APACHE.Size = new System.Drawing.Size(572, 402);
             this.TAB_APACHE.TabIndex = 1;
             this.TAB_APACHE.Text = "Apache";
             this.TAB_APACHE.UseVisualStyleBackColor = true;
@@ -118,7 +122,7 @@
                         | System.Windows.Forms.AnchorStyles.Right)));
             this.txtServiceName.Location = new System.Drawing.Point(156, 61);
             this.txtServiceName.Name = "txtServiceName";
-            this.txtServiceName.Size = new System.Drawing.Size(587, 20);
+            this.txtServiceName.Size = new System.Drawing.Size(745, 20);
             this.txtServiceName.TabIndex = 3;
             this.txtServiceName.TextChanged += new System.EventHandler(this.txtServiceName_TextChanged);
             // 
@@ -137,14 +141,14 @@
                         | System.Windows.Forms.AnchorStyles.Right)));
             this.txtSourceDirectory.Location = new System.Drawing.Point(156, 9);
             this.txtSourceDirectory.Name = "txtSourceDirectory";
-            this.txtSourceDirectory.Size = new System.Drawing.Size(552, 20);
+            this.txtSourceDirectory.Size = new System.Drawing.Size(710, 20);
             this.txtSourceDirectory.TabIndex = 5;
             this.txtSourceDirectory.TextChanged += new System.EventHandler(this.txtSourceDirectory_TextChanged);
             // 
             // btnSourceDir
             // 
             this.btnSourceDir.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnSourceDir.Location = new System.Drawing.Point(714, 7);
+            this.btnSourceDir.Location = new System.Drawing.Point(872, 7);
             this.btnSourceDir.Name = "btnSourceDir";
             this.btnSourceDir.Size = new System.Drawing.Size(29, 23);
             this.btnSourceDir.TabIndex = 6;
@@ -168,7 +172,7 @@
             // button1
             // 
             this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.button1.Location = new System.Drawing.Point(714, 33);
+            this.button1.Location = new System.Drawing.Point(872, 33);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(29, 23);
             this.button1.TabIndex = 10;
@@ -182,7 +186,7 @@
                         | System.Windows.Forms.AnchorStyles.Right)));
             this.txtBatchOutput.Location = new System.Drawing.Point(156, 35);
             this.txtBatchOutput.Name = "txtBatchOutput";
-            this.txtBatchOutput.Size = new System.Drawing.Size(552, 20);
+            this.txtBatchOutput.Size = new System.Drawing.Size(710, 20);
             this.txtBatchOutput.TabIndex = 9;
             this.txtBatchOutput.TextChanged += new System.EventHandler(this.txtBatchOutput_TextChanged);
             // 
@@ -220,13 +224,11 @@
             // 
             // groupBox1
             // 
-            this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                        | System.Windows.Forms.AnchorStyles.Left)
-                        | System.Windows.Forms.AnchorStyles.Right)));
             this.groupBox1.Controls.Add(this.tabControl1);
-            this.groupBox1.Location = new System.Drawing.Point(267, 111);
+            this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.groupBox1.Location = new System.Drawing.Point(0, 0);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(480, 442);
+            this.groupBox1.Size = new System.Drawing.Size(586, 447);
             this.groupBox1.TabIndex = 13;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "Web";
@@ -242,31 +244,37 @@
             this.groupBox2.Controls.Add(this.label5);
             this.groupBox2.Controls.Add(this.txtFdoDir);
             this.groupBox2.Controls.Add(this.label4);
-            this.groupBox2.Location = new System.Drawing.Point(12, 111);
+            this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.groupBox2.Location = new System.Drawing.Point(0, 0);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(249, 439);
+            this.groupBox2.Size = new System.Drawing.Size(294, 447);
             this.groupBox2.TabIndex = 14;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "Server";
             // 
             // label7
             // 
-            this.label7.Location = new System.Drawing.Point(19, 370);
+            this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.label7.Location = new System.Drawing.Point(19, 386);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(206, 53);
+            this.label7.Size = new System.Drawing.Size(257, 45);
             this.label7.TabIndex = 8;
             this.label7.Text = "NOTE: Some providers (eg. MySQL) require 3rd party external dependencies in order" +
                 " to sucessfully register";
             // 
             // chkProviders
             // 
+            this.chkProviders.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
             this.chkProviders.CheckOnClick = true;
             this.chkProviders.FormattingEnabled = true;
             this.chkProviders.HorizontalScrollbar = true;
             this.chkProviders.Location = new System.Drawing.Point(20, 137);
             this.chkProviders.Name = "chkProviders";
             this.chkProviders.ScrollAlwaysVisible = true;
-            this.chkProviders.Size = new System.Drawing.Size(205, 229);
+            this.chkProviders.Size = new System.Drawing.Size(256, 244);
             this.chkProviders.TabIndex = 7;
             // 
             // label6
@@ -280,7 +288,8 @@
             // 
             // btnFdoRegUtilPath
             // 
-            this.btnFdoRegUtilPath.Location = new System.Drawing.Point(216, 86);
+            this.btnFdoRegUtilPath.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnFdoRegUtilPath.Location = new System.Drawing.Point(249, 86);
             this.btnFdoRegUtilPath.Name = "btnFdoRegUtilPath";
             this.btnFdoRegUtilPath.Size = new System.Drawing.Size(27, 23);
             this.btnFdoRegUtilPath.TabIndex = 5;
@@ -290,7 +299,8 @@
             // 
             // btnFdoPath
             // 
-            this.btnFdoPath.Location = new System.Drawing.Point(216, 41);
+            this.btnFdoPath.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnFdoPath.Location = new System.Drawing.Point(249, 41);
             this.btnFdoPath.Name = "btnFdoPath";
             this.btnFdoPath.Size = new System.Drawing.Size(27, 23);
             this.btnFdoPath.TabIndex = 4;
@@ -300,9 +310,11 @@
             // 
             // txtFdoRegUtilPath
             // 
+            this.txtFdoRegUtilPath.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
             this.txtFdoRegUtilPath.Location = new System.Drawing.Point(20, 88);
             this.txtFdoRegUtilPath.Name = "txtFdoRegUtilPath";
-            this.txtFdoRegUtilPath.Size = new System.Drawing.Size(190, 20);
+            this.txtFdoRegUtilPath.Size = new System.Drawing.Size(223, 20);
             this.txtFdoRegUtilPath.TabIndex = 3;
             // 
             // label5
@@ -316,9 +328,11 @@
             // 
             // txtFdoDir
             // 
+            this.txtFdoDir.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
             this.txtFdoDir.Location = new System.Drawing.Point(20, 43);
             this.txtFdoDir.Name = "txtFdoDir";
-            this.txtFdoDir.Size = new System.Drawing.Size(190, 20);
+            this.txtFdoDir.Size = new System.Drawing.Size(223, 20);
             this.txtFdoDir.TabIndex = 1;
             this.txtFdoDir.TextChanged += new System.EventHandler(this.txtFdoDir_TextChanged);
             // 
@@ -331,13 +345,32 @@
             this.label4.TabIndex = 0;
             this.label4.Text = "FDO Path";
             // 
+            // splitContainer1
+            // 
+            this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+            this.splitContainer1.Location = new System.Drawing.Point(17, 110);
+            this.splitContainer1.Name = "splitContainer1";
+            // 
+            // splitContainer1.Panel1
+            // 
+            this.splitContainer1.Panel1.Controls.Add(this.groupBox2);
+            // 
+            // splitContainer1.Panel2
+            // 
+            this.splitContainer1.Panel2.Controls.Add(this.groupBox1);
+            this.splitContainer1.Size = new System.Drawing.Size(884, 447);
+            this.splitContainer1.SplitterDistance = 294;
+            this.splitContainer1.TabIndex = 15;
+            // 
             // Form1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(759, 598);
-            this.Controls.Add(this.groupBox2);
-            this.Controls.Add(this.groupBox1);
+            this.ClientSize = new System.Drawing.Size(917, 598);
+            this.Controls.Add(this.splitContainer1);
             this.Controls.Add(this.chk64Bit);
             this.Controls.Add(this.chkWriteMentorDictPath);
             this.Controls.Add(this.button1);
@@ -356,6 +389,9 @@
             this.groupBox1.ResumeLayout(false);
             this.groupBox2.ResumeLayout(false);
             this.groupBox2.PerformLayout();
+            this.splitContainer1.Panel1.ResumeLayout(false);
+            this.splitContainer1.Panel2.ResumeLayout(false);
+            this.splitContainer1.ResumeLayout(false);
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -391,6 +427,7 @@
         private System.Windows.Forms.TextBox txtFdoRegUtilPath;
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.OpenFileDialog openFileDialog;
+        private System.Windows.Forms.SplitContainer splitContainer1;
     }
 }
 

Modified: trunk/Tools/MgInstantSetup/InstantSetup/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup/Properties/AssemblyInfo.cs	2013-09-06 08:13:34 UTC (rev 7841)
+++ trunk/Tools/MgInstantSetup/InstantSetup/Properties/AssemblyInfo.cs	2013-09-06 09:11:46 UTC (rev 7842)
@@ -32,5 +32,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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]

Modified: trunk/Tools/MgInstantSetup/InstantSetup.Core/ApacheSetupConfigurationProcess.cs
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup.Core/ApacheSetupConfigurationProcess.cs	2013-09-06 08:13:34 UTC (rev 7841)
+++ trunk/Tools/MgInstantSetup/InstantSetup.Core/ApacheSetupConfigurationProcess.cs	2013-09-06 09:11:46 UTC (rev 7842)
@@ -35,6 +35,7 @@
 
             this.VirtualDirectoryName = "mapguide";
             this.HttpdServiceName = "ApacheMapGuide";
+            this.ApacheDirName = "Apache2";
         }
 
         public bool EnableJava { get; set; }
@@ -49,11 +50,13 @@
 
         public string HttpdServiceName { get; set; }
 
+        public string ApacheDirName { get; set; }
+
         public virtual string WebTierApacheDir
         {
             get
             {
-                return Path.Combine(this.WebTierRootDir, "Apache2");
+                return Path.Combine(this.WebTierRootDir, this.ApacheDirName);
             }
         }
 

Modified: trunk/Tools/MgInstantSetup/InstantSetup.Core/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup.Core/Properties/AssemblyInfo.cs	2013-09-06 08:13:34 UTC (rev 7841)
+++ trunk/Tools/MgInstantSetup/InstantSetup.Core/Properties/AssemblyInfo.cs	2013-09-06 09:11:46 UTC (rev 7842)
@@ -32,5 +32,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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]



More information about the mapguide-commits mailing list