Changeset 2860 for trunk

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:

trunk/sources/HeuristicLab.PluginInfrastructure

Files:

• Advanced/DeploymentService/DeploymentService.cs (modified) (2 diffs)
• Advanced/DeploymentService/PluginDescription.cs (modified) (1 diff)
• Advanced/DeploymentService/ProductDescription.cs (modified) (1 diff)
• app.config (modified) (4 diffs)

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

@@ -22 +22 @@
         private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
         
-        private string ContactInformationField;
+        private string ContactEmailField;
+        
+        private string ContactNameField;
         
         private HeuristicLab.PluginInfrastructure.Advanced.DeploymentService.PluginDescription[] DependenciesField;
@@ -45 +47 @@
         
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public string ContactInformation
-        {
-            get
-            {
-                return this.ContactInformationField;
-            }
-            set
-            {
-                this.ContactInformationField = value;
+        public string ContactEmail
+        {
+            get
+            {
+                return this.ContactEmailField;
+            }
+            set
+            {
+                this.ContactEmailField = value;
+            }
+        }
+        
+        [System.Runtime.Serialization.DataMemberAttribute()]
+        public string ContactName
+        {
+            get
+            {
+                return this.ContactNameField;
+            }
+            set
+            {
+                this.ContactNameField = value;
             }
         }

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/DeploymentService/PluginDescription.cs

@@ -31 +31 @@
 namespace HeuristicLab.PluginInfrastructure.Advanced.DeploymentService {
   // extension of auto-generated DataContract class PluginDescription
-  public partial class PluginDescription {
+  public partial class PluginDescription : IPluginDescription {
     public PluginDescription(string name, Version version) : this(name, version, new List<PluginDescription>()) { }
     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) {
     }
 
-    public PluginDescription(string name, Version version, IEnumerable<PluginDescription> dependencies, string contactInformation, string licenseText) {
+    public PluginDescription(string name, Version version, IEnumerable<PluginDescription> dependencies, string contactName, string contactEmail, string licenseText) {
       this.Name = name;
       this.Version = version;
       this.Dependencies = dependencies.ToArray();
-      this.ContactInformation = contactInformation;
       this.LicenseText = licenseText;
     }
+
+    #region IPluginDescription Members
+
+
+    [Obsolete]
+    public DateTime BuildDate {
+      get { throw new NotImplementedException(); }
+    }
+
+    IEnumerable<IPluginDescription> IPluginDescription.Dependencies {
+      get {
+        return Dependencies;
+      }
+    }
+
+    public IEnumerable<IPluginFile> Files {
+      get { return Enumerable.Empty<IPluginFile>(); }
+    }
+
+    #endregion
   }
 }

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/DeploymentService/ProductDescription.cs

@@ -31 +31 @@
 namespace HeuristicLab.PluginInfrastructure.Advanced.DeploymentService {
   // extension of auto-generated DataContract class ProductDescription
-  public partial class ProductDescription {
+  public partial class ProductDescription  {
     public ProductDescription(string name, Version version)
       : this(name, version, new List<PluginDescription>()) {

trunk/sources/HeuristicLab.PluginInfrastructure/app.config

@@ -27 +27 @@
         <bindings>
             <wsHttpBinding>
-                <binding name="WSHttpBinding_IUpdate2" closeTimeout="00:01:00"
+                <binding name="WSHttpBinding_IUpdate" closeTimeout="00:01:00"
                     openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
                     bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard"
@@ -44 +44 @@
                     </security>
                 </binding>
-                <binding name="WSHttpBinding_IAdmin2" closeTimeout="00:01:00"
+                <binding name="WSHttpBinding_IAdmin" closeTimeout="00:01:00"
                     openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
                     bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard"
@@ -65 +65 @@
         <client>
             <endpoint address="http://localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Update/"
-                binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IUpdate2"
+                binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IUpdate"
                 contract="HeuristicLab.PluginInfrastructure.Advanced.DeploymentService.IUpdate"
-                name="WSHttpBinding_IUpdate2">
+                name="WSHttpBinding_IUpdate">
                 <identity>
                     <dns value="localhost" />
@@ -73 +73 @@
             </endpoint>
             <endpoint address="http://localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Admin/"
-                binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IAdmin2"
+                binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IAdmin"
                 contract="HeuristicLab.PluginInfrastructure.Advanced.DeploymentService.IAdmin"
-                name="WSHttpBinding_IAdmin2">
+                name="WSHttpBinding_IAdmin">
                 <identity>
                     <dns value="localhost" />