Changeset 741

Timestamp:

11/13/08 15:14:04 (15 years ago)

Author:

svonolfe

Message:

Server interface implementation (#351)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Server.Core/ClientCommunicator.cs (added)
• HeuristicLab.Hive.Server.Core/HeuristicLab.Hive.Server.Core.csproj (modified) (2 diffs)
• HeuristicLab.Hive.Server/BusinessObjects/Client.cs (modified) (1 diff)
• HeuristicLab.Hive.Server/HeuristicLab.Hive.Server.csproj (modified) (3 diffs)
• HeuristicLab.Hive.Server/HiveServerApplication.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server/Interfaces/IClientCommunicator.cs (modified) (1 diff)
• HeuristicLab.Hive.Server/Interfaces/Response.cs (deleted)
• HeuristicLab.Hive.Server/MainForm.Designer.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server/MainForm.cs (modified) (1 diff)
• HeuristicLab.Hive.Server/Response.cs (added)

trunk/sources/HeuristicLab.Hive.Server.Core/HeuristicLab.Hive.Server.Core.csproj

@@ -48 +48 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ClientCommunicator.cs" />
     <Compile Include="HiveServerCorePlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -56 +57 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\HeuristicLab.Hive.Server\HeuristicLab.Hive.Server.csproj">
+      <Project>{A04AE929-D0E1-466D-A9D3-BF3C4B2C209F}</Project>
+      <Name>HeuristicLab.Hive.Server</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>

trunk/sources/HeuristicLab.Hive.Server/BusinessObjects/Client.cs

@@ -24 +24 @@
 using System.Linq;
 using System.Text;
+using System.Runtime.Serialization;
 
 namespace HeuristicLab.Hive.Server.BusinessObjects {
-  class Client {
+  [DataContract]
+  public class Client {
+    [DataMember]
     public Guid ClientId { get; set; }
   }

trunk/sources/HeuristicLab.Hive.Server/HeuristicLab.Hive.Server.csproj

@@ -40 +40 @@
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
+    <Reference Include="System.Runtime.Serialization">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.ServiceModel">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Xml.Linq">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -53 +59 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="BusinessObjects\Client.cs" />
+    <Compile Include="Interfaces\IClientCommunicator.cs" />
+    <Compile Include="Response.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="HiveServerPlugin.cs" />
@@ -92 +101 @@
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Interfaces\" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

trunk/sources/HeuristicLab.Hive.Server/HiveServerApplication.cs

@@ -25 +25 @@
 using System.Windows.Forms;
 using HeuristicLab.PluginInfrastructure;
+using System.ServiceModel;
+using HeuristicLab.Hive.Server.Interfaces;
 
 namespace HeuristicLab.Hive.Server {
@@ -31 +33 @@
       AutoRestart = true)]
   class HiveServerApplication : ApplicationBase {
+
+    private bool Startup() {
+      return true;
+    }
+
     public override void Run() {
-      Form mainForm = new MainForm();
-      Application.Run(mainForm);
+
+      DiscoveryService discService =
+        new DiscoveryService();
+
+      IClientCommunicator[] instances = 
+        discService.GetInstances<IClientCommunicator>();
+
+      if (instances.Length > 0) {
+        ServiceHost serviceHost =
+                new ServiceHost(instances[0].GetType());
+
+        serviceHost.Open();
+
+        Form mainForm = new MainForm(serviceHost.BaseAddresses[0]);
+        Application.Run(mainForm);
+
+        serviceHost.Close();
+      } else {
+        MessageBox.Show("Error - no ClientCommunicator instance");
+      }
     }
   }

trunk/sources/HeuristicLab.Hive.Server/Interfaces/IClientCommunicator.cs

@@ -32 +32 @@
   /// </summary>
   [ServiceContract]
-  interface IClientCommunicator {
+  public interface IClientCommunicator {
     [OperationContract]
     Response Login(Client clientInfo);

trunk/sources/HeuristicLab.Hive.Server/MainForm.Designer.cs

@@ -29 +29 @@
         private void InitializeComponent()
         {
+          this.label1 = new System.Windows.Forms.Label();
+          this.lblAddress = new System.Windows.Forms.Label();
           this.SuspendLayout();
+          // 
+          // label1
+          // 
+          this.label1.AutoSize = true;
+          this.label1.Location = new System.Drawing.Point(18, 18);
+          this.label1.Name = "label1";
+          this.label1.Size = new System.Drawing.Size(113, 13);
+          this.label1.TabIndex = 0;
+          this.label1.Text = "Hive server running @";
+          // 
+          // lblAddress
+          // 
+          this.lblAddress.AutoSize = true;
+          this.lblAddress.Location = new System.Drawing.Point(18, 43);
+          this.lblAddress.Name = "lblAddress";
+          this.lblAddress.Size = new System.Drawing.Size(44, 13);
+          this.lblAddress.TabIndex = 1;
+          this.lblAddress.Text = "address";
           // 
           // MainForm
@@ -35 +55 @@
           this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
           this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-          this.ClientSize = new System.Drawing.Size(292, 273);
+          this.ClientSize = new System.Drawing.Size(304, 78);
+          this.Controls.Add(this.lblAddress);
+          this.Controls.Add(this.label1);
           this.Name = "MainForm";
           this.Text = "Hive Server Console";
           this.ResumeLayout(false);
+          this.PerformLayout();
 
         }
 
         #endregion
+
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label lblAddress;
     }
 }

trunk/sources/HeuristicLab.Hive.Server/MainForm.cs

@@ -10 +10 @@
 namespace HeuristicLab.Hive.Server
 {
-    public partial class MainForm : Form
-    {
-        public MainForm()
-        {
-            InitializeComponent();
+    public partial class MainForm : Form {
+        public MainForm(Uri address) {
+          InitializeComponent();
+          if(address != null)
+            this.lblAddress.Text = address.ToString();
         }
     }