Changeset 4296 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/ServiceLocator.cs

Timestamp:

08/23/10 17:49:43 (14 years ago)

Author:

cneumuel

Message:

corrected assembly reference paths, added some missing files

File:

• branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/ServiceLocator.cs (modified) (3 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/ServiceLocator.cs

@@ -14 +14 @@
     internal static string Address { get; set; }
     internal static string Port { get; set; }
+    internal static string Username { get; set; }
+    // [chn] TODO: Don't store plaintext password in memory!
+    internal static string Password { get; set; }
 
     internal static ISlaveManager GetSlaveManager() {
@@ -24 +27 @@
 
     internal static IServerConsoleFacade GetServerConsoleFacade() {
-      if (serverConsoleFacade == null &&
-        Address != String.Empty &&
-        Port != String.Empty) {
+      if (serverConsoleFacade == null && Address != String.Empty && Port != String.Empty) {
+        //ChannelFactory<IServerConsoleFacade> factory =
+        //  new ChannelFactory<IServerConsoleFacade>(
+        //    WcfSettings.GetBinding(),
+        //    new EndpointAddress("net.tcp://" + Address + ":" + Port + "/HiveServerConsole/ServerConsoleFacade"));
 
         ChannelFactory<IServerConsoleFacade> factory =
           new ChannelFactory<IServerConsoleFacade>(
             WcfSettings.GetBinding(),
-            new EndpointAddress("net.tcp://" + Address + ":" + Port + "/HiveServerConsole/ServerConsoleFacade"));
-                         
+            new EndpointAddress("http://" + Address + ":" + Port + "/HiveServerConsole"));
+
+        factory.Credentials.UserName.UserName = Username;
+        factory.Credentials.UserName.Password = Password;
         serverConsoleFacade = factory.CreateChannel();
         ((ICommunicationObject)serverConsoleFacade).Faulted += ServiceLocator_Faulted;
       }
-      
       return serverConsoleFacade;
     }
@@ -49 +55 @@
       serverConsoleFacade = null;
     }
+
   }
 }