Changeset 2587 for branches/PluginInfrastructure Refactoring/HeuristicLab.Hive.Server.Core/3.2/ServiceLocator.cs

Timestamp:

01/04/10 18:55:46 (14 years ago)

Author:

gkronber

Message:

Fixed projects to work with new plugin infrastructure. #799

File:

• branches/PluginInfrastructure Refactoring/HeuristicLab.Hive.Server.Core/3.2/ServiceLocator.cs (modified) (6 diffs)

branches/PluginInfrastructure Refactoring/HeuristicLab.Hive.Server.Core/3.2/ServiceLocator.cs

@@ -20 +20 @@
 #endregion
 
+using System.Linq;
 using HeuristicLab.Hive.Server.DataAccess;
 using HeuristicLab.PluginInfrastructure;
@@ -34 +35 @@
 /// </summary>
 public class ServiceLocator {
-  private static DiscoveryService discoveryService =
-    new DiscoveryService();
-
   private static IClientManager clientManager = null;
 
@@ -109 +107 @@
     if (sessionFactory == null) {
       sessionFactory = 
-        discoveryService.GetInstances<ISessionFactory>()[0];
+        ApplicationManager.Manager.GetInstances<ISessionFactory>().First();
 
       sessionFactory.DbConnectionType =
@@ -128 +126 @@
   public static IScheduler GetScheduler() {
     if (scheduler == null) {
-      scheduler = discoveryService.GetInstances<IScheduler>()[0];
+      scheduler = ApplicationManager.Manager.GetInstances<IScheduler>().First();
     }
 
@@ -141 +139 @@
   public static IPermissionManager GetPermissionManager() {
     if (permManager == null)
-      permManager = discoveryService.GetInstances<IPermissionManager>()[0];
+      permManager = ApplicationManager.Manager.GetInstances<IPermissionManager>().First();
     return permManager;
     
@@ -153 +151 @@
   public static IHivePermissionManager GetHivePermissionManager() {
     if (hivePermManager == null)
-      hivePermManager = discoveryService.GetInstances<IHivePermissionManager>()[0];
+      hivePermManager = ApplicationManager.Manager.GetInstances<IHivePermissionManager>().First();
     return hivePermManager;