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

Timestamp:

02/24/10 14:34:07 (15 years ago)

Author:

gkronber

Message:

• replaced column ContactInformation with ContactName and ContactEmail in DB-schema and updated WCF deployment service
• regenerated proxy classes
• made PluginDescription from data contract implement IPluginDescription from plugin infrastructure
• updated GUI on request by swagner (icons)
• fixed problems in the upload plugins control.

#860 (Deployment server for plugin installation from web locations)

Location:

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

Files:

• PluginDescription.cs (modified) (3 diffs)
• PluginStore.cs (modified) (3 diffs)

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

@@ -21 +21 @@
     }
 
-    [DataMember(Name = "ContactInformation")]
-    private string contactInformation;
-    public string ContactInformation {
-      get { return contactInformation; }
+    [DataMember(Name = "ContactName")]
+    private string contactName;
+    public string ContactName {
+      get { return contactName; }
+    }
+
+    [DataMember(Name = "ContactEmail")]
+    private string contactEmail;
+    public string ContactEmail {
+      get { return contactEmail; }
     }
 
@@ -39 +45 @@
     }
 
-    public PluginDescription(string name, Version version, IEnumerable<PluginDescription> dependencies, string contactInformation, string license) {
+    public PluginDescription(string name, Version version, IEnumerable<PluginDescription> dependencies, 
+      string contactName, string contactEmail, string license) {
       if (string.IsNullOrEmpty(name)) throw new ArgumentException("name is empty");
-      if (version == null || dependencies == null || contactInformation == null || license == null) throw new ArgumentNullException();
+      if (version == null || dependencies == null ||
+        contactName == null || contactEmail == null ||
+        license == null) throw new ArgumentNullException();
       this.name = name;
       this.version = version;
       this.dependencies = new List<PluginDescription>(dependencies);
       this.licenseText = license;
-      this.contactInformation = contactInformation;
+      this.contactName = contactName;
+      this.contactEmail = contactEmail;
     }
 
@@ -54 +64 @@
 
     public PluginDescription(string name, Version version, IEnumerable<PluginDescription> dependencies)
-      : this(name, version, dependencies, string.Empty, string.Empty) {
+      : this(name, version, dependencies, string.Empty, string.Empty, string.Empty) {
     }
   }

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

@@ -144 +144 @@
       // update plugin data
       pluginEntity.License = pluginDescription.LicenseText;
-      pluginEntity.ContactInformation = pluginDescription.ContactInformation;
-      
+      pluginEntity.ContactName = pluginDescription.ContactName;
+      pluginEntity.ContactEmail = pluginDescription.ContactEmail;
+
       // delete cached entry
       if (pluginDescriptions.ContainsKey(pluginEntity)) pluginDescriptions.Remove(pluginEntity);
@@ -196 +197 @@
           from dep in GetDependencies(ctx, plugin)
           select MakePluginDescription(ctx, dep),
-          plugin.ContactInformation ?? string.Empty,
+          plugin.ContactName ?? string.Empty,
+          plugin.ContactEmail ?? string.Empty,
           plugin.License ?? string.Empty
           );
@@ -208 +210 @@
       plugin.Name = pluginDescription.Name;
       plugin.Version = pluginDescription.Version.ToString();
-      plugin.ContactInformation = pluginDescription.ContactInformation;
+      plugin.ContactName = pluginDescription.ContactName;
+      plugin.ContactEmail = pluginDescription.ContactEmail;
       plugin.License = pluginDescription.LicenseText;
       return plugin;