Changeset 3006 for branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.DeploymentService.AdminClient/PluginListView.cs

Timestamp:

03/11/10 18:23:52 (14 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)

File:

• branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.DeploymentService.AdminClient/PluginListView.cs (modified) (7 diffs)

branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.DeploymentService.AdminClient/PluginListView.cs

@@ -27 +27 @@
       Caption = "Plugins";
 
-      using (var client = new PluginDeploymentService.UpdateClient()) {
-        serverUrlTextBox.Text = client.Endpoint.Address.ToString();
-      }
-
       localAndServerPlugins = new Dictionary<IPluginDescription, PluginDeploymentService.PluginDescription>();
 
@@ -79 +75 @@
     void updateServerPluginsWorker_DoWork(object sender, DoWorkEventArgs e) {
       try {
-        using (var client = new PluginDeploymentService.UpdateClient()) {
-          e.Result = client.GetPlugins();
-          e.Cancel = false;
-        }
+        var client = PluginDeploymentService.UpdateClientFactory.CreateClient();
+        e.Result = client.GetPlugins();
+        e.Cancel = false;
       }
       catch (EndpointNotFoundException) {
@@ -110 +105 @@
       try {
         var selectedPlugins = (IEnumerable<IPluginDescription>)e.Argument;
-        using (PluginDeploymentService.AdminClient adminClient = new PluginDeploymentService.AdminClient()) {
-
-          foreach (var plugin in IteratePlugins(selectedPlugins)) {
-            adminClient.DeployPlugin(MakePluginDescription(plugin), CreateZipPackage(plugin));
-          }
+        PluginDeploymentService.AdminClient adminClient = PluginDeploymentService.AdminClientFactory.CreateClient();
+
+        foreach (var plugin in IteratePlugins(selectedPlugins)) {
+         adminClient.DeployPlugin(MakePluginDescription(plugin), CreateZipPackage(plugin));
         }
         e.Cancel = false;
@@ -142 +136 @@
 
     private void connectButton_Click(object sender, EventArgs e) {
-      if (connectButton.Text == "Connect") {
-        DisableControl();
-        RefreshPluginsAsync();
-      } else {
-        UpdateControlsDisconnectedState();
-      }
+      var connectionSetupView = new ConnectionSetupView();
+      connectionSetupView.Show();
     }
 
@@ -226 +216 @@
       var dependencies = from dep in plugin.Dependencies
                          select MakePluginDescription(dep);
-      if (string.IsNullOrEmpty(plugin.ContactName) || string.IsNullOrEmpty(plugin.ContactEmail)) {
-        return new PluginDeploymentService.PluginDescription(plugin.Name, plugin.Version, dependencies);
-      } else return new PluginDeploymentService.PluginDescription(plugin.Name, plugin.Version, dependencies, plugin.ContactName, plugin.ContactEmail, plugin.LicenseText);
+      return new PluginDeploymentService.PluginDescription(plugin.Name, plugin.Version, dependencies, plugin.ContactName, plugin.ContactEmail, plugin.LicenseText);
     }
 
@@ -256 +244 @@
 
     private void UpdateControlsDisconnectedState() {
-      connectButton.Text = "Connect";
-      serverUrlTextBox.Enabled = true;
-      serverUrlLabel.Enabled = true;
+      connectionSetupButton.Text = "Connect";
       refreshButton.Enabled = false;
 
@@ -269 +255 @@
 
     private void UpdateControlsConnectedState() {
-      connectButton.Text = "Disconnect";
-      connectButton.Enabled = true;
-      serverUrlTextBox.Enabled = false;
-      serverUrlLabel.Enabled = false;
+      connectionSetupButton.Text = "Disconnect";
+      connectionSetupButton.Enabled = true;
       refreshButton.Enabled = true;
       listView.Enabled = true;