Changeset 4302 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts

Timestamp:

08/24/10 15:31:35 (14 years ago)

Author:

cneumuel

Message:

• made ServerConsole work with wsHttpBinding
• applied role-base restrictions to all WCF-Services
• made wcf-services work with certificates
• renamed ExecutionEngineFacade to ClientFacade

(#1168)

Location:

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3

Files:

• BusinessObjects/SlaveGroupDtoList.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts-3.3.csproj (modified) (1 diff)
• HiveRoles.cs (modified) (1 diff)
• Interfaces/IClientFacade.cs (added)
• Interfaces/IExecutionEngineFacade.cs (deleted)
• WcfSettings.cs (modified) (3 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/BusinessObjects/SlaveGroupDtoList.cs

@@ -6 +6 @@
 using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using System.Runtime.Serialization;
 
 namespace HeuristicLab.Hive.Contracts.BusinessObjects {
+  [CollectionDataContract]
   public class SlaveGroupDtoList : ObservableList<SlaveGroupDto>, IDeepCloneable {
 

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/HeuristicLab.Hive.Contracts-3.3.csproj

@@ -140 +140 @@
     <Compile Include="MultiStream.cs" />
     <Compile Include="Interfaces\ISlaveFacade.cs" />
-    <Compile Include="Interfaces\IExecutionEngineFacade.cs" />
+    <Compile Include="Interfaces\IClientFacade.cs" />
     <Compile Include="ResponseObjects\ResponseObject.cs" />
     <Compile Include="Interfaces\ISlaveManager.cs" />

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/HiveRoles.cs

@@ -6 +6 @@
 namespace HeuristicLab.Hive.Contracts {
   public static class HiveRoles {
-    public const string Administrator = "Administrator";
-    public const string Slave = "Slave";
+    public const string Administrator = "Hive.Administrator";
+    public const string Slave = "Hive.Slave";
+    public const string Client = "Hive.Client";
   }
 }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/WcfSettings.cs

@@ -8 +8 @@
 using System.Security.Cryptography.X509Certificates;
 using System.Net;
+using System.ServiceModel.Description;
 
 namespace HeuristicLab.Hive.Contracts {
   public static class WcfSettings {
+    public const string SlaveServiceName = "SlaveService";
+    public const string ServerConsoleServiceName = "ServerConsoleService";
+    public const string ClientServiceName = "ClientService";
 
-    public const string SERVERCERT = "HIVE-Server";
-    public const int DEFAULTPORT = 9000;
+    public const int DefaultPort = 9000;
     
     /// <summary>
@@ -74 +77 @@
     /// <returns></returns>
     public static IPAddress GetActiveIP() {
-      //return System.Net.NetworkInformation.IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections()[0].LocalEndPoint.Address.ToString();
-      IPAddress[] addresses;
-      addresses = Dns.GetHostAddresses(Dns.GetHostName());
-      int index = 0;
-      if (System.Environment.OSVersion.Version.Major >= 6) {
-        for (index = addresses.Length - 1; index >= 0; index--)
-          if (addresses[index].AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
-            break;
-      }
-      return addresses[index];
+      //return IPAddress.Parse("127.0.0.1");
+      return System.Net.NetworkInformation.IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections()[0].LocalEndPoint.Address;
+      //IPAddress[] addresses;
+      //addresses = Dns.GetHostAddresses(Dns.GetHostName());
+      //int index = 0;
+      //if (System.Environment.OSVersion.Version.Major >= 6) {
+      //  for (index = addresses.Length - 1; index >= 0; index--)
+      //    if (addresses[index].AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
+      //      break;
+      //}
+      //return addresses[index];
     }
 
@@ -91 +95 @@
     /// <returns></returns>
     public static int GetDefaultPort() {
-      return DEFAULTPORT;
+      return DefaultPort;
+    }
+    
+    /// <summary>
+    /// This method changes the endpoint-address while preserving the identity-certificate defined in the config file
+    /// </summary>
+    public static void SetEndpointAddress(ServiceEndpoint endpoint, string address) {
+      EndpointAddressBuilder builder = new EndpointAddressBuilder(endpoint.Address);
+      builder.Uri = new Uri(address);
+      endpoint.Address = builder.ToEndpointAddress();
     }
   }