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

Timestamp:

02/16/10 12:44:12 (14 years ago)

Author:

gkronber

Message:

Fixed service references in plugin infrastructure. #860 (Deployment server for plugin installation from web locations)

Location:

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced

Files:

• DeploymentService (added)
• DeploymentService/DeploymentService.cs (added)
• DeploymentService/PluginDescription.cs (added)
• DeploymentService/ProductDescription.cs (added)
• DeploymentService/RegenerateServiceClasses.cmd (added)
• DeploymentService/output.config (added)
• InstallationManager.cs (modified) (3 diffs)
• InstallationManagerConsole.cs (modified) (3 diffs)

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

@@ -27 +27 @@
 using System.IO;
 using System.ComponentModel;
-using UpdateService = HeuristicLab.PluginInfrastructure.PluginUpdateService;
 using System.Reflection;
 
@@ -185 +184 @@
       var pluginDescriptions = from name in pluginNames
                                select GetPluginDescription(name);
-      Dictionary<UpdateService.PluginDescription, string> matchingPlugins = new Dictionary<UpdateService.PluginDescription, string>();
+      Dictionary<DeploymentService.PluginDescription, string> matchingPlugins = new Dictionary<DeploymentService.PluginDescription, string>();
       foreach (var updateLocation in HeuristicLab.PluginInfrastructure.Properties.Settings.Default.UpdateLocations) {
-        using (var client = new UpdateService.UpdateClient("", updateLocation)) {
+        using (var client = new DeploymentService.UpdateClient("", updateLocation)) {
           var updateLocationMatchingPlugins = from desc in pluginDescriptions
                                               from info in client.GetPlugins()
                                               where desc.Name == info.Name
                                               select info;
-          foreach (UpdateService.PluginDescription info in updateLocationMatchingPlugins) {
+          foreach (DeploymentService.PluginDescription info in updateLocationMatchingPlugins) {
             // keep only the highest version of any plugin
             var existingPlugin = matchingPlugins.Keys.FirstOrDefault(x => x.Name == info.Name);
@@ -207 +206 @@
         var groupedInfos = matchingPlugins.GroupBy(x => x.Value);
         foreach (var group in groupedInfos) {
-          using (var client = new UpdateService.UpdateClient(group.Key)) {
+          using (var client = new DeploymentService.UpdateClient(group.Key)) {
             foreach (var info in group) {
               client.GetPlugin(info.Key);

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

@@ -27 +27 @@
 using System.IO;
 using System.ComponentModel;
-using UpdateService = HeuristicLab.PluginInfrastructure.PluginUpdateService;
+
 
 namespace HeuristicLab.PluginInfrastructure.Advanced {
@@ -44 +44 @@
     void installManager_PreUpdatePlugin(object sender, PluginInfrastructureCancelEventArgs e) {
       Console.WriteLine("Following plugins are updated:");
-      var infos = (IEnumerable<UpdateService.PluginDescription>)e.Entity;
+      var infos = (IEnumerable<PluginDescription>)e.Entity;
       foreach (var info in infos) {
         Console.WriteLine(info.Name + " " + info.Version);
@@ -54 +54 @@
 
     void installManager_PluginUpdated(object sender, PluginInfrastructureEventArgs e) {
-      foreach (var info in (IEnumerable<UpdateService.PluginDescription>)e.Entity)
+      foreach (var info in (IEnumerable<PluginDescription>)e.Entity)
         Console.WriteLine("Updated: {0}", info.Name);
     }