Merge: dev to default

WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Loader.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012, Outercurve Foundation.
+// Copyright (c) 2012, Outercurve Foundation.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without modification,
@@ -80,7 +80,7 @@ namespace WebsitePanel.Installer.Core
 
         private WebClient fileLoader;
 
-        public BitlyLoader(string remoteFile)
+        internal BitlyLoader(string remoteFile) 
             : base(remoteFile)
         {
             InitFileLoader();
@@ -175,7 +175,7 @@ namespace WebsitePanel.Installer.Core
         public event EventHandler<LoaderEventArgs<Int32>> ProgressChanged;
         public event EventHandler<EventArgs> OperationCompleted;
 
-        public Loader(string remoteFile)
+        internal Loader(string remoteFile)
         {
             this.remoteFile = remoteFile;
         }

WebsitePanel.Installer/Sources/WebsitePanel.SilentInstaller/Program.cs

@@ -337,10 +337,13 @@ namespace WebsitePanel.SilentInstaller
 			string installerPath = Utils.GetDbString(row["InstallerPath"]);
 			string installerType = Utils.GetDbString(row["InstallerType"]);
 
+            // Get appropriate loader to download the app distributive
+            var loader = LoaderFactory.CreateFileLoader(fileName);
+            // Mimic synchronous download process for the console app
+            AutoResetEvent autoEvent = new AutoResetEvent(false);
+
 			try
 			{
-				// download installer
-				var loader = new Loader(fileName);
 				//
 				loader.OperationCompleted += new EventHandler<EventArgs>((object sender, EventArgs e) =>
 				{
@@ -374,25 +377,26 @@ namespace WebsitePanel.SilentInstaller
 					Log.WriteEnd("Installer finished");
 					// Remove temporary directory
 					FileUtils.DeleteTempDirectory();
+                    // We are done
+                    autoEvent.Set();
 				});
-
+                // TODO: Add cleanup for events.
 				loader.OperationFailed += new EventHandler<LoaderEventArgs<Exception>>(loader_OperationFailed);
 				loader.ProgressChanged += new EventHandler<LoaderEventArgs<int>>(loader_ProgressChanged);
 				loader.StatusChanged += new EventHandler<LoaderEventArgs<string>>(loader_StatusChanged);
 				//
 				loader.LoadAppDistributive();
+                // Wait until the download is complete
+                autoEvent.WaitOne();
 			}
 			catch (Exception ex)
 			{
 				Log.WriteError("Installer error", ex);
-				//AppContext.AppForm.ShowError(ex);
 			}
 			finally
 			{
-				//this.componentSettingsXml = null;
+                autoEvent.Set();
-				//this.componentCode = null;
 			}
-
 		}
 
 		static void loader_StatusChanged(object sender, LoaderEventArgs<string> e)

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Common/UsernameAssertion.cs

@@ -232,7 +232,7 @@ namespace WebsitePanel.EnterpriseServer
                 );
 
                 if (user == null)
-                    throw new Exception("Authentication token is invalid or borken");
+                    throw new Exception("Authentication token is invalid or broken");
 
                 SecurityContext.SetThreadPrincipal(user);
             }

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/VirtualizationForPrivateCloud/VirtualizationServerControllerForPrivateCloud.cs

@@ -2700,7 +2700,7 @@ namespace WebsitePanel.EnterpriseServer
         public static NetworkAdapterDetails GetExternalNetworkAdapterDetails(int itemId)
         {
             // load service item
-            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            VMInfo vm = (VMInfo)PackageController.GetPackageItem(itemId);
             if (vm == null)
                 return null;
 

WebsitePanel/Sources/WebsitePanel.Providers.FTP.FileZilla/FileZilla.cs

@@ -154,25 +154,30 @@ namespace WebsitePanel.Providers.FTP
 
             Log.WriteInfo("Find users nodes");
             // find users node
-			XmlNode nodeUsers = doc.SelectSingleNode("/FileZillaServer/Users");
+            XmlNode fzServerNode = doc.SelectSingleNode("/FileZillaServer");
-            
+            XmlNode fzAccountsNode = fzServerNode.SelectSingleNode("/Users");
-            XmlElement nodeUser = doc.CreateElement("User");
+            if (fzAccountsNode == null)
-		    if (nodeUsers != null) nodeUsers.AppendChild(nodeUser);
+            {
+                fzAccountsNode = doc.CreateElement("Users");
+                fzServerNode.AppendChild(fzAccountsNode);
+            }
 
+            XmlElement fzAccountNode = doc.CreateElement("User");
+            fzAccountsNode.AppendChild(fzAccountNode);
             // set properties
-			nodeUser.SetAttribute("Name", account.Name);
+            fzAccountNode.SetAttribute("Name", account.Name);
-			SetOption(nodeUser, "Pass", MD5(account.Password));
+            SetOption(fzAccountNode, "Pass", MD5(account.Password));
-			SetOption(nodeUser, "Group", "");
+            SetOption(fzAccountNode, "Group", "");
-			SetOption(nodeUser, "Bypass server userlimit", "0");
+            SetOption(fzAccountNode, "Bypass server userlimit", "0");
-			SetOption(nodeUser, "User Limit", "0");
+            SetOption(fzAccountNode, "User Limit", "0");
-			SetOption(nodeUser, "IP Limit", "0");
+            SetOption(fzAccountNode, "IP Limit", "0");
-			SetOption(nodeUser, "Enabled", BoolToString(account.Enabled));
+            SetOption(fzAccountNode, "Enabled", BoolToString(account.Enabled));
-			SetOption(nodeUser, "Comments", "");
+            SetOption(fzAccountNode, "Comments", "");
-			SetOption(nodeUser, "ForceSsl", "0");
+            SetOption(fzAccountNode, "ForceSsl", "0");
 
             // IP filter
             XmlElement nodeIPFilter = doc.CreateElement("IpFilter");
-			nodeUser.AppendChild(nodeIPFilter);
+            fzAccountNode.AppendChild(nodeIPFilter);
 
             XmlElement nodeDisallowed = doc.CreateElement("Disallowed");
             nodeIPFilter.AppendChild(nodeDisallowed);
@@ -182,7 +187,7 @@ namespace WebsitePanel.Providers.FTP
 
             // folder
             XmlElement nodePermissions = doc.CreateElement("Permissions");
-			nodeUser.AppendChild(nodePermissions);
+            fzAccountNode.AppendChild(nodePermissions);
 
             XmlElement nodePermission = doc.CreateElement("Permission");
             nodePermissions.AppendChild(nodePermission);
@@ -201,7 +206,7 @@ namespace WebsitePanel.Providers.FTP
 
             // speed limits
             XmlElement nodeSpeedLimits = doc.CreateElement("SpeedLimits");
-			nodeUser.AppendChild(nodeSpeedLimits);
+            fzAccountNode.AppendChild(nodeSpeedLimits);
             nodeSpeedLimits.SetAttribute("DlType", "0");
             nodeSpeedLimits.SetAttribute("DlLimit", "10");
             nodeSpeedLimits.SetAttribute("ServerDlLimitBypass", "0");

WebsitePanel/Sources/WebsitePanel.Server.Utils/FileUtils.cs

@@ -38,14 +38,98 @@ using System.Reflection;
 using Ionic.Zip;
 using WebsitePanel.Providers.OS;
 
-
 namespace WebsitePanel.Providers.Utils
 {
+    /// <summary>
+    /// Defines a contract that a system command provider needs to implement.
+    /// </summary>
+    public interface ICommandLineProvider
+    {
+        /// <summary>
+        /// Executes the file specifed as if you were executing it via command-line interface.
+        /// </summary>
+        /// <param name="filePath">Path to the executable file (eq. .exe, .bat, .cmd and etc).</param>
+        /// <param name="args">Arguments to pass to the executable file</param>
+        /// <param name="outputFile">Path to the output file if you want the output to be written somewhere.</param>
+        /// <returns>Output of the command being executed.</returns>
+        string Execute(string filePath, string args, string outputFile);
+    }
+
+    /// <summary>
+    /// Provides a default implementation of running system commands.
+    /// </summary>
+    public sealed class DefaultCommandLineProvider : ICommandLineProvider
+    {
+        /// <summary>
+        /// Creates a new process and executes the file specifed as if you were executing it via command-line interface.
+        /// </summary>
+        /// <param name="filePath">Path to the executable file (eq. .exe, .bat, .cmd and etc).</param>
+        /// <param name="args">Arguments to pass to the executable file</param>
+        /// <param name="outputFile">Path to the output file if you want the output to be written somewhere.</param>
+        /// <returns>Output of the command being executed.</returns>
+        public string Execute(string filePath, string args, string outputFile)
+        {
+            // launch system process
+            ProcessStartInfo startInfo = new ProcessStartInfo(filePath, args);
+            startInfo.WindowStyle = ProcessWindowStyle.Hidden;
+            startInfo.RedirectStandardOutput = true;
+            startInfo.UseShellExecute = false;
+            startInfo.CreateNoWindow = true;
+
+            // get working directory from executable path
+            startInfo.WorkingDirectory = Path.GetDirectoryName(filePath);
+            Process proc = Process.Start(startInfo);
+
+            // analyze results
+            StreamReader reader = proc.StandardOutput;
+            string results = "";
+            if (!String.IsNullOrEmpty(outputFile))
+            {
+                // stream to writer
+                StreamWriter writer = new StreamWriter(outputFile);
+                int BUFFER_LENGTH = 2048;
+                int readBytes = 0;
+                char[] buffer = new char[BUFFER_LENGTH];
+                while ((readBytes = reader.Read(buffer, 0, BUFFER_LENGTH)) > 0)
+                {
+                    writer.Write(buffer, 0, readBytes);
+                }
+                writer.Close();
+            }
+            else
+            {
+                // return as string
+                results = reader.ReadToEnd();
+            }
+            reader.Close();
+
+            return results;
+        }
+    }
+
     /// <summary>
     /// Summary description for FileUtils.
     /// </summary>
     public class FileUtils
     {
+        private static ICommandLineProvider CliProvider;
+
+        static FileUtils()
+        {
+            SetDefaultCliProvider(new DefaultCommandLineProvider());
+        }
+
+        /// <summary>
+        /// Initializes command-line provider for the utility class. Yet this is not a perfect way to inverse control over CLI processing 
+        /// but it does its job for the testing purposes.
+        /// </summary>
+        /// <param name="provider">An instance of a command-line provider to initialize the utility with.</param>
+        public static void SetDefaultCliProvider(ICommandLineProvider provider)
+        {
+            Debug.Assert(provider != null, "Command line provider is null");
+            CliProvider = provider;
+        }
+
 		public static string EvaluateSystemVariables(string str)
         {
             if (String.IsNullOrEmpty(str))
@@ -616,45 +700,17 @@ namespace WebsitePanel.Providers.Utils
             return ExecuteSystemCommand(cmd, args, null);
         }
 
+        /// <summary>
+        /// Executes the file specifed as if you were executing it via command-line interface.
+        /// </summary>
+        /// <param name="filePath">Path to the executable file (eq. .exe, .bat, .cmd and etc).</param>
+        /// <param name="args">Arguments to pass to the executable file</param>
+        /// <param name="outputFile">Path to the output file if you want the output to be written somewhere.</param>
+        /// <returns>Output of the command being executed.</returns>
         public static string ExecuteSystemCommand(string cmd, string args, string outputFile)
         {
             // launch system process
-            ProcessStartInfo startInfo = new ProcessStartInfo(cmd, args);
+            return CliProvider.Execute(cmd, args, outputFile);
-            startInfo.WindowStyle = ProcessWindowStyle.Hidden;
-            startInfo.RedirectStandardOutput = true;
-            startInfo.StandardOutputEncoding = Encoding.UTF8;
-            startInfo.UseShellExecute = false;
-            startInfo.CreateNoWindow = true;
-
-            // get working directory from executable path
-			startInfo.WorkingDirectory = Path.GetDirectoryName(cmd);
-            Process proc = Process.Start(startInfo);
-
-
-            // analyze results
-            StreamReader reader = proc.StandardOutput;
-            string results = "";
-            if (!String.IsNullOrEmpty(outputFile))
-            {
-                // stream to writer
-                StreamWriter writer = new StreamWriter(outputFile);
-                int BUFFER_LENGTH = 2048;
-                int readBytes = 0;
-                char[] buffer = new char[BUFFER_LENGTH];
-                while ((readBytes = reader.Read(buffer, 0, BUFFER_LENGTH)) > 0)
-                {
-                    writer.Write(buffer, 0, readBytes);
-                }
-                writer.Close();
-            }
-            else
-            {
-                // return as string
-                results = reader.ReadToEnd();
-            }
-            reader.Close();
-
-            return results;
         }
 
         public static void ExecuteCmdCommand(string command)

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/VirtualMachinesHelper.cs

@@ -29,9 +29,54 @@
 using WebsitePanel.EnterpriseServer;
 using WebsitePanel.Providers.Virtualization;
 using System.Web;
+using System;
 
 namespace WebsitePanel.Portal
 {
+    // TODO: Move this extension to a separate file later.
+    public static class VirtualMachinesExtensions
+    {
+        #region Privates with specific purposes (eq. caching, usability, performance and etc)
+        /// <summary>
+        /// This method supports the Portal internal infrastructure and is not intended to be used directly from your code. Gets a cached copy of virtual machine object of the specified type or retrieves it for the first time and then caches it.
+        /// </summary>
+        /// <typeparam name="T">Type of virtual machine to be retrieved (possible types are VirtualMachine|VMInfo)</typeparam>
+        /// <param name="cacheIdentityKey">Virtual machine item id</param>
+        /// <param name="getVmFunc">Function to retrieve the virtual machine data from Enterprise Server</param>
+        /// <returns>An instance of the specified virtual machine</returns>
+        internal static T GetCachedVirtualMachine<T>(object cacheIdentityKey, Func<T> getVmFunc)
+        {
+            // TODO: Make this method private when all dependents will be consolidated in the extension.
+            string cacheKey = "CachedVirtualMachine_" + cacheIdentityKey;
+            if (HttpContext.Current.Items[cacheKey] != null)
+                return (T)HttpContext.Current.Items[cacheKey];
+
+            // load virtual machine
+            T virtualMachine = getVmFunc();
+
+            // place to cache
+            if (virtualMachine != null)
+                HttpContext.Current.Items[cacheKey] = virtualMachine;
+
+            return virtualMachine;
+        }
+        #endregion
+
+        #region Extension methods
+        /// <summary>
+        /// Gets a cached copy of virtual machine object of the specified type or retrieves it for the first time and then caches it.
+        /// </summary>
+        /// <param name="client"></param>
+        /// <param name="itemId">Virtual machine id</param>
+        /// <returns>An instance of the virtual machine speficied</returns>
+        public static VMInfo GetCachedVirtualMachine(this esVirtualizationServerForPrivateCloud client, int itemId)
+        {
+            return GetCachedVirtualMachine<VMInfo>(
+                itemId, () => ES.Services.VPSPC.GetVirtualMachineItem(itemId));
+        }
+        #endregion
+    }
+
     public class VirtualMachinesHelper
     {
         public static bool IsVirtualMachineManagementAllowed(int packageId)
@@ -57,20 +102,11 @@ namespace WebsitePanel.Portal
             return manageAllowed;
         }
 
+        // TODO: Move this method to the corresponding extension later.
         public static VirtualMachine GetCachedVirtualMachine(int itemId)
         {
-            string key = "CachedVirtualMachine" + itemId;
+            return VirtualMachinesExtensions.GetCachedVirtualMachine<VirtualMachine>(
-            if (HttpContext.Current.Items[key] != null)
+                itemId, () => ES.Services.VPS.GetVirtualMachineItem(itemId));
-                return (VirtualMachine)HttpContext.Current.Items[key];
-
-            // load virtual machine
-            VirtualMachine vm = ES.Services.VPS.GetVirtualMachineItem(itemId);
-
-            // place to cache
-            if (vm != null)
-                HttpContext.Current.Items[key] = vm;
-
-            return vm;
         }
 
         #region Virtual Machines

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPSForPC/RemoteDesktop/Connect.aspx.cs

@@ -40,13 +40,14 @@ namespace WebsitePanel.Portal.VPSForPC.RemoteDesktop
             resolution.Text = Request["Resolution"];
 
             // load server info
-            VirtualMachine vm = VirtualMachinesHelper.GetCachedVirtualMachine(PanelRequest.ItemID);
+            VMInfo vm = ES.Services.VPSPC.GetCachedVirtualMachine(PanelRequest.ItemID);
             litServerName.Text = vm.Name + " - ";
             username.Text = "Administrator";
-            password.Text = vm.AdministratorPassword;
+            // TODO: Review VMInfo class fields and underlying data for correctness
+            password.Text = vm.AdminPassword;
             
             // load external network parameters
-            NetworkAdapterDetails nic = ES.Services.VPS.GetExternalNetworkAdapterDetails(PanelRequest.ItemID);
+            NetworkAdapterDetails nic = ES.Services.VPSPC.GetExternalNetworkAdapterDetails(PanelRequest.ItemID);
             if (nic.IPAddresses.Length > 0)
             {
                 NetworkAdapterIPAddress ip = nic.IPAddresses[0];

WebsitePanel/build.xml

@@ -1,10 +1,10 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Import Project="C:\Program Files\MSBuild\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets"/>
+	<Import Project="$(MSBuildExtensionsPath)\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets"/>
 	<PropertyGroup>
 		<Version>1.2.2.0</Version>
 		<FileVersion>1.2.2.1</FileVersion>
 		<VersionLabel>1.2.2</VersionLabel>
-		<ReleaseDate>2012-05-13</ReleaseDate>
+		<ReleaseDate>2012-08-01</ReleaseDate>
 		<BuildConfiguration>Release</BuildConfiguration>
 		<RootFolder>..</RootFolder>
 		<TrunkFolder>$(RootFolder)\WebsitePanel</TrunkFolder>
@@ -15,12 +15,13 @@
 		<BuildFolder>$(TrunkFolder)\Build\$(BuildConfiguration)</BuildFolder>
 		<DeployFolder>$(TrunkFolder)\Deploy\$(BuildConfiguration)</DeployFolder>
 
-		<PreviousBuildFolder>C:\Projects\WebsitePanel-1.2.1\$(BuildConfiguration)</PreviousBuildFolder>
+    <PreviousBuildFolder>$(RootFolder)\..\prev\$(BuildConfiguration)</PreviousBuildFolder>
 
 		<DiffCmd>$(TrunkFolder)\Tools\Diff.exe</DiffCmd>
-		<SqlCmd>"C:\Program Files\Microsoft SQL Server\110\Tools\Binn\sqlcmd.exe" -S (local)\SQLEXPRESS -E</SqlCmd>
+		<SqlCmd>"$(ProgramFiles)\Microsoft SQL Server\100\Tools\Binn\sqlcmd.exe" -S (local)\SQLEXPRESS -E</SqlCmd>
 
-		<MSDeployPath>"C:\Program Files\IIS\Microsoft Web Deploy V2\msdeploy.exe"</MSDeployPath>
+    <MSDeployPath Condition="Exists('$(ProgramFiles)\IIS\Microsoft Web Deploy\msdeploy.exe')">"$(ProgramFiles)\IIS\Microsoft Web Deploy\msdeploy.exe"</MSDeployPath>
+		<MSDeployPath Condition="Exists('$(ProgramFiles)\IIS\Microsoft Web Deploy V2\msdeploy.exe')">"$(ProgramFiles)\IIS\Microsoft Web Deploy V2\msdeploy.exe"</MSDeployPath>
 
 		<DataBaseName>WebsitePanel_build</DataBaseName>
 		<MSDeployConnectionString>server=(local)\SQLEXPRESS;database=$(DataBaseName);Integrated Security=true;</MSDeployConnectionString>
@@ -31,6 +32,7 @@
 		<ImportCsvSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.CsvBulk\bin\$(BuildConfiguration)</ImportCsvSrc>
 		<ImportEnterpriseSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.Enterprise\bin\$(BuildConfiguration)</ImportEnterpriseSrc>
 		<AWStatsViewerSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.AWStats.Viewer</AWStatsViewerSrc>
+
 <WSPTransportAgentSrc>$(TrunkFolder)\Sources\Tools\WSPTransportAgent</WSPTransportAgentSrc>
 
 		<ServerBuild>$(BuildFolder)\Server</ServerBuild>
@@ -39,17 +41,14 @@
 		<ImportCsvBuild>$(BuildFolder)\Import.CsvBulk</ImportCsvBuild>
 		<ImportEnterpriseBuild>$(BuildFolder)\Import.Enterprise</ImportEnterpriseBuild>
 		<AWStatsViewerBuild>$(BuildFolder)\AWStats.Viewer</AWStatsViewerBuild>
-    <WSPTransportAgentBuild>$(BuildFolder)\WSPTransportAgent</WSPTransportAgentBuild>
 
+<WSPTransportAgentBuild>$(BuildFolder)\WSPTransportAgent</WSPTransportAgentBuild>
 
 	</PropertyGroup>
 
-	
 	<Target Name="GenerateBuildVersionFiles" Inputs="build.xml" Outputs="$(TrunkFolder)\Sources\VersionInfo.cs;$(TrunkFolder)\Sources\VersionInfo.vb">
-		<AssemblyInfo CodeLanguage="CS" OutputFile="$(TrunkFolder)\Sources\VersionInfo.cs" AssemblyCompany="Outercurve Foundation" AssemblyCopyright="Copyright © 2012 Outercurve Foundation."
+		<AssemblyInfo CodeLanguage="CS" OutputFile="$(TrunkFolder)\Sources\VersionInfo.cs" AssemblyCompany="Outercurve Foundation" AssemblyCopyright="Copyright © 2012 Outercurve Foundation." AssemblyVersion="$(Version)" AssemblyFileVersion="$(FileVersion)" AssemblyInformationalVersion="$(VersionLabel)" />
-				AssemblyVersion="$(Version)" AssemblyFileVersion="$(FileVersion)" AssemblyInformationalVersion="$(VersionLabel)" />
+		<AssemblyInfo CodeLanguage="VB" OutputFile="$(TrunkFolder)\Sources\VersionInfo.vb" AssemblyCompany="Outercurve Foundation" AssemblyCopyright="Copyright © 2012 Outercurve Foundation." AssemblyVersion="$(Version)" AssemblyFileVersion="$(FileVersion)" AssemblyInformationalVersion="$(VersionLabel)" />
-		<AssemblyInfo CodeLanguage="VB" OutputFile="$(TrunkFolder)\Sources\VersionInfo.vb" AssemblyCompany="Outercurve Foundation" AssemblyCopyright="Copyright © 2012 Outercurve Foundation."
-				AssemblyVersion="$(Version)" AssemblyFileVersion="$(FileVersion)" AssemblyInformationalVersion="$(VersionLabel)" />
 	</Target>
 
 	<Target Name="CompileSources" DependsOnTargets="GenerateBuildVersionFiles">

WebsitePanel/deploy-debug.bat

@@ -1 +1 @@
-%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe build.xml /target:Deploy /property:BuildConfiguration=Debug /v:n /fileLogger /m
+%windir%\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe build.xml /target:Deploy /property:BuildConfiguration=Debug /v:n /fileLogger /m