Changeset 8051 for trunk/sources/HeuristicLab.Services.Hive/3.3/Interfaces

Timestamp:

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

Author:

jkarder

Message:

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

Location:

trunk/sources/HeuristicLab.Services.Hive/3.3/Interfaces

Files:

• IAuthorizationManager.cs (modified) (1 diff)
• IServiceLocator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Services.Hive/3.3/Interfaces/IAuthorizationManager.cs

@@ -33 +33 @@
 
     void AuthorizeForJob(Guid jobId, Permission requiredPermission);
+
+    void AuthorizeForResourceAdministration(Guid resourceId);
   }
 }

trunk/sources/HeuristicLab.Services.Hive/3.3/Interfaces/IServiceLocator.cs

@@ -24 +24 @@
 namespace HeuristicLab.Services.Hive {
   public interface IServiceLocator {
-    IAuthenticationManager AuthenticationManager { get; }
+    Access.IRoleVerifier RoleVerifier { get; }
     IAuthorizationManager AuthorizationManager { get; }
     IHiveDao HiveDao { get; }
     IEventManager EventManager { get; }
     ITransactionManager TransactionManager { get; }
-    IUserManager UserManager { get; }
+    Access.IUserManager UserManager { get; }
     HeartbeatManager HeartbeatManager { get; }
   }