Changeset 8051 for trunk/sources/HeuristicLab.Services.Hive/3.3/ServiceLocator.cs

Timestamp:

06/19/12 12:06:18 (12 years ago)

Author:

jkarder

Message:

#1859: manually merged branch "HiveResourcePermissionManagement (trunk integration)" into trunk

File:

• trunk/sources/HeuristicLab.Services.Hive/3.3/ServiceLocator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Services.Hive/3.3/ServiceLocator.cs

@@ -42 +42 @@
     }
 
-    private IAuthenticationManager authenticationManager;
-    public IAuthenticationManager AuthenticationManager {
+    private Access.IRoleVerifier roleVerifier;
+    public Access.IRoleVerifier RoleVerifier {
       get {
-        if (authenticationManager == null) authenticationManager = new AuthenticationManager();
-        return authenticationManager;
+        if (roleVerifier == null) roleVerifier = new Access.RoleVerifier();
+        return roleVerifier;
       }
     }
@@ -74 +74 @@
     }
 
-    private IUserManager userManager;
-    public IUserManager UserManager {
+    private Access.IUserManager userManager;
+    public Access.IUserManager UserManager {
       get {
-        if (userManager == null) userManager = new UserManager();
+        if (userManager == null) userManager = new Access.UserManager();
         return userManager;
       }
@@ -85 +85 @@
     public HeartbeatManager HeartbeatManager {
       get {
-        if(heartbeatManager == null) heartbeatManager = new HeartbeatManager();
+        if (heartbeatManager == null) heartbeatManager = new HeartbeatManager();
         return heartbeatManager;
       }