Changeset 4905 for branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive

Timestamp:

11/22/10 17:13:27 (14 years ago)

Author:

cneumuel

Message:

#1233

• added plugin management features
• took over client-GUI from old branch
• merged with bugfixes from old branch
• added hive-web (for IIS)

Location:

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj (modified) (4 diffs)
• HeuristicLab.Clients.Hive/3.3/HiveExperiment/HiveClient.cs (deleted)
• HeuristicLab.Clients.Hive/3.3/HiveExperiment/HiveExperimentClient.cs (modified) (13 diffs)
• HeuristicLab.Clients.Hive/3.3/HiveExperiment/HiveExperimentManagerClient.cs (added)
• HeuristicLab.Clients.Hive/3.3/HiveExperiment/HiveJobClient.cs (modified) (10 diffs)
• HeuristicLab.Clients.Hive/3.3/HiveExperiment/PluginClient.cs (added)
• HeuristicLab.Clients.Hive/3.3/Properties/Settings.Designer.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/ServiceLocator.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.3/app.config (modified) (1 diff)

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New

@@ -1 +1 @@
 *.suo
+Tests

@@ -1 +1 @@
 *.suo
+Tests

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj

@@ -45 +45 @@
       <HintPath>..\..\..\..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     </Reference>
-    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.2.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.Core-3.3">
       <HintPath>..\..\..\..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
@@ -61 +64 @@
       <HintPath>..\..\..\..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     </Reference>
-    <Reference Include="HeuristicLab.Tracing-3.3, Version=3.2.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Tracing-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -76 +82 @@
     <Compile Include="Exceptions\JobResultPollingException.cs" />
     <Compile Include="Exceptions\OptimizerNotFoundException.cs" />
+    <Compile Include="HiveExperiment\PluginClient.cs" />
     <Compile Include="Jobs\OptimizerJob.cs" />
     <Compile Include="HeuristicLabClientsHivePlugin.cs" />
-    <Compile Include="HiveExperiment\HiveClient.cs" />
+    <Compile Include="HiveExperiment\HiveExperimentManagerClient.cs" />
     <Compile Include="HiveExperiment\HiveJobClient.cs" />
     <Compile Include="HiveExperiment\HiveExperimentClient.cs" />
@@ -99 +106 @@
     <None Include="ServiceClients\GenerateServiceClients.cmd" />
     <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
+      <Generator>PublicSettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/HiveExperiment/HiveExperimentClient.cs

@@ -44 +44 @@
     private const string itemDescription = "A runner for a single experiment, which's algorithms are executed in the Hive.";
     private System.Timers.Timer timer;
+    private DateTime lastUpdateTime;
+    private Guid? rootJobId;
+    private JobResultPoller jobResultPoller;
 
     private Guid hiveExperimentId;
@@ -69 +72 @@
     }
 
-    private DateTime lastUpdateTime;
-
     private string resourceIds;
     public string ResourceIds {
@@ -82 +83 @@
     }
 
-    private Guid? rootJobId;
-
     private bool isPollingResults;
     public bool IsPollingResults {
@@ -111 +110 @@
     }
 
-    private JobResultPoller jobResultPoller;
-
-
-    public HiveExperimentClient()
-      : base(itemName, itemDescription) {
-      //this.ResourceIds = HeuristicLab.Hive.Experiment.Properties.Settings.Default.ResourceIds;
+    public HiveExperimentClient() : base(itemName, itemDescription) {
+      // TODO //this.ResourceIds = HeuristicLab.Hive.Experiment.Properties.Settings.Default.ResourceIds;
       this.ResourceIds = "MyGroup";
       this.log = new Log();
       InitTimer();
     }
-    public HiveExperimentClient(DT.HiveExperiment hiveExperimentDto)
-      : this() {
+    public HiveExperimentClient(DT.HiveExperiment hiveExperimentDto) : this() {
       UpdateFromDto(hiveExperimentDto);
     }
     protected HiveExperimentClient(HiveExperimentClient original, Cloner cloner)
       : base(original, cloner) {
-      this.resourceIds = original.resourceIds;
-      this.executionState = original.executionState;
-      this.executionTime = original.executionTime;
+      this.ResourceIds = original.resourceIds;
+      this.ExecutionState = original.executionState;
+      this.ExecutionTime = original.executionTime;
       this.log = cloner.Clone(original.log);
       this.lastUpdateTime = original.lastUpdateTime;
@@ -137 +131 @@
       return new HiveExperimentClient(this, cloner);
     }
-
 
     public void UpdateFromDto(DT.HiveExperiment hiveExperimentDto) {
@@ -143 +136 @@
       this.Name = hiveExperimentDto.Name;
       this.Description = hiveExperimentDto.Description;
-      //this.ResourceIds = hiveExperimentDto.ResourceIds;
+      // TODO: this.ResourceIds = hiveExperimentDto.ResourceIds;
       this.rootJobId = hiveExperimentDto.RootJobId;
     }
@@ -270 +263 @@
       jobCount++;
       this.progress.Status = string.Format("Serializing job {0} of {1}", jobCount, totalJobCount);
-      JobData serializedJob;
+      JobData jobData;
       if (hiveJob.OptimizerJob.ComputeInParallel &&
         (hiveJob.OptimizerJob.Optimizer is Optimization.Experiment || hiveJob.OptimizerJob.Optimizer is Optimization.BatchRun)) {
         hiveJob.Job.JobState = JobState.WaitingForChildJobs;
         hiveJob.OptimizerJob.CollectChildJobs = false; // don't collect child-jobs on slaves
-        serializedJob = hiveJob.GetAsSerializedJob(true);
+        jobData = hiveJob.GetAsJobData(true);
       } else {
-        serializedJob = hiveJob.GetAsSerializedJob(false);
-      }
-
-      this.progress.Status = string.Format("Uploading job {0} of {1} ({2} kb)", jobCount, totalJobCount, serializedJob.Data.Count() / 1024);
+        jobData = hiveJob.GetAsJobData(false);
+      }
+
+      this.progress.Status = string.Format("Uploading job {0} of {1} ({2} kb)", jobCount, totalJobCount, jobData.Data.Count() / 1024);
       this.progress.ProgressValue = (double)jobCount / totalJobCount;
 
       if (parentHiveJob != null) {
         //response = service.AddChildJob(parentHiveJob.Job.Id, serializedJob);
-        hiveJob.Job.Id = service.AddChildJob(parentHiveJob.Job.Id, hiveJob.Job, serializedJob);
+        hiveJob.Job.Id = service.AddChildJob(parentHiveJob.Job.Id, hiveJob.Job, jobData);
       } else {
         // response = service.AddJobWithGroupStrings(serializedJob, groups);
-        hiveJob.Job.Id = service.AddJob(hiveJob.Job, serializedJob);
+        hiveJob.Job.Id = service.AddJob(hiveJob.Job, jobData);
       }
 
@@ -467 +460 @@
             LogMessage(hj.Job.Id, "Downloading optimizer for job");
             OptimizerJob optimizerJob = LoadOptimizerJob(hj.Job.Id);
-            if (lightweightJob.ParentJobId.HasValue) {
-              HiveJob parentHiveJob = HiveJob.GetHiveJobByJobId(lightweightJob.ParentJobId.Value);
-              parentHiveJob.UpdateChildOptimizer(optimizerJob, hj.Job.Id);
+            if (optimizerJob == null) {
+              // something bad happened to this job. set to finished to allow the rest beeing downloaded
+              hj.IsFinishedOptimizerDownloaded = true;
             } else {
-              this.HiveJob.IsFinishedOptimizerDownloaded = true;
+              if (lightweightJob.ParentJobId.HasValue) {
+                HiveJob parentHiveJob = HiveJob.GetHiveJobByJobId(lightweightJob.ParentJobId.Value);
+                parentHiveJob.UpdateChildOptimizer(optimizerJob, hj.Job.Id);
+              } else {
+                this.HiveJob.IsFinishedOptimizerDownloaded = true;
+              }
             }
           }
@@ -541 +539 @@
           // download them first
           IDictionary<Guid, Job> allJobs = new Dictionary<Guid, Job>();
-          IDictionary<Guid, JobData> allSerializedJobs = new Dictionary<Guid, JobData>();
+          IDictionary<Guid, JobData> allJobDatas = new Dictionary<Guid, JobData>();
           foreach (LightweightJob lightweightJob in allResults) {
             jobCount++;
             progress.Status = string.Format("Downloading {0} of {1} jobs...", jobCount, totalJobCount);
             allJobs.Add(lightweightJob.Id, service.Obj.GetJob(lightweightJob.Id));
-            allSerializedJobs.Add(lightweightJob.Id, service.Obj.GetJobData(lightweightJob.Id));
+            allJobDatas.Add(lightweightJob.Id, service.Obj.GetJobData(lightweightJob.Id));
             progress.ProgressValue = (double)jobCount / totalJobCount;
           }
 
           jobCount = 1;
-          progress.Status = string.Format("Deserializing {0} of {1} jobs... ({2} kb)", jobCount, totalJobCount, allSerializedJobs[this.rootJobId.Value].Data.Count() / 1024);
-          this.HiveJob = new HiveJob(allJobs[this.rootJobId.Value], allSerializedJobs[this.rootJobId.Value], false);
-          allSerializedJobs.Remove(this.rootJobId.Value); // reduce memory footprint
+          progress.Status = string.Format("Deserializing {0} of {1} jobs... ({2} kb)", jobCount, totalJobCount, allJobDatas[this.rootJobId.Value].Data.Count() / 1024);
+          this.HiveJob = new HiveJob(allJobs[this.rootJobId.Value], allJobDatas[this.rootJobId.Value], false);
+          allJobDatas.Remove(this.rootJobId.Value); // reduce memory footprint
           allJobs.Remove(this.rootJobId.Value);
           progress.ProgressValue = (double)jobCount / totalJobCount;
@@ -570 +568 @@
 
           // build child-job tree
-          LoadChildResults(service.Obj, this.HiveJob, allResults, allJobs, allSerializedJobs, progress, totalJobCount, ref jobCount);
+          LoadChildResults(service.Obj, this.HiveJob, allResults, allJobs, allJobDatas, progress, totalJobCount, ref jobCount);
           StartResultPolling();
         }
@@ -582 +580 @@
     }
 
-    private void LoadChildResults(IHiveService service, HiveJob parentHiveJob, IEnumerable<LightweightJob> allResults, IDictionary<Guid, Job> allJobs, IDictionary<Guid, JobData> allSerializedJobs, IProgress progress, int totalJobCount, ref int jobCount) {
+    private void LoadChildResults(IHiveService service, HiveJob parentHiveJob, IEnumerable<LightweightJob> allResults, IDictionary<Guid, Job> allJobs, IDictionary<Guid, JobData> allJobDatas, IProgress progress, int totalJobCount, ref int jobCount) {
       IEnumerable<LightweightJob> childResults = from result in allResults
                                                  where result.ParentJobId.HasValue && result.ParentJobId.Value == parentHiveJob.Job.Id
@@ -589 +587 @@
       foreach (LightweightJob lightweightJob in childResults) {
         jobCount++;
-        progress.Status = string.Format("Deserializing {0} of {1} jobs ({2} kb)...", jobCount, totalJobCount, allSerializedJobs[lightweightJob.Id].Data.Count() / 1024);
-        OptimizerJob optimizerJob = PersistenceUtil.Deserialize<OptimizerJob>(allSerializedJobs[lightweightJob.Id].Data);
+        progress.Status = string.Format("Deserializing {0} of {1} jobs ({2} kb)...", jobCount, totalJobCount, allJobDatas[lightweightJob.Id].Data.Count() / 1024);
+        OptimizerJob optimizerJob = null;
+        try {
+          optimizerJob = PersistenceUtil.Deserialize<OptimizerJob>(allJobDatas[lightweightJob.Id].Data);
+        }
+        catch {
+          optimizerJob = null;
+        }
         progress.ProgressValue = (double)jobCount / totalJobCount;
         HiveJob childHiveJob = new HiveJob(optimizerJob, false);
         parentHiveJob.AddChildHiveJob(childHiveJob);
         childHiveJob.Job = allJobs[lightweightJob.Id];
-        allSerializedJobs.Remove(lightweightJob.Id); // reduce memory footprint
+        allJobDatas.Remove(lightweightJob.Id); // reduce memory footprint
         allJobs.Remove(lightweightJob.Id);
         if (jobCount % 10 == 0) GC.Collect(); // this is needed or otherwise HL takes over the system when the number of jobs is high
-        LoadChildResults(service, childHiveJob, allResults, allJobs, allSerializedJobs, progress, totalJobCount, ref jobCount);
+        LoadChildResults(service, childHiveJob, allResults, allJobs, allJobDatas, progress, totalJobCount, ref jobCount);
       }
     }
@@ -604 +608 @@
     private OptimizerJob LoadOptimizerJob(Guid jobId) {
       using (var service = ServiceLocator.Instance.ServicePool.GetService()) {
-        JobData serializedJob = service.Obj.GetJobData(jobId);
-        return PersistenceUtil.Deserialize<OptimizerJob>(serializedJob.Data);
+        JobData jobData = service.Obj.GetJobData(jobId);
+        try {
+          return PersistenceUtil.Deserialize<OptimizerJob>(jobData.Data);
+        }
+        catch {
+          return null;
+        }
       }
     }

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/HiveExperiment/HiveJobClient.cs

@@ -31 +31 @@
 using HeuristicLab.Services.Hive.Common.DataTransfer;
 using HeuristicLab.Clients.Hive.Jobs;
+using HeuristicLab.PluginInfrastructure;
+using System.IO;
+using HeuristicLab.PluginInfrastructure.Manager;
 
 namespace HeuristicLab.Clients.Hive {
 
+  [Item("Hive Job", "Represents a hive job.")]
   public class HiveJob : Item {
     private static object locker = new object();
@@ -136 +140 @@
     }
 
-    public HiveJob(Job job, JobData serializedJob, bool autoCreateChildHiveJobs)
+    public HiveJob(Job job, JobData jobData, bool autoCreateChildHiveJobs)
       : this() {
       this.syncJobsWithOptimizers = autoCreateChildHiveJobs;
       this.Job = job;
-      this.OptimizerJob = PersistenceUtil.Deserialize<OptimizerJob>(serializedJob.Data);
+      try {
+        this.OptimizerJob = PersistenceUtil.Deserialize<OptimizerJob>(jobData.Data);
+      }
+      catch {
+        this.OptimizerJob = null;
+      }
       this.syncJobsWithOptimizers = true;
     }
@@ -193 +202 @@
           batchRun.AlgorithmChanged += new EventHandler(batchRun_AlgorithmChanged);
         }
-
         OptimizerJob.ComputeInParallelChanged += new EventHandler(OptimizerJob_ComputeInParallelChanged);
         OptimizerJob.ToStringChanged += new EventHandler(OptimizerJob_ToStringChanged);
@@ -199 +207 @@
     }
     private void DergisterOptimizerEvents() {
-      if (Job != null && OptimizerJob.Optimizer is Optimization.Experiment) {
+      if (OptimizerJob != null) {
         if (OptimizerJob.Optimizer is Optimization.Experiment) {
           Optimization.Experiment experiment = OptimizerJob.OptimizerAsExperiment;
@@ -211 +219 @@
           batchRun.AlgorithmChanged -= new EventHandler(batchRun_AlgorithmChanged);
         }
-
         OptimizerJob.ComputeInParallelChanged -= new EventHandler(OptimizerJob_ComputeInParallelChanged);
         OptimizerJob.ToStringChanged -= new EventHandler(OptimizerJob_ToStringChanged);
@@ -285 +292 @@
       this.childHiveJobs.Add(hiveJob);
       syncJobsWithOptimizers = false;
-      if (this.OptimizerJob.Optimizer is Optimization.Experiment) {
-        if (!this.OptimizerJob.OptimizerAsExperiment.Optimizers.Contains(hiveJob.OptimizerJob.Optimizer)) {
-          UpdateOptimizerInExperiment(this.OptimizerJob.OptimizerAsExperiment, hiveJob.OptimizerJob);
-        }
-      } else if (this.OptimizerJob.Optimizer is Optimization.BatchRun) {
-        UpdateOptimizerInBatchRun(this.OptimizerJob.OptimizerAsBatchRun, hiveJob.OptimizerJob);
+      if (this.OptimizerJob != null && hiveJob.OptimizerJob != null) {
+        if (this.OptimizerJob.Optimizer is Optimization.Experiment) {
+          if (!this.OptimizerJob.OptimizerAsExperiment.Optimizers.Contains(hiveJob.OptimizerJob.Optimizer)) {
+            UpdateOptimizerInExperiment(this.OptimizerJob.OptimizerAsExperiment, hiveJob.OptimizerJob);
+          }
+        } else if (this.OptimizerJob.Optimizer is Optimization.BatchRun) {
+          UpdateOptimizerInBatchRun(this.OptimizerJob.OptimizerAsBatchRun, hiveJob.OptimizerJob);
+        }
       }
       syncJobsWithOptimizers = true;
@@ -305 +314 @@
       bool childIsFinishedOptimizerDownloaded = false;
 
-      if (this.OptimizerJob.Optimizer is Optimization.Experiment) {
-        UpdateOptimizerInExperiment(this.OptimizerJob.OptimizerAsExperiment, optimizerJob);
-        childIsFinishedOptimizerDownloaded = true;
-      } else if (this.OptimizerJob.Optimizer is Optimization.BatchRun) {
-        UpdateOptimizerInBatchRun(this.OptimizerJob.OptimizerAsBatchRun, optimizerJob);
-        if (this.OptimizerJob.OptimizerAsBatchRun.Repetitions == this.OptimizerJob.Optimizer.Runs.Count) {
+      if (this.OptimizerJob != null && this.OptimizerJob.Optimizer != null) {
+        if (this.OptimizerJob.Optimizer is Optimization.Experiment) {
+          UpdateOptimizerInExperiment(this.OptimizerJob.OptimizerAsExperiment, optimizerJob);
           childIsFinishedOptimizerDownloaded = true;
-        }
-      } else {
-        childIsFinishedOptimizerDownloaded = optimizerJob.Optimizer.ExecutionState == ExecutionState.Stopped;
+        } else if (this.OptimizerJob.Optimizer is Optimization.BatchRun) {
+          UpdateOptimizerInBatchRun(this.OptimizerJob.OptimizerAsBatchRun, optimizerJob);
+          if (this.OptimizerJob.OptimizerAsBatchRun.Repetitions == this.OptimizerJob.Optimizer.Runs.Count) {
+            childIsFinishedOptimizerDownloaded = true;
+          }
+        } else {
+          childIsFinishedOptimizerDownloaded = optimizerJob.Optimizer.ExecutionState == ExecutionState.Stopped;
+        }
       }
 
@@ -411 +422 @@
 
     /// <summary>
-    /// Creates a SerializedJob object containing the Job and the IJob-Object as byte[]
+    /// Creates a JobData object containing the Job and the IJob-Object as byte[]
     /// </summary>
     /// <param name="withoutChildOptimizers">
     ///   if true the Child-Optimizers will not be serialized (if the job contains an Experiment)
     /// </param>
-    public JobData GetAsSerializedJob(bool withoutChildOptimizers) {
+    public JobData GetAsJobData(bool withoutChildOptimizers) {
+      if (this.optimizerJob == null || this.optimizerJob.Optimizer == null)
+        return null;
+
       byte[] jobByteArray;
       if (withoutChildOptimizers && this.OptimizerJob.Optimizer is Optimization.Experiment) {
@@ -435 +449 @@
       UpdateRequiredPlugins();
 
-      JobData serializedJob = new JobData() {
+      JobData jobData = new JobData() {
         JobId = job.Id,
         Data = jobByteArray
       };
 
-      return serializedJob;
+      return jobData;
     }
 
@@ -447 +461 @@
     /// </summary>
     private void UpdateRequiredPlugins() {
-      //this.Job.PluginsNeeded = HivePluginInfoDto.FindPluginsNeeded(optimizerJob.GetType());
-      throw new NotImplementedException();
+      List<Guid> pluginList = new List<Guid>();
+
+      IEnumerable<IPluginDescription> neededPlugins = ApplicationManager.Manager.Plugins; //HivePluginInfoDto.FindPluginsNeeded(optimizerJob.GetType());
+      using (var service = ServiceLocator.Instance.ServicePool.GetService()) {
+        IEnumerable<Plugin> availablePlugins = service.Obj.GetAvailablePlugins();
+        foreach (IPluginDescription neededPlugin in neededPlugins) {
+          Plugin found = availablePlugins.Where(availablePlugin => availablePlugin.Name == neededPlugin.Name && availablePlugin.Version.Major == neededPlugin.Version.Major && availablePlugin.Version.Minor == neededPlugin.Version.Minor && availablePlugin.Version.Revision == neededPlugin.Version.Revision && availablePlugin.Version.MinorRevision == neededPlugin.Version.MinorRevision).SingleOrDefault();
+          if (found != null) {
+            pluginList.Add(found.Id);
+          } else {
+            Plugin p = new Plugin() { Name = neededPlugin.Name, Version = neededPlugin.Version };
+            List<PluginData> pluginDatas = new List<PluginData>();
+
+            foreach (IPluginFile pf in neededPlugin.Files) {
+              PluginData pluginData = new PluginData();
+
+              pluginData.Data = File.ReadAllBytes(pf.Name);
+              pluginDatas.Add(pluginData);
+            }
+            pluginList.Add(service.Obj.AddPlugin(p, pluginDatas));
+          }          
+        }
+      }
+      this.Job.PluginsNeededIds = pluginList;
     }
 

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/Properties/Settings.Designer.cs

@@ -14 +14 @@
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+    public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/ServiceLocator.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Clients.Hive {
-  internal class ServiceLocator {
+  public class ServiceLocator {
     private static ServiceLocator instance = null;
     private ServiceClientFactory<IHiveService> serviceFactory = null;
@@ -51 +51 @@
       get {
         if (serviceFactory == null) {
-          serviceFactory = new ServiceClientFactory<IHiveService>(Settings.Default.HiveUsername, Settings.Default.HivePassword, "TcpEndpoint");
+          serviceFactory = new ServiceClientFactory<IHiveService>(Settings.Default.HiveUsername, Settings.Default.HivePassword, "wsHttpBinding_IHiveService");
         }
         return serviceFactory;

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/app.config

@@ -4 +4 @@
         <bindings>
             <wsHttpBinding>
-                <binding name="HttpBinding" closeTimeout="00:01:00" openTimeout="00:01:00"
-                    receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false"
-                    transactionFlow="false" hostNameComparisonMode="StrongWildcard"
-                    maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
-                    messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true"
-                    allowCookies="false">
-                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-                        maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-                    <reliableSession ordered="true" inactivityTimeout="00:10:00"
-                        enabled="false" />
-                    <security mode="Message">
-                        <transport clientCredentialType="Windows" proxyCredentialType="None"
-                            realm="" />
-                        <message clientCredentialType="Windows" negotiateServiceCredential="true"
-                            algorithmSuite="Default" />
-                    </security>
+                <binding name="wsHttpBinding" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
+                  <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
+                  <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
+                  <security mode="Message">
+                    <transport clientCredentialType="Windows" proxyCredentialType="None" realm=""/>
+                    <message clientCredentialType="UserName" negotiateServiceCredential="true" algorithmSuite="Default"/>
+                  </security>
                 </binding>
-            </wsHttpBinding>
-        </bindings>
+              </wsHttpBinding>
+            </bindings>
         <client>
-            <endpoint address="http://localhost:9000/HiveService" binding="wsHttpBinding"
-                bindingConfiguration="HttpBinding" contract="HeuristicLab.Clients.Hive.IHiveService"
-                name="HttpBinding">
-                <identity>
-                    <userPrincipalName value="S0920454044@hagenberg.fhooe.at" />
-                </identity>
+            <endpoint address="http://localhost:9000/Hive-3.3" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding" contract="HeuristicLab.Services.Hive.Common.ServiceContracts.IHiveService" name="wsHttpBinding_IHiveService">
+              <identity>
+                <certificate encodedValue="AwAAAAEAAAAUAAAAfEKvcVixnJay+q4hCPFuO0JL5TQgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMTAxOTEwNTMxNVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXwC5TGcAffd/0oAWHtm0s6YXVXEgXgb1AYmBkkkhkKIFJG/e/Z0KSYbJepmSJD44W3oOAVm+x1DAsZxU79HahDYgWCuHLMm1TLpwSmYOQ0kV3pGHWHhiWV7h7oGLds/eqZ2EOpaNGryfEPnrA4VmxY91vV5/2BTeVSWG6F8lRKQIDAQABo0kwRzBFBgNVHQEEPjA8gBAR7kBnMRHO5gzThEqda0wWoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQADgYEAoPwEG4QTDXhlxERNDfsZmM2IhEpV42ppz1kEah2oYKDa/ElIMVtvqLv6flVtg18ENN/mEJWiHZ3NyP3qr2Pip+sh+/2WBiSbOaukES/CM7OJn9kJCImH7M/xqM8pxqY8IfgM6iBVrVj9uHqj3j2BBck+cYY8fKyh3CFifMIp6ac="/>
+              </identity>
             </endpoint>
         </client>

@@ -1 +1 @@
 *.suo
+Tests