Changeset 3006 for trunk/sources/HeuristicLab.PluginInfrastructure/Advanced

Timestamp:

03/11/10 18:23:52 (15 years ago)

Author:

gkronber

Message:

Implemented deployment service on servdev.heuristiclab.com and changed all service references and configurations to point to the service address. Improved GUI of installation manager. Implemented user name authentication and authorization for the deployment service. #860 (Deployment server for plugin installation from web locations)

Location:

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced

Files:

• ConnectionSetupView.Designer.cs (added)
• ConnectionSetupView.cs (added)
• ConnectionSetupView.resx (added)
• DeploymentService/AdminClientFactory.cs (added)
• DeploymentService/RegenerateServiceClasses.cmd (modified) (1 diff)
• DeploymentService/UpdateClientFactory.cs (added)
• DeploymentService/servdev.cer (added)
• InstallationManager.cs (modified) (7 diffs)
• InstallationManagerConsole.cs (modified) (2 diffs)
• InstallationManagerControl.Designer.cs (added)
• InstallationManagerControl.cs (added)
• InstallationManagerForm.Designer.cs (modified) (8 diffs)
• InstallationManagerForm.cs (modified) (11 diffs)
• LicenseConfirmationBox.Designer.cs (added)
• LicenseConfirmationBox.cs (added)
• LicenseConfirmationBox.resx (added)
• LicenseView.Designer.cs (added)
• LicenseView.cs (added)
• LicenseView.resx (added)
• LocalPluginManager.Designer.cs (modified) (1 diff)
• LocalPluginManager.cs (modified) (1 diff)
• PluginView.Designer.cs (added)
• PluginView.cs (added)
• PluginView.resx (added)

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/DeploymentService/RegenerateServiceClasses.cmd

@@ -1 +1 @@
 #
-svcutil http://localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Update/mex http://localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Admin/mex  /language:C# /targetClientVersion:Version35 /out:DeploymentService /namespace:*,HeuristicLab.PluginInfrastructure.Advanced.DeploymentService /mergeConfig /config:../../app.config
+svcutil http://servdev.heuristiclab.com/Deployment/Update.svc/mex http://servdev.heuristiclab.com/Deployment/Admin.svc/mex  /language:C# /targetClientVersion:Version35 /out:DeploymentService /namespace:*,HeuristicLab.PluginInfrastructure.Advanced.DeploymentService /mergeConfig /config:../../app.config

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/InstallationManager.cs

@@ -29 +29 @@
 using System.Reflection;
 using ICSharpCode.SharpZipLib.Zip;
+using System.ServiceModel;
 
 namespace HeuristicLab.PluginInfrastructure.Advanced {
@@ -129 +130 @@
     /// <param name="connectionString"></param>
     /// <returns></returns>
-    public IEnumerable<IPluginDescription> GetRemotePluginList(string connectionString) {
-      using (var client = new DeploymentService.UpdateClient()) {
-        return client.GetPlugins();
+    public IEnumerable<IPluginDescription> GetRemotePluginList() {
+      var client = DeploymentService.UpdateClientFactory.CreateClient();
+      try {
+        List<IPluginDescription> plugins = new List<IPluginDescription>(client.GetPlugins());
+        client.Close();
+        return plugins;
+      }
+      catch (FaultException) {
+        client.Abort();
+        return new IPluginDescription[] { };
       }
     }
@@ -140 +148 @@
     /// <param name="connectionString"></param>
     /// <returns></returns>
-    public IEnumerable<DeploymentService.ProductDescription> GetRemoteProductList(string connectionString) {
-      using (var client = new DeploymentService.UpdateClient()) {
-        return client.GetProducts();
+    public IEnumerable<DeploymentService.ProductDescription> GetRemoteProductList() {
+      var client = DeploymentService.UpdateClientFactory.CreateClient();
+      try {
+        List<DeploymentService.ProductDescription> products = new List<DeploymentService.ProductDescription>(client.GetProducts());
+        client.Close();
+        return products;
+      }
+      catch (FaultException) {
+        client.Abort();
+        return new DeploymentService.ProductDescription[] { };
       }
     }
@@ -151 +166 @@
     /// <param name="connectionString"></param>
     /// <param name="pluginNames"></param>
-    public void Install(string connectionString, IEnumerable<IPluginDescription> plugins) {
-      using (var client = new DeploymentService.UpdateClient()) {
-        var args = new PluginInfrastructureCancelEventArgs(plugins.Select(x => x.Name + " " + x.Version));
-        OnPreInstall(args);
-        foreach (DeploymentService.PluginDescription plugin in plugins) {
-          byte[] zippedPackage = client.GetPlugin(plugin);
-          Unpack(zippedPackage);
-          OnInstalled(new PluginInfrastructureEventArgs(plugin));
+    public void Install(IEnumerable<IPluginDescription> plugins) {
+      var args = new PluginInfrastructureCancelEventArgs(plugins);
+      OnPreInstall(args);
+      if (!args.Cancel) {
+        var client = DeploymentService.UpdateClientFactory.CreateClient();
+        try {
+          foreach (DeploymentService.PluginDescription plugin in plugins) {
+            byte[] zippedPackage = client.GetPlugin(plugin);
+            Unpack(zippedPackage);
+            OnInstalled(new PluginInfrastructureEventArgs(plugin));
+          }
+          client.Close();
+        }
+        catch (FaultException) {
+          client.Abort();
         }
       }
@@ -167 +189 @@
     /// </summary>
     /// <param name="pluginNames"></param>
-    public void Update(string connectionString, IEnumerable<IPluginDescription> plugins) {
-      PluginInfrastructureCancelEventArgs args = new PluginInfrastructureCancelEventArgs(plugins.Select(x => x.Name + " " + x.Version));
+    public void Update(IEnumerable<IPluginDescription> plugins) {
+      PluginInfrastructureCancelEventArgs args = new PluginInfrastructureCancelEventArgs(plugins);
       OnPreUpdate(args);
       if (!args.Cancel) {
-        using (var client = new DeploymentService.UpdateClient()) {
+        var client = DeploymentService.UpdateClientFactory.CreateClient();
+        try {
           foreach (DeploymentService.PluginDescription plugin in plugins) {
             byte[] zippedPackage = client.GetPlugin(plugin);
@@ -177 +200 @@
             OnUpdated(new PluginInfrastructureEventArgs(plugin));
           }
+          client.Close();
+        }
+        catch (FaultException) {
+          client.Abort();
         }
       }
@@ -189 +216 @@
                       from file in pluginToDelete.Files
                       select Path.Combine(pluginDir, file.Name);
-      var args = new PluginInfrastructureCancelEventArgs(fileNames);
+      var args = new PluginInfrastructureCancelEventArgs(plugins);
       OnPreDelete(args);
       if (!args.Cancel) {

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/InstallationManagerConsole.cs

@@ -52 +52 @@
     void installManager_PreUpdatePlugin(object sender, PluginInfrastructureCancelEventArgs e) {
       Console.WriteLine("Following plugins are updated:");
-      foreach (var info in e.Entities) {
+      foreach (var info in e.Plugins) {
         Console.WriteLine(e);
       }
@@ -67 +67 @@
     void installManager_PreRemovePlugin(object sender, PluginInfrastructureCancelEventArgs e) {
       Console.WriteLine("Following files are deleted:");
-      foreach (string fileName in e.Entities) {
-        Console.WriteLine(fileName);
+      foreach (var plugin in e.Plugins) {
+        foreach (var file in plugin.Files)
+          Console.WriteLine(file);
       }
       if (GetUserConfirmation()) e.Cancel = false;

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/InstallationManagerForm.Designer.cs

@@ -28 +28 @@
       this.toolStripStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
       this.removeButton = new System.Windows.Forms.Button();
-      this.serverUrlLabel = new System.Windows.Forms.Label();
-      this.serverUrlTextBox = new System.Windows.Forms.TextBox();
-      this.refreshButton = new System.Windows.Forms.Button();
       this.installButton = new System.Windows.Forms.Button();
       this.tabControl = new System.Windows.Forms.TabControl();
@@ -39 +36 @@
       this.logTabPage = new System.Windows.Forms.TabPage();
       this.logTextBox = new System.Windows.Forms.TextBox();
+      this.refreshButton = new System.Windows.Forms.Button();
+      this.editConnectionButton = new System.Windows.Forms.Button();
       this.statusStrip.SuspendLayout();
       this.tabControl.SuspendLayout();
@@ -81 +80 @@
       this.removeButton.Click += new System.EventHandler(this.removeButton_Click);
       // 
-      // serverUrlLabel
-      // 
-      this.serverUrlLabel.AutoSize = true;
-      this.serverUrlLabel.Location = new System.Drawing.Point(9, 11);
-      this.serverUrlLabel.Name = "serverUrlLabel";
-      this.serverUrlLabel.Size = new System.Drawing.Size(73, 13);
-      this.serverUrlLabel.TabIndex = 13;
-      this.serverUrlLabel.Text = "Plugin Server:";
-      // 
-      // serverUrlTextBox
-      // 
-      this.serverUrlTextBox.Location = new System.Drawing.Point(88, 8);
-      this.serverUrlTextBox.Name = "serverUrlTextBox";
-      this.serverUrlTextBox.Size = new System.Drawing.Size(264, 20);
-      this.serverUrlTextBox.TabIndex = 12;
-      // 
-      // refreshButton
-      // 
-      this.refreshButton.Location = new System.Drawing.Point(358, 6);
-      this.refreshButton.Name = "refreshButton";
-      this.refreshButton.Size = new System.Drawing.Size(75, 23);
-      this.refreshButton.TabIndex = 11;
-      this.refreshButton.Text = "Refresh";
-      this.refreshButton.UseVisualStyleBackColor = true;
-      this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);
-      // 
       // installButton
       // 
@@ -157 +130 @@
       // remotePluginsTabPage
       // 
-      this.remotePluginsTabPage.Controls.Add(this.serverUrlLabel);
+      this.remotePluginsTabPage.Controls.Add(this.editConnectionButton);
       this.remotePluginsTabPage.Controls.Add(this.remotePluginInstaller);
-      this.remotePluginsTabPage.Controls.Add(this.serverUrlTextBox);
       this.remotePluginsTabPage.Controls.Add(this.refreshButton);
       this.remotePluginsTabPage.Controls.Add(this.installButton);
@@ -204 +176 @@
       this.logTextBox.Size = new System.Drawing.Size(598, 586);
       this.logTextBox.TabIndex = 0;
+      // 
+      // refreshButton
+      // 
+      this.refreshButton.Location = new System.Drawing.Point(8, 6);
+      this.refreshButton.Name = "refreshButton";
+      this.refreshButton.Size = new System.Drawing.Size(75, 23);
+      this.refreshButton.TabIndex = 11;
+      this.refreshButton.Text = "Refresh";
+      this.refreshButton.UseVisualStyleBackColor = true;
+      this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);
+      // 
+      // editConnectionButton
+      // 
+      this.editConnectionButton.Location = new System.Drawing.Point(89, 6);
+      this.editConnectionButton.Name = "editConnectionButton";
+      this.editConnectionButton.Size = new System.Drawing.Size(108, 23);
+      this.editConnectionButton.TabIndex = 16;
+      this.editConnectionButton.Text = "Edit Connection...";
+      this.editConnectionButton.UseVisualStyleBackColor = true;
+      this.editConnectionButton.Click += new System.EventHandler(this.editConnectionButton_Click);
       // 
       // InstallationManagerForm
@@ -219 +211 @@
       this.localPluginsTabPage.ResumeLayout(false);
       this.remotePluginsTabPage.ResumeLayout(false);
-      this.remotePluginsTabPage.PerformLayout();
       this.logTabPage.ResumeLayout(false);
       this.logTabPage.PerformLayout();
@@ -232 +223 @@
     private System.Windows.Forms.ToolStripProgressBar toolStripProgressBar;
     private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel;
-    private System.Windows.Forms.Label serverUrlLabel;
-    private System.Windows.Forms.TextBox serverUrlTextBox;
-    private System.Windows.Forms.Button refreshButton;
     private LocalPluginManager localPluginManager;
     private RemotePluginInstaller remotePluginInstaller;
@@ -244 +232 @@
     private System.Windows.Forms.TabPage logTabPage;
     private System.Windows.Forms.TextBox logTextBox;
+    private System.Windows.Forms.Button editConnectionButton;
+    private System.Windows.Forms.Button refreshButton;
   }
 }

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/InstallationManagerForm.cs

@@ -13 +13 @@
   public partial class InstallationManagerForm : Form {
     private class UpdateOrInstallPluginsBackgroundWorkerArgument {
-      public string ConnectionString { get; set; }
       public IEnumerable<IPluginDescription> PluginsToUpdate { get; set; }
       public IEnumerable<IPluginDescription> PluginsToInstall { get; set; }
@@ -56 +55 @@
       refreshLocalPluginsBackgroundWorker.RunWorkerCompleted += new RunWorkerCompletedEventHandler(refreshLocalPluginsBackgroundWorker_RunWorkerCompleted);
       #endregion
-
-      // get default connection string
-      using (var client = new DeploymentService.UpdateClient()) {
-        serverUrlTextBox.Text = client.Endpoint.Address.ToString();
-      }
 
       installationManager = new InstallationManager(pluginDir);
@@ -130 +124 @@
     void updateOrInstallPluginsBackgroundWorker_DoWork(object sender, DoWorkEventArgs e) {
       UpdateOrInstallPluginsBackgroundWorkerArgument info = (UpdateOrInstallPluginsBackgroundWorkerArgument)e.Argument;
-      installationManager.Install(info.ConnectionString, info.PluginsToInstall);
-      installationManager.Update(info.ConnectionString, info.PluginsToUpdate);
+      installationManager.Install(info.PluginsToInstall);
+      installationManager.Update(info.PluginsToUpdate);
     }
     #endregion
@@ -147 +141 @@
 
     void refreshServerPluginsBackgroundWorker_DoWork(object sender, DoWorkEventArgs e) {
-      string connectionString = (string)e.Argument;
-
       RefreshBackgroundWorkerResult result = new RefreshBackgroundWorkerResult();
-      result.RemotePlugins = installationManager.GetRemotePluginList(connectionString);
-      result.RemoteProducts = installationManager.GetRemoteProductList(connectionString);
+      result.RemotePlugins = installationManager.GetRemotePluginList();
+      result.RemoteProducts = installationManager.GetRemoteProductList();
       e.Cancel = false;
       e.Result = result;
@@ -180 +172 @@
     #region installation manager event handlers
     void installationManager_PreUpdatePlugin(object sender, PluginInfrastructureCancelEventArgs e) {
-      if (ConfirmUpdateAction(e.Entities) == true) e.Cancel = false;
-      else e.Cancel = true;
+      if (e.Plugins.Count() > 0) {
+        e.Cancel = ConfirmUpdateAction(e.Plugins) == false;
+      }
     }
 
     void installationManager_PreRemovePlugin(object sender, PluginInfrastructureCancelEventArgs e) {
-      if (ConfirmRemoveAction(e.Entities) == true) e.Cancel = false;
-      else e.Cancel = true;
+      if (e.Plugins.Count() > 0) {
+        e.Cancel = ConfirmRemoveAction(e.Plugins) == false;
+      }
     }
 
     void installationManager_PreInstallPlugin(object sender, PluginInfrastructureCancelEventArgs e) {
-      if (e.Entities.Count() > 0)
-        SetStatusStrip("Installing " + e.Entities.Aggregate((a, b) => a + Environment.NewLine + b));
+      if (e.Plugins.Count() > 0)
+        if (ConfirmInstallAction(e.Plugins) == true) {
+          SetStatusStrip("Installing " + e.Plugins.Aggregate("", (a, b) => a.ToString() + "; " + b.ToString()));
+          e.Cancel = false;
+        } else {
+          e.Cancel = true;
+          SetStatusStrip("Install canceled");
+        }
     }
 
@@ -239 +239 @@
       var pluginsToInstall = remotePluginInstaller.CheckedPlugins.Except(pluginsToUpdate);
 
-      updateOrInstallInfo.ConnectionString = serverUrlTextBox.Text;
       updateOrInstallInfo.PluginsToInstall = pluginsToInstall;
       updateOrInstallInfo.PluginsToUpdate = pluginsToUpdate;
@@ -255 +254 @@
 
     #region confirmation dialogs
-    private bool ConfirmRemoveAction(IEnumerable<string> fileNames) {
+    private bool ConfirmRemoveAction(IEnumerable<IPluginDescription> plugins) {
       StringBuilder strBuilder = new StringBuilder();
       strBuilder.AppendLine("Delete files:");
-      foreach (var fileName in fileNames) {
-        strBuilder.AppendLine(fileName);
+      foreach (var plugin in plugins) {
+        foreach (var file in plugin.Files) {
+          strBuilder.AppendLine(file.ToString());
+        }
       }
       return MessageBox.Show(strBuilder.ToString(), "Confirm Delete", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning) == DialogResult.OK;
     }
 
-    private bool ConfirmUpdateAction(IEnumerable<string> plugins) {
+    private bool ConfirmUpdateAction(IEnumerable<IPluginDescription> plugins) {
       StringBuilder strBuilder = new StringBuilder();
       strBuilder.AppendLine("Update plugins:");
       foreach (var plugin in plugins) {
-        strBuilder.AppendLine(plugin);
+        strBuilder.AppendLine(plugin.ToString());
       }
       return MessageBox.Show(strBuilder.ToString(), "Confirm Update", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning) == DialogResult.OK;
     }
+
+    private bool ConfirmInstallAction(IEnumerable<IPluginDescription> plugins) {
+      foreach (var plugin in plugins) {
+        if (!string.IsNullOrEmpty(plugin.LicenseText)) {
+          var licenseConfirmationBox = new LicenseConfirmationBox(plugin);
+          if (licenseConfirmationBox.ShowDialog() != DialogResult.OK)
+            return false;
+        }
+      }
+      return true;
+    }
+
 
     #endregion
@@ -306 +319 @@
       toolStripProgressBar.Visible = true;
       DisableControls();
-      refreshServerPluginsBackgroundWorker.RunWorkerAsync(serverUrlTextBox.Text);
+      refreshServerPluginsBackgroundWorker.RunWorkerAsync();
     }
 
@@ -320 +333 @@
       //ClearPluginsList(remotePluginsListView);
       refreshButton.Enabled = true;
-      serverUrlTextBox.Enabled = true;
       toolStripProgressBar.Visible = false;
       Cursor = Cursors.Default;
@@ -327 +339 @@
     private void UpdateControlsConnected() {
       refreshButton.Enabled = true;
-      serverUrlTextBox.Enabled = true;
       toolStripProgressBar.Visible = false;
       Cursor = Cursors.Default;
@@ -345 +356 @@
       installButton.Enabled = remotePluginInstaller.CheckedPlugins.Count() > 0;
     }
+
+    private void editConnectionButton_Click(object sender, EventArgs e) {
+      (new ConnectionSetupView()).ShowInForm();
+    }
   }
 }

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/LocalPluginManager.Designer.cs

@@ -57 +57 @@
       this.localPluginsListView.UseCompatibleStateImageBehavior = false;
       this.localPluginsListView.View = System.Windows.Forms.View.Details;
+      this.localPluginsListView.ItemActivate += new System.EventHandler(this.localPluginsListView_ItemActivate);
       this.localPluginsListView.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.pluginsListView_ItemChecked);
       // 

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/LocalPluginManager.cs

@@ -92 +92 @@
       if (ItemChecked != null) ItemChecked(this, e);
     }
+
+    private void localPluginsListView_ItemActivate(object sender, EventArgs e) {
+      if (localPluginsListView.SelectedItems.Count > 0) {
+        var plugin = (PluginDescription)localPluginsListView.SelectedItems[0].Tag;
+        PluginView pluginView = new PluginView(plugin);
+        pluginView.ShowInForm();
+      }
+    }
   }
 }