Changeset 2816 for branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.Services.Deployment

Timestamp:

02/16/10 18:44:45 (14 years ago)

Author:

gkronber

Message:

Worked on plugin deployment GUI.
Added contact info and license text to DB schema.
#860

Location:

branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.Services.Deployment

Files:

• PluginDescription.cs (modified) (4 diffs)
• PluginStore.cs (modified) (4 diffs)
• ProductDescription.cs (modified) (1 diff)

branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.Services.Deployment/PluginDescription.cs

@@ -7 +7 @@
 namespace HeuristicLab.Services.Deployment {
   [DataContract(Name = "PluginDescription")]
-  public class PluginDescription  {
+  public class PluginDescription {
 
     [DataMember(Name = "Name")]
@@ -21 +21 @@
     }
 
+    [DataMember(Name = "ContactInformation")]
+    private string contactInformation;
+    public string ContactInformation {
+      get { return contactInformation; }
+    }
+
+    [DataMember(Name = "LicenseText")]
+    private string licenseText;
+    public string LicenseText {
+      get { return licenseText; }
+    }
 
     [DataMember(Name = "Dependencies")]
@@ -28 +39 @@
     }
 
-    public PluginDescription(string name, Version version, IEnumerable<PluginDescription> dependencies) {
+    public PluginDescription(string name, Version version, IEnumerable<PluginDescription> dependencies, string contactInformation, string license) {
+      if (string.IsNullOrEmpty(name)) throw new ArgumentException("name is empty");
+      if (version == null || dependencies == null || contactInformation == null || license == null) throw new ArgumentNullException();
       this.name = name;
       this.version = version;
-      this.dependencies = new List<PluginDescription>(dependencies); //.AsReadOnly();
+      this.dependencies = new List<PluginDescription>(dependencies);
+      this.licenseText = license;
+      this.contactInformation = contactInformation;
     }
 
@@ -37 +52 @@
       : this(name, version, Enumerable.Empty<PluginDescription>()) {
     }
+
+    public PluginDescription(string name, Version version, IEnumerable<PluginDescription> dependencies)
+      : this(name, version, dependencies, string.Empty, string.Empty) {
+    }
   }
 }

branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.Services.Deployment/PluginStore.cs

@@ -142 +142 @@
 
     private void UpdatePlugin(PluginStoreClassesDataContext ctx, Plugin pluginEntity, PluginDescription pluginDescription) {
+      // update plugin data
+      pluginEntity.License = pluginDescription.LicenseText;
+      pluginEntity.ContactInformation = pluginDescription.ContactInformation;
+      
       // delete cached entry
       if (pluginDescriptions.ContainsKey(pluginEntity)) pluginDescriptions.Remove(pluginEntity);
@@ -188 +192 @@
       if (!pluginDescriptions.ContainsKey(plugin)) {
         // no cached description -> create new
-        var desc = new PluginDescription(plugin.Name, new Version(plugin.Version), from dep in GetDependencies(ctx, plugin)
-                                                                                   select MakePluginDescription(ctx, dep));
+        var desc = new PluginDescription(plugin.Name,
+          new Version(plugin.Version),
+          from dep in GetDependencies(ctx, plugin)
+          select MakePluginDescription(ctx, dep),
+          plugin.ContactInformation ?? string.Empty,
+          plugin.License ?? string.Empty
+          );
         pluginDescriptions[plugin] = desc;
       }
@@ -199 +208 @@
       plugin.Name = pluginDescription.Name;
       plugin.Version = pluginDescription.Version.ToString();
+      plugin.ContactInformation = pluginDescription.ContactInformation;
+      plugin.License = pluginDescription.LicenseText;
       return plugin;
     }
@@ -206 +217 @@
       package.Data = pluginPackage;
       package.PluginId = plugin.Id;
-      package.FileName = string.Empty;
       return package;
     }

branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.Services.Deployment/ProductDescription.cs

@@ -27 +27 @@
 
     public ProductDescription(string name, Version version, IEnumerable<PluginDescription> plugins) {
+      if (string.IsNullOrEmpty(name)) throw new ArgumentException("name is empty");
+      if (version == null || plugins == null) throw new ArgumentNullException();
       this.name = name;
       this.version = version;