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

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.Experiment/3.3

Files:

• HiveExperiment.cs (modified) (10 diffs)
• ServiceLocator.cs (modified) (1 diff)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs

@@ -279 +279 @@
 
       Thread t = new Thread(() => {
-        IExecutionEngineFacade executionEngineFacade = GetExecutionEngineFacade();
+        IClientFacade clientFacade = GetClientFacade();
 
         try {
@@ -292 +292 @@
           foreach (IOptimizer optimizer in parentOptimizersByPendingOptimizer.Keys) {
             SerializedJob serializedJob = CreateSerializedJob(optimizer);
-            ResponseObject<JobDto> response = executionEngineFacade.AddJobWithGroupStrings(serializedJob, groups);
+            ResponseObject<JobDto> response = clientFacade.AddJobWithGroupStrings(serializedJob, groups);
             lock (pendingOptimizersByJobId) {
               pendingOptimizersByJobId.Add(response.Obj.Id, optimizer);
@@ -468 +468 @@
     private void FetchAndUpdateJob(Guid jobId) {
       LogMessage(jobId, "FetchAndUpdateJob started");
-      IExecutionEngineFacade executionEngineFacade = GetExecutionEngineFacade();
+      IClientFacade clientFacade = GetClientFacade();
       IOptimizer originalOptimizer;
       lock (pendingOptimizersByJobId) {
@@ -475 +475 @@
 
       fetchJobSemaphore.WaitOne();
-      ResponseObject<SerializedJob> jobResponse = executionEngineFacade.GetLastSerializedResult(jobId, false, false);
+      ResponseObject<SerializedJob> jobResponse = clientFacade.GetLastSerializedResult(jobId, false, false);
       IJob restoredObject = XmlParser.Deserialize<IJob>(new MemoryStream(jobResponse.Obj.SerializedJobData));
       IOptimizer restoredOptimizer = ((OptimizerJob)restoredObject).Optimizer;
@@ -490 +490 @@
 
     public void AbortJob(Guid jobId) {
-      IExecutionEngineFacade executionEngineFacade = GetExecutionEngineFacade();
-      Response response = executionEngineFacade.AbortJob(jobId);
+      IClientFacade clientFacade = GetClientFacade();
+      Response response = clientFacade.AbortJob(jobId);
       LogMessage(jobId, "Aborting Job: " + response.StatusMessage);
     }
@@ -554 +554 @@
         try {
           do {
-            IExecutionEngineFacade executionEngineFacade = GetExecutionEngineFacade();
+            IClientFacade clientFacade = GetClientFacade();
             IEnumerable<Guid> jobIdsToQuery = from job in JobItems
                                               where job.State != JobState.Finished &&
@@ -562 +562 @@
               LogMessage("Polling results for " + jobIdsToQuery.Count() + " jobs");
               try {
-                ResponseObject<JobResultList> response = executionEngineFacade.GetJobResults(jobIdsToQuery);
+                ResponseObject<JobResultList> response = clientFacade.GetJobResults(jobIdsToQuery);
                 if (response.StatusMessage == ResponseStatus.Ok) {
                   JobResultList jobItemList = response.Obj;
@@ -601 +601 @@
     public void RequestSnapshot(Guid jobId) {
       Thread t = new Thread(() => {
-        IExecutionEngineFacade executionEngineFacade = GetExecutionEngineFacade();
+        IClientFacade clientFacade = GetClientFacade();
         ResponseObject<SerializedJob> response;
         int retryCount = 0;
 
-        Response snapShotResponse = executionEngineFacade.RequestSnapshot(jobId);
+        Response snapShotResponse = clientFacade.RequestSnapshot(jobId);
         if (snapShotResponse.StatusMessage == ResponseStatus.RequestSnapshot_JobIsNotBeeingCalculated) {
           // job already finished
           Logger.Debug("HiveExperiment: Abort - GetLastResult(false)");
-          response = executionEngineFacade.GetLastSerializedResult(jobId, false, false);
+          response = clientFacade.GetLastSerializedResult(jobId, false, false);
           Logger.Debug("HiveExperiment: Abort - Server: " + response.StatusMessage);
         } else {
@@ -617 +617 @@
             Thread.Sleep(snapshotPollingIntervalMs);
             Logger.Debug("HiveExperiment: Abort - GetLastResult(true)");
-            response = executionEngineFacade.GetLastSerializedResult(jobId, false, true);
+            response = clientFacade.GetLastSerializedResult(jobId, false, true);
             Logger.Debug("HiveExperiment: Abort - Server: " + response.StatusMessage);
             retryCount++;
@@ -876 +876 @@
 
     #region Helper Functions
-    private IExecutionEngineFacade GetExecutionEngineFacade() {
-      IExecutionEngineFacade executionEngineFacade = null;
+    private IClientFacade GetClientFacade() {
+      IClientFacade clientFacade = null;
       do {
         try {
-          executionEngineFacade = ServiceLocator.CreateExecutionEngineFacade(ServerUrl);
+          clientFacade = ServiceLocator.CreateClientFacade(ServerUrl);
         } catch (EndpointNotFoundException exception) {
           LogMessage("Could not connect to Server: " + exception.Message + ". Will try again in " + (resultPollingIntervalMs / 1000) + " sec.");
           Thread.Sleep(resultPollingIntervalMs);
         }
-      } while (executionEngineFacade == null && this.ExecutionState != Core.ExecutionState.Stopped);
-      return executionEngineFacade;
+      } while (clientFacade == null && this.ExecutionState != Core.ExecutionState.Stopped);
+      return clientFacade;
     }
 

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/ServiceLocator.cs

@@ -30 +30 @@
 namespace HeuristicLab.Hive.Experiment {
   internal class ServiceLocator {
-    internal static IExecutionEngineFacade CreateExecutionEngineFacade(string url) {
-      ChannelFactory<IExecutionEngineFacade> factory = new ChannelFactory<IExecutionEngineFacade>(
+    internal static IClientFacade CreateClientFacade(string url) {
+      ChannelFactory<IClientFacade> factory = new ChannelFactory<IClientFacade>(
           WcfSettings.GetStreamedBinding(),
           new EndpointAddress(url));