Changeset 5055 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4

Timestamp:

12/07/10 11:19:33 (14 years ago)

Author:

cneumuel

Message:

#1233

• added test project

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4

Files:

• HeuristicLab.Clients.Hive-3.4.csproj (modified) (2 diffs)
• HiveExperiment/HiveExperimentClient.cs (modified) (5 diffs)
• HiveExperiment/HiveExperimentManagerClient.cs (modified) (3 diffs)
• HiveExperiment/HiveJobClient.cs (modified) (1 diff)
• HiveExperiment/JobResultPoller.cs (modified) (2 diffs)
• HiveExperiment/PluginClient.cs (modified) (1 diff)
• IServiceLocator.cs (added)
• ServiceClients/ServiceClientFactory.cs (deleted)
• ServiceLocator.cs (modified) (2 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HeuristicLab.Clients.Hive-3.4.csproj

@@ -84 +84 @@
     <Compile Include="Exceptions\OptimizerNotFoundException.cs" />
     <Compile Include="HiveExperiment\PluginClient.cs" />
+    <Compile Include="IServiceLocator.cs" />
     <Compile Include="Jobs\OptimizerJob.cs" />
     <Compile Include="HeuristicLabClientsHivePlugin.cs" />
@@ -96 +97 @@
     <Compile Include="PersistenceUtil.cs" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
-    <Compile Include="ServiceClients\ServiceClientFactory.cs" />
     <Compile Include="Exceptions\ServiceClientFactoryException.cs" />
     <Compile Include="ServiceLocator.cs" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HiveExperiment/HiveExperimentClient.cs

@@ -34 +34 @@
   using HeuristicLab.Services.Hive.Common.DataTransfer;
   using HeuristicLab.Clients.Hive.Jobs;
+  using HeuristicLab.Clients.Common;
 
   /// <summary>
@@ -223 +224 @@
         this.progress = new Progress("Connecting to server...");
         IsProgressing = true;
-        using (Disposable<IHiveService> service = ServiceLocator.Instance.ServicePool.GetService()) {
+        using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
           IEnumerable<string> groups = ToResourceIdList(this.ResourceIds);
           this.HiveJob.SetIndexInParentOptimizerList(null);
@@ -303 +304 @@
 
     public void Stop() {
-      using (Disposable<IHiveService> service = ServiceLocator.Instance.ServicePool.GetService()) {
+      using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
         foreach (HiveJob hj in HiveJob.GetAllHiveJobs()) {
           service.Obj.StopJob(hj.Job.Id);
@@ -531 +532 @@
         int jobCount = 0;
         progress.Status = "Connecting to Server...";
-        using (var service = ServiceLocator.Instance.ServicePool.GetService()) {
+        using (var service = ServiceLocator.Instance.GetService()) {
           // fetch all Job objects to create the full tree of tree of HiveJob objects
           progress.Status = "Downloading list of jobs...";
@@ -607 +608 @@
 
     private OptimizerJob LoadOptimizerJob(Guid jobId) {
-      using (var service = ServiceLocator.Instance.ServicePool.GetService()) {
+      using (var service = ServiceLocator.Instance.GetService()) {
         JobData jobData = service.Obj.GetJobData(jobId);
         try {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HiveExperiment/HiveExperimentManagerClient.cs

@@ -32 +32 @@
   using HeuristicLab.Common;
   using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+  using HeuristicLab.Clients.Common;
 
   [Item("Hive Client", "Connects to Hive and lists all submitted experiments by the current user.")]
@@ -96 +97 @@
           this.HiveExperiments = new ItemList<HiveExperimentClient>();
         }
-        using (var service = ServiceLocator.Instance.ServicePool.GetService()) {
+        using (var service = ServiceLocator.Instance.GetService()) {
           currentlyUpdating = true;
           IEnumerable<DT.HiveExperiment> response = service.Obj.GetHiveExperiments();
@@ -138 +139 @@
     void hiveExperiments_ItemsRemoved(object sender, Collections.CollectionItemsChangedEventArgs<Collections.IndexedItem<HiveExperimentClient>> e) {
       if (!currentlyUpdating) {
-        using (Disposable<IHiveService> service = ServiceLocator.Instance.ServicePool.GetService()) {
+        using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
           foreach (IndexedItem<HiveExperimentClient> item in e.Items) {
             if (item.Value.HiveExperimentId != Guid.Empty) {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HiveExperiment/HiveJobClient.cs

@@ -464 +464 @@
       
       IEnumerable<IPluginDescription> neededPlugins = ApplicationManager.Manager.Plugins; //HivePluginInfoDto.FindPluginsNeeded(optimizerJob.GetType());
-      using (var service = ServiceLocator.Instance.ServicePool.GetService()) {
+      using (var service = ServiceLocator.Instance.GetService()) {
         IEnumerable<Plugin> availablePlugins = service.Obj.GetPlugins();
         foreach (IPluginDescription neededPlugin in neededPlugins) {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HiveExperiment/JobResultPoller.cs

@@ -27 +27 @@
 using HeuristicLab.Services.Hive.Common.DataTransfer;
 using System.Collections.Generic;
+using HeuristicLab.Clients.Common;
 
 namespace HeuristicLab.Clients.Hive {
@@ -95 +96 @@
 
     private void FetchJobResults() {
-      using (Disposable<IHiveService> service = ServiceLocator.Instance.ServicePool.GetService()) {
+      using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
         IEnumerable<LightweightJob> response = service.Obj.GetLightweightChildJobs(hiveJob.Job.Id, true, true);
         OnJobResultsReceived(response);

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HiveExperiment/PluginClient.cs

@@ -16 +16 @@
 
     public void Load() {
-      using (var service = ServiceLocator.Instance.ServicePool.GetService()) {
+      using (var service = ServiceLocator.Instance.GetService()) {
         
       }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceLocator.cs

@@ -22 +22 @@
 using HeuristicLab.Services.Hive.Common.ServiceContracts;
 using HeuristicLab.Clients.Hive.Properties;
+using HeuristicLab.Clients.Common;
 
 namespace HeuristicLab.Clients.Hive {
-  public class ServiceLocator {
-    private static ServiceLocator instance = null;
-    private ServiceClientFactory<IHiveService> serviceFactory = null;
-
-    public static ServiceLocator Instance {
+  public class ServiceLocator : IServiceLocator {
+    private static IServiceLocator instance = null;
+    public static IServiceLocator Instance {
       get {
         if (instance == null) {
@@ -35 +34 @@
         return instance;
       }
-    }
-
-    public ServiceLocator() {
-      Settings.Default.SettingChanging += new System.Configuration.SettingChangingEventHandler(Default_SettingChanging);
-    }
-
-    private void Default_SettingChanging(object sender, System.Configuration.SettingChangingEventArgs e) {
-      if (serviceFactory != null) {
-        serviceFactory.Username = Settings.Default.HiveUsername;
-        serviceFactory.Password = Settings.Default.HivePassword;
+      set {
+        instance = value;
       }
     }
 
-    public ServiceClientFactory<IHiveService> ServicePool {
-      get {
-        if (serviceFactory == null) {
-          serviceFactory = new ServiceClientFactory<IHiveService>(Settings.Default.HiveUsername, Settings.Default.HivePassword, "wsHttpBinding_IHiveService");
-        }
-        return serviceFactory;
-      }
+    public Disposable<IHiveService> GetService() {
+        return ClientFactory.CreateClient<IHiveService>("wsHttpBinding_IHiveService");
     }
   }