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

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Mon Sep 12 22:40:34 EDT 2011


Author: jng
Date: 2011-09-12 19:40:33 -0700 (Mon, 12 Sep 2011)
New Revision: 6131

Added:
   trunk/Tools/MgInstantSetup/InstantSetup.Core/Resources/APACHE_WEB_INSTALL.txt
   trunk/Tools/MgInstantSetup/InstantSetup.Core/Resources/APACHE_WEB_UNINSTALL.txt
   trunk/Tools/MgInstantSetup/InstantSetup.Core/Resources/SERVER_INSTALL.txt
   trunk/Tools/MgInstantSetup/InstantSetup.Core/Resources/SERVER_UNINSTALL.txt
Modified:
   trunk/Tools/MgInstantSetup/InstantSetup.Core/AbstractSetupConfigurationProcess.cs
   trunk/Tools/MgInstantSetup/InstantSetup.Core/ApacheSetupConfigurationProcess.cs
   trunk/Tools/MgInstantSetup/InstantSetup.Core/InstantSetup.Core.csproj
   trunk/Tools/MgInstantSetup/InstantSetup.Core/Properties/Resources.Designer.cs
   trunk/Tools/MgInstantSetup/InstantSetup.Core/Properties/Resources.resx
Log:
#1806, #1807: Update MgInstantSetup utility

Modified: trunk/Tools/MgInstantSetup/InstantSetup.Core/AbstractSetupConfigurationProcess.cs
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup.Core/AbstractSetupConfigurationProcess.cs	2011-09-08 10:51:28 UTC (rev 6130)
+++ trunk/Tools/MgInstantSetup/InstantSetup.Core/AbstractSetupConfigurationProcess.cs	2011-09-13 02:40:33 UTC (rev 6131)
@@ -211,6 +211,14 @@
                 string serverText = string.Format(Properties.Resources.SERVER, this.CsMapDictionaryDir, this.ServerBinDir);
                 File.WriteAllText(Path.Combine(this.BatchFileOutputDirectory, "mgserver.bat"), serverText);
 
+                //Write service install batch file
+                serverText = string.Format(Properties.Resources.SERVER_INSTALL, this.CsMapDictionaryDir, this.ServerBinDir, this.MapGuideServiceName);
+                File.WriteAllText(Path.Combine(this.BatchFileOutputDirectory, "mgserverinstall.bat"), serverText);
+
+                //Write service uninstall batch file
+                serverText = string.Format(Properties.Resources.SERVER_UNINSTALL, this.CsMapDictionaryDir, this.ServerBinDir, this.MapGuideServiceName);
+                File.WriteAllText(Path.Combine(this.BatchFileOutputDirectory, "mgserveruninstall.bat"), serverText);
+
                 WriteAdditionalBatchFiles();
             }
         }
@@ -262,12 +270,12 @@
             _serverConfig.IniWriteValue("ResourceServiceProperties","PackagesPath",Path.Combine(ServerRootDir, "Packages"));
 
             _serverConfig.IniWriteValue("ResourceServiceProperties","LibraryRepositoryPath",Path.Combine(ServerRootDir, "Repositories\\Library"));
-            _serverConfig.IniWriteValue("ResourceServiceProperties","LibraryResourcesDataFilePath",Path.Combine(ServerRootDir, "Repositories\\DataFiles"));
+            _serverConfig.IniWriteValue("ResourceServiceProperties","LibraryResourceDataFilePath", Path.Combine(ServerRootDir, "Repositories\\DataFiles"));
             _serverConfig.IniWriteValue("ResourceServiceProperties","SessionRepositoryPath",Path.Combine(ServerRootDir, "Repositories\\Session"));
-            _serverConfig.IniWriteValue("ResourceServiceProperties","SessionResourceDataPath",Path.Combine(ServerRootDir, "Repositories\\Session\\DataFiles"));
+            _serverConfig.IniWriteValue("ResourceServiceProperties","SessionResourceDataFilePath", Path.Combine(ServerRootDir, "Repositories\\Session\\DataFiles"));
             _serverConfig.IniWriteValue("ResourceServiceProperties","SiteRepositoryPath",Path.Combine(ServerRootDir, "Repositories\\Site"));
-            _serverConfig.IniWriteValue("ResourceServiceProperties","TileCachePath",Path.Combine(ServerRootDir, "Repositories\\TileCache"));
-            _serverConfig.IniWriteValue("ResourceServiceProperties", "ResourceSchemaFilePath", Path.Combine(ServerRootDir, "Schema"));
+            _serverConfig.IniWriteValue("TileServiceProperties", "TileCachePath", Path.Combine(ServerRootDir, "Repositories\\TileCache"));
+            _serverConfig.IniWriteValue("ResourceServiceProperties","ResourceSchemaFilePath", Path.Combine(ServerRootDir, "Schema"));
         }
 
         protected abstract void DoBackupConfigFiles();

Modified: trunk/Tools/MgInstantSetup/InstantSetup.Core/ApacheSetupConfigurationProcess.cs
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup.Core/ApacheSetupConfigurationProcess.cs	2011-09-08 10:51:28 UTC (rev 6130)
+++ trunk/Tools/MgInstantSetup/InstantSetup.Core/ApacheSetupConfigurationProcess.cs	2011-09-13 02:40:33 UTC (rev 6131)
@@ -142,6 +142,14 @@
             //Write httpd batch file
             string httpdText = string.Format(Properties.Resources.APACHE_WEB, this.CsMapDictionaryDir, Path.Combine(this.WebTierApacheDir, "bin"));
             File.WriteAllText(Path.Combine(this.BatchFileOutputDirectory, "mgwebtier.bat"), httpdText);
+
+            //Write service installer batch file
+            httpdText = string.Format(Properties.Resources.APACHE_WEB_INSTALL, Path.Combine(this.WebTierApacheDir, "bin"), this.HttpdServiceName);
+            File.WriteAllText(Path.Combine(this.BatchFileOutputDirectory, "mgapacheinstall.bat"), httpdText);
+
+            //Write service uninstaller batch file
+            httpdText = string.Format(Properties.Resources.APACHE_WEB_UNINSTALL, Path.Combine(this.WebTierApacheDir, "bin"), this.HttpdServiceName);
+            File.WriteAllText(Path.Combine(this.BatchFileOutputDirectory, "mgapacheuninstall.bat"), httpdText);
         }
     }
 }

Modified: trunk/Tools/MgInstantSetup/InstantSetup.Core/InstantSetup.Core.csproj
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup.Core/InstantSetup.Core.csproj	2011-09-08 10:51:28 UTC (rev 6130)
+++ trunk/Tools/MgInstantSetup/InstantSetup.Core/InstantSetup.Core.csproj	2011-09-13 02:40:33 UTC (rev 6131)
@@ -62,6 +62,18 @@
     <None Include="app.config" />
     <None Include="Resources\APACHE_WEB.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\APACHE_WEB_INSTALL.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\SERVER_INSTALL.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\SERVER_UNINSTALL.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\APACHE_WEB_UNINSTALL.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/MgInstantSetup/InstantSetup.Core/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup.Core/Properties/Resources.Designer.cs	2011-09-08 10:51:28 UTC (rev 6130)
+++ trunk/Tools/MgInstantSetup/InstantSetup.Core/Properties/Resources.Designer.cs	2011-09-13 02:40:33 UTC (rev 6131)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4952
+//     Runtime Version:2.0.50727.4961
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -61,7 +61,10 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to .
+        ///   Looks up a localized string similar to SET MENTOR_DICTIONARY_PATH={0}
+        ///pushd {1}
+        ///httpd.exe
+        ///popd.
         /// </summary>
         internal static string APACHE_WEB {
             get {
@@ -70,12 +73,61 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to .
+        ///   Looks up a localized string similar to pushd {0}
+        ///httpd.exe -k install &quot;{1}&quot;
+        ///popd.
         /// </summary>
+        internal static string APACHE_WEB_INSTALL {
+            get {
+                return ResourceManager.GetString("APACHE_WEB_INSTALL", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to pushd {0}
+        ///httpd.exe -k uninstall &quot;{1}&quot;
+        ///popd.
+        /// </summary>
+        internal static string APACHE_WEB_UNINSTALL {
+            get {
+                return ResourceManager.GetString("APACHE_WEB_UNINSTALL", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to SET MENTOR_DICTIONARY_PATH={0}
+        ///pushd {1}
+        ///mgserver.exe run
+        ///popd.
+        /// </summary>
         internal static string SERVER {
             get {
                 return ResourceManager.GetString("SERVER", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to SET MENTOR_DICTIONARY_PATH={0}
+        ///pushd {1}
+        ///mgserver install &quot;{2}&quot;
+        ///popd.
+        /// </summary>
+        internal static string SERVER_INSTALL {
+            get {
+                return ResourceManager.GetString("SERVER_INSTALL", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to SET MENTOR_DICTIONARY_PATH={0}
+        ///pushd {1}
+        ///mgserver uninstall &quot;{2}&quot;
+        ///popd.
+        /// </summary>
+        internal static string SERVER_UNINSTALL {
+            get {
+                return ResourceManager.GetString("SERVER_UNINSTALL", resourceCulture);
+            }
+        }
     }
 }

Modified: trunk/Tools/MgInstantSetup/InstantSetup.Core/Properties/Resources.resx
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup.Core/Properties/Resources.resx	2011-09-08 10:51:28 UTC (rev 6130)
+++ trunk/Tools/MgInstantSetup/InstantSetup.Core/Properties/Resources.resx	2011-09-13 02:40:33 UTC (rev 6131)
@@ -121,7 +121,19 @@
   <data name="APACHE_WEB" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\APACHE_WEB.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
+  <data name="APACHE_WEB_INSTALL" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\APACHE_WEB_INSTALL.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="APACHE_WEB_UNINSTALL" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\APACHE_WEB_UNINSTALL.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
   <data name="SERVER" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\SERVER.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
+  <data name="SERVER_INSTALL" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SERVER_INSTALL.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="SERVER_UNINSTALL" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SERVER_UNINSTALL.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/MgInstantSetup/InstantSetup.Core/Resources/APACHE_WEB_INSTALL.txt
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup.Core/Resources/APACHE_WEB_INSTALL.txt	                        (rev 0)
+++ trunk/Tools/MgInstantSetup/InstantSetup.Core/Resources/APACHE_WEB_INSTALL.txt	2011-09-13 02:40:33 UTC (rev 6131)
@@ -0,0 +1,3 @@
+pushd {0}
+httpd.exe -k install -n "{1}"
+popd
\ No newline at end of file

Added: trunk/Tools/MgInstantSetup/InstantSetup.Core/Resources/APACHE_WEB_UNINSTALL.txt
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup.Core/Resources/APACHE_WEB_UNINSTALL.txt	                        (rev 0)
+++ trunk/Tools/MgInstantSetup/InstantSetup.Core/Resources/APACHE_WEB_UNINSTALL.txt	2011-09-13 02:40:33 UTC (rev 6131)
@@ -0,0 +1,3 @@
+pushd {0}
+httpd.exe -k uninstall -n "{1}"
+popd
\ No newline at end of file

Added: trunk/Tools/MgInstantSetup/InstantSetup.Core/Resources/SERVER_INSTALL.txt
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup.Core/Resources/SERVER_INSTALL.txt	                        (rev 0)
+++ trunk/Tools/MgInstantSetup/InstantSetup.Core/Resources/SERVER_INSTALL.txt	2011-09-13 02:40:33 UTC (rev 6131)
@@ -0,0 +1,4 @@
+SET MENTOR_DICTIONARY_PATH={0}
+pushd {1}
+mgserver install "{2}"
+popd
\ No newline at end of file

Added: trunk/Tools/MgInstantSetup/InstantSetup.Core/Resources/SERVER_UNINSTALL.txt
===================================================================
--- trunk/Tools/MgInstantSetup/InstantSetup.Core/Resources/SERVER_UNINSTALL.txt	                        (rev 0)
+++ trunk/Tools/MgInstantSetup/InstantSetup.Core/Resources/SERVER_UNINSTALL.txt	2011-09-13 02:40:33 UTC (rev 6131)
@@ -0,0 +1,4 @@
+SET MENTOR_DICTIONARY_PATH={0}
+pushd {1}
+mgserver uninstall "{2}"
+popd
\ No newline at end of file



More information about the mapguide-commits mailing list