From 21f17d4f9b8f12bae7a6cbe39cb483742eb8df90 Mon Sep 17 00:00:00 2001 From: "Brian.Dyke" Date: Fri, 7 Mar 2014 08:49:00 -0500 Subject: [PATCH] 14.1.1-22 baseline Former-commit-id: ae37ad5bac445251d1456f37588819fccfede061 --- .../static/win32.x86/alertviz/alertviz.bat | 69 +++++++++ cave/build/static/win32.x86/cave/cave.bat | 72 +++++++++ msi/VizLauncher/VizLauncher.sln | 20 --- msi/VizLauncher/VizLauncher.suo | Bin 42496 -> 0 bytes msi/VizLauncher/VizLauncher/Form1.Designer.cs | 79 ---------- msi/VizLauncher/VizLauncher/Form1.cs | 20 --- msi/VizLauncher/VizLauncher/Form1.resx | 120 --------------- msi/VizLauncher/VizLauncher/Program.cs | 31 ---- .../VizLauncher/Properties/AssemblyInfo.cs | 36 ----- .../Properties/Resources.Designer.cs | 71 --------- .../VizLauncher/Properties/Resources.resx | 117 --------------- .../Properties/Settings.Designer.cs | 30 ---- .../VizLauncher/Properties/Settings.settings | 7 - .../VizLauncher/VizLauncher.csproj | 94 ------------ .../VizLauncher/VizLauncher.csproj.user | 3 - .../com/raytheon/viz/launcher/VizLauncher.cs | 68 --------- .../environment/EnvironmentProperties.cs | 34 ----- .../launcher/environment/VizEnvironment.cs | 137 ------------------ .../process/AbstractProcessLauncher.cs | 137 ------------------ .../viz/launcher/process/IProcessLauncher.cs | 16 -- .../process/impl/AlertvizProcessLauncher.cs | 62 -------- .../process/impl/CaveProcessLauncher.cs | 45 ------ .../A2Staging/VisualStudio/VizLauncher.exe | Bin 16384 -> 0 bytes 23 files changed, 141 insertions(+), 1127 deletions(-) create mode 100644 cave/build/static/win32.x86/alertviz/alertviz.bat create mode 100644 cave/build/static/win32.x86/cave/cave.bat delete mode 100644 msi/VizLauncher/VizLauncher.sln delete mode 100644 msi/VizLauncher/VizLauncher.suo delete mode 100644 msi/VizLauncher/VizLauncher/Form1.Designer.cs delete mode 100644 msi/VizLauncher/VizLauncher/Form1.cs delete mode 100644 msi/VizLauncher/VizLauncher/Form1.resx delete mode 100644 msi/VizLauncher/VizLauncher/Program.cs delete mode 100644 msi/VizLauncher/VizLauncher/Properties/AssemblyInfo.cs delete mode 100644 msi/VizLauncher/VizLauncher/Properties/Resources.Designer.cs delete mode 100644 msi/VizLauncher/VizLauncher/Properties/Resources.resx delete mode 100644 msi/VizLauncher/VizLauncher/Properties/Settings.Designer.cs delete mode 100644 msi/VizLauncher/VizLauncher/Properties/Settings.settings delete mode 100644 msi/VizLauncher/VizLauncher/VizLauncher.csproj delete mode 100644 msi/VizLauncher/VizLauncher/VizLauncher.csproj.user delete mode 100644 msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/VizLauncher.cs delete mode 100644 msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/environment/EnvironmentProperties.cs delete mode 100644 msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/environment/VizEnvironment.cs delete mode 100644 msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs delete mode 100644 msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/IProcessLauncher.cs delete mode 100644 msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/impl/AlertvizProcessLauncher.cs delete mode 100644 msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/impl/CaveProcessLauncher.cs delete mode 100644 msi/build/A2Staging/VisualStudio/VizLauncher.exe diff --git a/cave/build/static/win32.x86/alertviz/alertviz.bat b/cave/build/static/win32.x86/alertviz/alertviz.bat new file mode 100644 index 0000000000..5e4b50ee83 --- /dev/null +++ b/cave/build/static/win32.x86/alertviz/alertviz.bat @@ -0,0 +1,69 @@ +@echo OFF + +REM Determine if we are running on a 32-bit or 64-bit OS. +IF NOT EXIST C:\Windows\SysWOW64\reg.exe ( + SET REG_EXE=C:\Windows\System32\reg.exe +) ELSE ( + SET REG_EXE=C:\Windows\SysWOW64\reg.exe +) + +REM Determine where we are located. +SET CONTAINING_DIRECTORY=%~dp0 + +REM Prepare the environment. + +REM Registry Query Variables. +SET A2_JAVA_REG="HKLM\Software\Raytheon\Runtime Environment\AWIPS II Java" +SET A2_PYTHON_REG="HKLM\Software\Raytheon\Runtime Environment\AWIPS II Python" +REM Determine where AWIPS II Java (the jre) is located. +%REG_EXE% QUERY %A2_JAVA_REG% /v JavaJreDirectory > NUL 2>&1 +IF ERRORLEVEL 1 (echo ENVIRONMENT ERROR - Unable to find AWIPS II Java. && PAUSE && EXIT) +FOR /F "tokens=2* delims= " %%A IN ( +'%REG_EXE% QUERY %A2_JAVA_REG% /v JavaJreDirectory') DO ( +SET JavaJreDirectory=%%B) +REM Determine where AWIPS II Python is located. +%REG_EXE% QUERY %A2_PYTHON_REG% /v PythonInstallDirectory > NUL 2>&1 +IF ERRORLEVEL 1 (echo ENVIRONMENT ERROR - Unable to find AWIPS II Python. && PAUSE && EXIT) +FOR /F "tokens=2* delims= " %%A IN ( +'%REG_EXE% QUERY %A2_PYTHON_REG% /v PythonInstallDirectory') DO ( +SET PythonInstallDirectory=%%B) + +REM Add Java and Python to the path. +SET Path=%PythonInstallDirectory%;%PythonInstallDirectory%\DLLs;%Path% +SET Path=%JavaJreDirectory%\bin;%Path% +REM Define 'PythonPath'. +SET PythonPath=%PythonInstallDirectory%\Lib\lib-tk;%PythonPath% +SET PythonPath=%PythonInstallDirectory%\DLLs;%PythonPath% +SET PythonPath=%PythonInstallDirectory%\Lib;%PythonPath% +SET PythonPath=%PythonInstallDirectory%;%PythonPath% + +REM Eliminate variables that will no longer be used. +SET PythonInstallDirectory= +SET JavaJreDirectory= +SET REG_EXE= +SET A2_JAVA_REG= +SET A2_PYTHON_REG= + +REM Determine where we will be logging to. +SET HOME_DIRECTORY=%HOMEDRIVE%%HOMEPATH% +SET CAVEDATA_LOG_DIRECTORY=%HOMEDRIVE%%HOMEPATH%\caveData\logs +SET CONSOLE_LOG_DIRECTORY=%CAVEDATA_LOG_DIRECTORY%\consoleLogs\%COMPUTERNAME% +IF NOT EXIST "%CONSOLE_LOG_DIRECTORY%" (MKDIR "%CONSOLE_LOG_DIRECTORY%") + +echo Starting ALERTVIZ; leave this CMD window open to enable AlertViz 'restart'. +REM Start AlertViz (and implement the alertviz restart capability). +:AlertVizLoopStart +SET RND=%random% +SET RND_DATETIME_FILE=%TMP%\awips2dt_%RND%.tmp +REM Python is used to retrieve the current date and time because the order +REM of the Windows date/time fields is not necessarily guaranteed and the +REM Windows date/time fields can only be extracted using substring operations +REM instead of -formatter- strings like Linux allows. +python -c "from datetime import datetime; print datetime.now().strftime('%%Y%%m%%d_%%H%%M%%S');" > %RND_DATETIME_FILE% +SET /p LOG_DATETIME= < %RND_DATETIME_FILE% +DEL %RND_DATETIME_FILE% +"%CONTAINING_DIRECTORY%alertviz.exe" %* > "%CONSOLE_LOG_DIRECTORY%\alertviz_%LOG_DATETIME%.log" 2>&1 +IF %ERRORLEVEL% == 0 (EXIT) +echo Restarting AlertViz. +GOTO AlertVizLoopStart + diff --git a/cave/build/static/win32.x86/cave/cave.bat b/cave/build/static/win32.x86/cave/cave.bat new file mode 100644 index 0000000000..0b347287dd --- /dev/null +++ b/cave/build/static/win32.x86/cave/cave.bat @@ -0,0 +1,72 @@ +@echo OFF + +REM Determine if we are running on a 32-bit or 64-bit OS. +IF NOT EXIST C:\Windows\SysWOW64\reg.exe ( + SET REG_EXE=C:\Windows\System32\reg.exe +) ELSE ( + SET REG_EXE=C:\Windows\SysWOW64\reg.exe +) + +REM Determine where we are located. +SET CONTAINING_DIRECTORY=%~dp0 + +REM Prepare the environment. + +REM Registry Query Variables. +SET A2_JAVA_REG="HKLM\Software\Raytheon\Runtime Environment\AWIPS II Java" +SET A2_PYTHON_REG="HKLM\Software\Raytheon\Runtime Environment\AWIPS II Python" +REM Determine where AWIPS II Java (the jre) is located. +%REG_EXE% QUERY %A2_JAVA_REG% /v JavaJreDirectory > NUL 2>&1 +IF ERRORLEVEL 1 (echo ENVIRONMENT ERROR - Unable to find AWIPS II Java. && PAUSE && EXIT) +FOR /F "tokens=2* delims= " %%A IN ( +'%REG_EXE% QUERY %A2_JAVA_REG% /v JavaJreDirectory') DO ( +SET JavaJreDirectory=%%B) +REM Determine where AWIPS II Python is located. +%REG_EXE% QUERY %A2_PYTHON_REG% /v PythonInstallDirectory > NUL 2>&1 +IF ERRORLEVEL 1 (echo ENVIRONMENT ERROR - Unable to find AWIPS II Python. && PAUSE && EXIT) +FOR /F "tokens=2* delims= " %%A IN ( +'%REG_EXE% QUERY %A2_PYTHON_REG% /v PythonInstallDirectory') DO ( +SET PythonInstallDirectory=%%B) + +REM Add Java and Python to the path. +SET Path=%PythonInstallDirectory%;%PythonInstallDirectory%\DLLs;%Path% +SET Path=%JavaJreDirectory%\bin;%Path% +REM Add the CAVE lib directory to the path. +SET Path=%CONTAINING_DIRECTORY%lib;%Path% +REM Define 'PythonPath'. +SET PythonPath=%CONTAINING_DIRECTORY%lib;%PythonPath% +SET PythonPath=%PythonInstallDirectory%\Lib\lib-tk;%PythonPath% +SET PythonPath=%PythonInstallDirectory%\DLLs;%PythonPath% +SET PythonPath=%PythonInstallDirectory%\Lib;%PythonPath% +SET PythonPath=%PythonInstallDirectory%;%PythonPath% + +REM Eliminate variables that will no longer be used. +SET PythonInstallDirectory= +SET JavaJreDirectory= +SET REG_EXE= +SET A2_JAVA_REG= +SET A2_PYTHON_REG= + +REM Determine where we will be logging to. +SET HOME_DIRECTORY=%HOMEDRIVE%%HOMEPATH% +SET CAVEDATA_LOG_DIRECTORY=%HOMEDRIVE%%HOMEPATH%\caveData\logs +SET CONSOLE_LOG_DIRECTORY=%CAVEDATA_LOG_DIRECTORY%\consoleLogs\%COMPUTERNAME% +IF NOT EXIST "%CONSOLE_LOG_DIRECTORY%" (MKDIR "%CONSOLE_LOG_DIRECTORY%") + +SET RND=%random% +SET RND_DATETIME_FILE=%TMP%\awips2dt_%RND%.tmp +REM Python is used to retrieve the current date and time because the order +REM of the Windows date/time fields is not necessarily guaranteed and the +REM Windows date/time fields can only be extracted using substring operations +REM instead of -formatter- strings like Linux allows. +python -c "from datetime import datetime; print datetime.now().strftime('%%Y%%m%%d_%%H%%M%%S');" > %RND_DATETIME_FILE% +SET /p LOG_DATETIME= < %RND_DATETIME_FILE% +DEL %RND_DATETIME_FILE% + +echo THIS CMD WINDOW CAN BE CLOSED AT ANY TIME! +cd %HOMEPATH% +REM Start CAVE. +"%CONTAINING_DIRECTORY%cave.exe" %* > "%CONSOLE_LOG_DIRECTORY%\cave_%LOG_DATETIME%.log" 2>&1 +IF ERRORLEVEL 1 (echo CAVE ERROR - check the logs for additional information. && PAUSE) + +EXIT diff --git a/msi/VizLauncher/VizLauncher.sln b/msi/VizLauncher/VizLauncher.sln deleted file mode 100644 index b9a96d5c02..0000000000 --- a/msi/VizLauncher/VizLauncher.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C# Express 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VizLauncher", "VizLauncher\VizLauncher.csproj", "{45B15612-0725-479C-8E1B-9B63F2FB45A3}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x86 = Debug|x86 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {45B15612-0725-479C-8E1B-9B63F2FB45A3}.Debug|x86.ActiveCfg = Debug|x86 - {45B15612-0725-479C-8E1B-9B63F2FB45A3}.Debug|x86.Build.0 = Debug|x86 - {45B15612-0725-479C-8E1B-9B63F2FB45A3}.Release|x86.ActiveCfg = Release|x86 - {45B15612-0725-479C-8E1B-9B63F2FB45A3}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/msi/VizLauncher/VizLauncher.suo b/msi/VizLauncher/VizLauncher.suo deleted file mode 100644 index 9b44de8eee19ecf4a53f374cd85079c898ee0610..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 42496 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 - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.label1 = new System.Windows.Forms.Label(); - this.lblFailureDetail = new System.Windows.Forms.Label(); - this.SuspendLayout(); - // - // label1 - // - this.label1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); - this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(12, 0); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(337, 50); - this.label1.TabIndex = 0; - this.label1.Text = "Failed to Start AWIPS II Viz!"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // lblFailureDetail - // - this.lblFailureDetail.BackColor = System.Drawing.Color.White; - this.lblFailureDetail.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblFailureDetail.Location = new System.Drawing.Point(14, 59); - this.lblFailureDetail.Name = "lblFailureDetail"; - this.lblFailureDetail.Size = new System.Drawing.Size(335, 119); - this.lblFailureDetail.TabIndex = 1; - // - // Form1 - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(361, 187); - this.Controls.Add(this.lblFailureDetail); - this.Controls.Add(this.label1); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "Form1"; - this.ShowInTaskbar = false; - this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "Viz Launcher"; - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label lblFailureDetail; - } -} - diff --git a/msi/VizLauncher/VizLauncher/Form1.cs b/msi/VizLauncher/VizLauncher/Form1.cs deleted file mode 100644 index 4c206c62fe..0000000000 --- a/msi/VizLauncher/VizLauncher/Form1.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace VizLauncher -{ - public partial class Form1 : Form - { - public Form1(String errorText) - { - InitializeComponent(); - this.lblFailureDetail.Text = errorText; - } - } -} \ No newline at end of file diff --git a/msi/VizLauncher/VizLauncher/Form1.resx b/msi/VizLauncher/VizLauncher/Form1.resx deleted file mode 100644 index 29dcb1b3a3..0000000000 --- a/msi/VizLauncher/VizLauncher/Form1.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/msi/VizLauncher/VizLauncher/Program.cs b/msi/VizLauncher/VizLauncher/Program.cs deleted file mode 100644 index dd5d415317..0000000000 --- a/msi/VizLauncher/VizLauncher/Program.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Windows.Forms; -using VizLauncher.com.raytheon.viz.launcher; - -namespace VizLauncher -{ - static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - static void Main() - { - VizLauncher.com.raytheon.viz.launcher.VizLauncher vizLauncher = - new VizLauncher.com.raytheon.viz.launcher.VizLauncher(); - bool success = vizLauncher.run(Application.StartupPath); - if (success == false) - { - // Display the "Failure" dialog. - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new Form1(vizLauncher.getErrorDetail())); - } - - Application.Exit(); - } - } -} diff --git a/msi/VizLauncher/VizLauncher/Properties/AssemblyInfo.cs b/msi/VizLauncher/VizLauncher/Properties/AssemblyInfo.cs deleted file mode 100644 index 5d149225c7..0000000000 --- a/msi/VizLauncher/VizLauncher/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("VizLauncher")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("VizLauncher")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("7f929b46-b56e-47eb-b6e6-ff79e54f6572")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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")] diff --git a/msi/VizLauncher/VizLauncher/Properties/Resources.Designer.cs b/msi/VizLauncher/VizLauncher/Properties/Resources.Designer.cs deleted file mode 100644 index fb7e7281d0..0000000000 --- a/msi/VizLauncher/VizLauncher/Properties/Resources.Designer.cs +++ /dev/null @@ -1,71 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.17929 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace VizLauncher.Properties -{ - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("VizLauncher.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { - return resourceCulture; - } - set - { - resourceCulture = value; - } - } - } -} diff --git a/msi/VizLauncher/VizLauncher/Properties/Resources.resx b/msi/VizLauncher/VizLauncher/Properties/Resources.resx deleted file mode 100644 index ffecec851a..0000000000 --- a/msi/VizLauncher/VizLauncher/Properties/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/msi/VizLauncher/VizLauncher/Properties/Settings.Designer.cs b/msi/VizLauncher/VizLauncher/Properties/Settings.Designer.cs deleted file mode 100644 index b5a088c6b6..0000000000 --- a/msi/VizLauncher/VizLauncher/Properties/Settings.Designer.cs +++ /dev/null @@ -1,30 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.17929 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace VizLauncher.Properties -{ - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { - return defaultInstance; - } - } - } -} diff --git a/msi/VizLauncher/VizLauncher/Properties/Settings.settings b/msi/VizLauncher/VizLauncher/Properties/Settings.settings deleted file mode 100644 index abf36c5d3d..0000000000 --- a/msi/VizLauncher/VizLauncher/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/msi/VizLauncher/VizLauncher/VizLauncher.csproj b/msi/VizLauncher/VizLauncher/VizLauncher.csproj deleted file mode 100644 index ccd040c7b0..0000000000 --- a/msi/VizLauncher/VizLauncher/VizLauncher.csproj +++ /dev/null @@ -1,94 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {45B15612-0725-479C-8E1B-9B63F2FB45A3} - WinExe - Properties - VizLauncher - VizLauncher - v4.0 - Client - 512 - - - x86 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - x86 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - Form - - - Form1.cs - - - - - Form1.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - \ No newline at end of file diff --git a/msi/VizLauncher/VizLauncher/VizLauncher.csproj.user b/msi/VizLauncher/VizLauncher/VizLauncher.csproj.user deleted file mode 100644 index 695b5c78b9..0000000000 --- a/msi/VizLauncher/VizLauncher/VizLauncher.csproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/VizLauncher.cs b/msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/VizLauncher.cs deleted file mode 100644 index f00af7eaf9..0000000000 --- a/msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/VizLauncher.cs +++ /dev/null @@ -1,68 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using VizLauncher.com.raytheon.viz.launcher.environment; -using VizLauncher.com.raytheon.viz.launcher.process; -using VizLauncher.com.raytheon.viz.launcher.process.impl; - -namespace VizLauncher.com.raytheon.viz.launcher -{ - public class VizLauncher - { - private String errorDetail; - - public bool run(String location) - { - VizEnvironment vizEnvironment = new VizEnvironment(location); - if (vizEnvironment.isReady() == false) - { - this.errorDetail = vizEnvironment.getExceptionText(); - return false; - } - - /* Alternatively, we would be able to construct both process launchers using Spring and inject them. */ - - // Construct the AlertViz Process Launcher. - IProcessLauncher alertvizProcessLauncher = new AlertvizProcessLauncher(vizEnvironment); - if (alertvizProcessLauncher.isReady() == false) - { - this.errorDetail = alertvizProcessLauncher.getExceptionText(); - return false; - } - Thread alertvizThread = new Thread(alertvizProcessLauncher.launchProcess); - - // Construct the CAVE Process Launcher. - IProcessLauncher caveProcessLauncher = new CaveProcessLauncher(vizEnvironment); - if (caveProcessLauncher.isReady() == false) - { - this.errorDetail = caveProcessLauncher.getExceptionText(); - return false; - } - Thread caveThread = new Thread(caveProcessLauncher.launchProcess); - - // Start AlertViz. - alertvizThread.Start(); - - // Delay - Give Alertviz Time To Start. - Thread.Sleep(1000); - - // Start CAVE. - caveThread.Start(); - - // Wait for CAVE. - caveThread.Join(); - - // Wait for AlertViz. - alertvizThread.Join(); - - return true; - } - - public String getErrorDetail() - { - return this.errorDetail; - } - } -} \ No newline at end of file diff --git a/msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/environment/EnvironmentProperties.cs b/msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/environment/EnvironmentProperties.cs deleted file mode 100644 index 6db871db40..0000000000 --- a/msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/environment/EnvironmentProperties.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.IO; - -namespace VizLauncher.com.raytheon.viz.launcher.environment -{ - public abstract class EnvironmentProperties - { - /* Environment Properties */ - public static readonly String USER_HOME_ENV_PROPERTY = "%HOMEDRIVE%%HOMEPATH%"; - public static readonly String COMPUTER_NAME_ENV_PROPERTY = "%COMPUTERNAME%"; - - /* Registry Constants */ - public static readonly String A2_JAVA_REG = @"Software\Raytheon\Runtime Environment\AWIPS II Java"; - public static readonly String A2_PYTHON_REG = @"Software\Raytheon\Runtime Environment\AWIPS II Python"; - - public static readonly String JAVA_JRE_VALUE_NAME = "JavaJreDirectory"; - public static readonly String PYTHON_INSTALL_NAME = "PythonInstallDirectory"; - - /* Environment Additions */ - public static readonly String ENVIRONMENT_VARIABLE_PATH = "Path"; - public static readonly String ENVIRONMENT_VARIABLE_PYTHON_PATH = "PythonPath"; - - public static readonly String PATH_PYTHON_DLLS = Path.DirectorySeparatorChar + "DLLs"; - public static readonly String PATH_JAVA_BIN = Path.DirectorySeparatorChar + "bin"; - - public static readonly String PYTHON_PATH_PYTHON_LIBTK = - Path.DirectorySeparatorChar + "Lib" + Path.DirectorySeparatorChar + "lib-tk"; - public static readonly String PYTHON_PATH_PYTHON_DLLS = Path.DirectorySeparatorChar + "DLLs"; - public static readonly String PYTHON_PATH_PYTHON_LIB = Path.DirectorySeparatorChar + "Lib"; - } -} diff --git a/msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/environment/VizEnvironment.cs b/msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/environment/VizEnvironment.cs deleted file mode 100644 index 5172e046ee..0000000000 --- a/msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/environment/VizEnvironment.cs +++ /dev/null @@ -1,137 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.IO; -using Microsoft.Win32; - -namespace VizLauncher.com.raytheon.viz.launcher.environment -{ - public class VizEnvironment - { - private static readonly String CONSOLE_LOGS_DIRECTORY = - Path.DirectorySeparatorChar + "caveData" + Path.DirectorySeparatorChar + - "logs" + Path.DirectorySeparatorChar + "consoleLogs"; - private String location; - private String logDirectory = null; - private String path = null; - private String pythonPath = null; - - // did an error occur while initializing this object? - private bool ready; - // details about the error that has occurred. - private String exceptionText; - - public VizEnvironment(String location) - { - this.location = location; - this.init(); - } - - private void init() - { - /* For now we will assume that the environment properties will be available */ - // determine the location of the user's "home" directory. - String homeDirectory = - this.resolveEnvironmentProperty(EnvironmentProperties.USER_HOME_ENV_PROPERTY); - - // determine the computer name. - String computerName = - this.resolveEnvironmentProperty(EnvironmentProperties.COMPUTER_NAME_ENV_PROPERTY); - - // construct the path to the log directory. - this.logDirectory = homeDirectory + CONSOLE_LOGS_DIRECTORY + - Path.DirectorySeparatorChar + computerName; - - // retrieve the jdk directory from the registry. - String jdkDirectory = - this.retrieveRegistryProperty(EnvironmentProperties.A2_JAVA_REG, - EnvironmentProperties.JAVA_JRE_VALUE_NAME); - if (jdkDirectory == null) - { - this.notReady("Unable to retrieve the Java JDK Path from the registry!"); - return; - } - - // retrieve the python location from the registry. - String pythonLocation = - this.retrieveRegistryProperty(EnvironmentProperties.A2_PYTHON_REG, - EnvironmentProperties.PYTHON_INSTALL_NAME); - if (pythonLocation == null) - { - this.notReady("Unable to retrieve the Python Install Location from the registry!"); - return; - } - - // Construct the PATH. - this.path = pythonLocation + Path.PathSeparator; - this.path += pythonLocation + EnvironmentProperties.PATH_PYTHON_DLLS + Path.PathSeparator; - this.path += jdkDirectory + EnvironmentProperties.PATH_JAVA_BIN; - - // Construct the PYTHON_PATH. - this.pythonPath = pythonLocation + EnvironmentProperties.PYTHON_PATH_PYTHON_LIBTK + Path.PathSeparator; - this.pythonPath += pythonLocation + EnvironmentProperties.PYTHON_PATH_PYTHON_DLLS + Path.PathSeparator; - this.pythonPath += pythonLocation + EnvironmentProperties.PYTHON_PATH_PYTHON_LIB + Path.PathSeparator; - this.pythonPath += pythonLocation; - - this.ready = true; - } - - private String resolveEnvironmentProperty(String property) - { - return Environment.ExpandEnvironmentVariables(property); - } - - private String retrieveRegistryProperty(String registryKeyName, String valueName) - { - RegistryKey registryKey = Registry.LocalMachine.OpenSubKey(registryKeyName); - if (registryKey == null) - { - return null; - } - Object registryValue = registryKey.GetValue(valueName, null); - if (registryValue == null) - { - return null; - } - - return registryValue.ToString(); - } - - private void notReady(String reason) - { - this.ready = false; - this.exceptionText = reason; - } - - public String getLocation() - { - return this.location; - } - - public String getLogDirectory() - { - return this.logDirectory; - } - - public String getPath() - { - return this.path; - } - - public String getPythonPath() - { - return this.pythonPath; - } - - public bool isReady() - { - return this.ready; - } - - public String getExceptionText() - { - return this.exceptionText; - } - } -} \ No newline at end of file diff --git a/msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs b/msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs deleted file mode 100644 index f07dff604f..0000000000 --- a/msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs +++ /dev/null @@ -1,137 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.IO; -using System.Diagnostics; -using VizLauncher.com.raytheon.viz.launcher.environment; - -namespace VizLauncher.com.raytheon.viz.launcher.process -{ - public abstract class AbstractProcessLauncher : IProcessLauncher - { - private static readonly String LOG_DATE_FORMAT = "yyyyMMdd_HHmmss"; - protected static readonly String LOG_SUFFIX = ".log"; - protected Process process = null; - private StreamWriter logFileWriter; - protected VizEnvironment vizEnvironment; - - private bool ready = false; - private String exceptionText = null; - - public AbstractProcessLauncher(VizEnvironment vizEnvironment) - { - this.vizEnvironment = vizEnvironment; - // Prepare the log file. - if (Directory.Exists(vizEnvironment.getLogDirectory()) == false) - { - Directory.CreateDirectory(vizEnvironment.getLogDirectory()); - } - String logName = vizEnvironment.getLogDirectory() + - Path.DirectorySeparatorChar + this.constructLogName(this.determineLogDate()); - - // Prepare the process. - this.process = new Process(); - this.process.StartInfo = this.constructProcessStartInfo(vizEnvironment); - this.process.OutputDataReceived += new DataReceivedEventHandler(processOutputHandler); - this.validate(); - if (this.ready == false) - { - return; - } - - /* - * Access the log file for write access; other processes will have read-only access to - * the log file until it is closed. - **/ - this.logFileWriter = - new StreamWriter(File.Open(logName, FileMode.Append, - FileAccess.Write, FileShare.Read)); - } - - private String determineLogDate() - { - return DateTime.Now.ToString(LOG_DATE_FORMAT); - } - - private ProcessStartInfo constructProcessStartInfo(VizEnvironment vizEnvironment) - { - ProcessStartInfo processStartInfo = - new ProcessStartInfo(this.constructProcessName(vizEnvironment.getLocation())); - // include the default system PATH in the application PATH - String systemPath = System.Environment.GetEnvironmentVariable("PATH"); - processStartInfo.EnvironmentVariables[EnvironmentProperties.ENVIRONMENT_VARIABLE_PATH] = - vizEnvironment.getPath() + this.getApplicationSpecificPath() + systemPath; - processStartInfo.EnvironmentVariables[EnvironmentProperties.ENVIRONMENT_VARIABLE_PYTHON_PATH] = - vizEnvironment.getPythonPath(); - processStartInfo.UseShellExecute = false; - processStartInfo.Arguments = this.getCommandLineArguments(); - processStartInfo.RedirectStandardOutput = true; - - return processStartInfo; - } - - protected void validate() - { - String application = this.process.StartInfo.FileName; - /* ensure that the specified application exists. */ - if (File.Exists(application) == false) - { - this.ready = false; - this.exceptionText = "Unable to find the specified Viz application: " + application; - return; - } - - this.ready = true; - } - - public virtual void launchProcess() - { - this.runProcess(); - this.closeLog(); - } - - protected void runProcess() - { - this.process.Start(); - this.process.BeginOutputReadLine(); - this.process.WaitForExit(); - this.process.CancelOutputRead(); - } - - protected void closeLog() - { - this.logFileWriter.Close(); - } - - private void processOutputHandler(Object sendingProcess, DataReceivedEventArgs outline) - { - if (String.IsNullOrEmpty(outline.Data)) - { - return; - } - this.logFileWriter.WriteLine(outline.Data); - } - - public bool isReady() - { - return this.ready; - } - - public String getExceptionText() - { - return this.exceptionText; - } - - protected virtual String getApplicationSpecificPath() - { - return String.Empty; - } - - protected abstract String constructProcessName(String location); - - protected abstract String constructLogName(String logDate); - - protected abstract String getCommandLineArguments(); - } -} \ No newline at end of file diff --git a/msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/IProcessLauncher.cs b/msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/IProcessLauncher.cs deleted file mode 100644 index 0540d4b4ab..0000000000 --- a/msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/IProcessLauncher.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Diagnostics; - -namespace VizLauncher.com.raytheon.viz.launcher.process -{ - public interface IProcessLauncher - { - void launchProcess(); - - bool isReady(); - String getExceptionText(); - } -} \ No newline at end of file diff --git a/msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/impl/AlertvizProcessLauncher.cs b/msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/impl/AlertvizProcessLauncher.cs deleted file mode 100644 index 2b281391c9..0000000000 --- a/msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/impl/AlertvizProcessLauncher.cs +++ /dev/null @@ -1,62 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Diagnostics; -using System.IO; -using VizLauncher.com.raytheon.viz.launcher.process; -using VizLauncher.com.raytheon.viz.launcher.environment; - -namespace VizLauncher.com.raytheon.viz.launcher.process.impl -{ - public class AlertvizProcessLauncher : AbstractProcessLauncher - { - private static readonly String LOG_PREFIX = "alertviz_"; - private static readonly String COMMAND_LINE_ARGUMENTS = "-component thinalertviz"; - private static readonly String ALERTVIZ_PROCESS_NAME = "alertviz"; - private static readonly String ALERTVIZ_EXECUTABLE = - Path.DirectorySeparatorChar + "AlertViz" + - Path.DirectorySeparatorChar + "alertviz.exe"; - - public AlertvizProcessLauncher(VizEnvironment vizEnvironment) : base(vizEnvironment) - { - } - - public override void launchProcess() - { - // need to verify that another AlertViz process is not already running. - if (this.isAlertVizAlreadyRunning()) - { - // do not start a new AlertViz process. - return; - } - - this.runProcess(); - while (this.process.ExitCode != 0) - { - this.runProcess(); - } - this.closeLog(); - } - - private Boolean isAlertVizAlreadyRunning() - { - return (Process.GetProcessesByName(ALERTVIZ_PROCESS_NAME).Length > 0); - } - - protected override String constructProcessName(String location) - { - return location + ALERTVIZ_EXECUTABLE; - } - - protected override String constructLogName(String logDate) - { - return LOG_PREFIX + logDate + AbstractProcessLauncher.LOG_SUFFIX; - } - - protected override String getCommandLineArguments() - { - return COMMAND_LINE_ARGUMENTS; - } - } -} \ No newline at end of file diff --git a/msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/impl/CaveProcessLauncher.cs b/msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/impl/CaveProcessLauncher.cs deleted file mode 100644 index 83321fea2d..0000000000 --- a/msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/impl/CaveProcessLauncher.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.IO; -using VizLauncher.com.raytheon.viz.launcher.process; -using VizLauncher.com.raytheon.viz.launcher.environment; - -namespace VizLauncher.com.raytheon.viz.launcher.process.impl -{ - public class CaveProcessLauncher : AbstractProcessLauncher - { - private static readonly String LOG_PREFIX = "cave_"; - private static readonly String COMMAND_LINE_ARGUMENTS = "-component thinclient"; - private static readonly String CAVE_DIRECTORY = Path.DirectorySeparatorChar + "CAVE"; - private static readonly String CAVE_EXECUTABLE = - CAVE_DIRECTORY + Path.DirectorySeparatorChar + "cave.exe"; - - public CaveProcessLauncher(VizEnvironment vizEnvironment) - : base(vizEnvironment) - { - } - - protected override String getApplicationSpecificPath() - { - return Path.PathSeparator + this.vizEnvironment.getLocation() + - CAVE_DIRECTORY + Path.DirectorySeparatorChar + "lib" + Path.PathSeparator; - } - - protected override String constructProcessName(String location) - { - return location + CAVE_EXECUTABLE; - } - - protected override String constructLogName(String logDate) - { - return LOG_PREFIX + logDate + AbstractProcessLauncher.LOG_SUFFIX; - } - - protected override String getCommandLineArguments() - { - return COMMAND_LINE_ARGUMENTS; - } - } -} \ No newline at end of file diff --git a/msi/build/A2Staging/VisualStudio/VizLauncher.exe b/msi/build/A2Staging/VisualStudio/VizLauncher.exe deleted file mode 100644 index 099e80ea286c05b009e3f9c8084597b5b80682ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 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