Changeset 5095 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs

Timestamp:

12/13/10 16:09:22 (13 years ago)

Author:

cneumuel

Message:

#1233

• fixed config merge process
• worked on hive server test setup

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.Hive/3.4/HiveService.cs (modified) (3 diffs)

branches/HeuristicLab.Hive-3.4/sources

@@ -1 +1 @@
 HeuristicLab.Hive-3.4.suo
 TestResults
+HeuristicLab.Hive 3.4.suo

@@ -1 +1 @@
 HeuristicLab.Hive-3.4.suo
 TestResults
+HeuristicLab.Hive 3.4.suo

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs

@@ -17 +17 @@
   /// Implementation of the Hive service (interface <see cref="IHiveService"/>).
   /// </summary>
+  [ServiceBehavior(InstanceContextMode=InstanceContextMode.PerCall)]
   public class HiveService : IHiveService {
     private DataAccess.IHiveDao dao {
@@ -27 +28 @@
       get { return ServiceLocator.Instance.AuthorizationManager; }
     }
-    private Hive hive {
-      get { return ServiceLocator.Instance.Hive; }
+    private ILifecycleManager lifecycleManager {
+      get { return ServiceLocator.Instance.LifecycleManager; }
     }
 
     #region Job Methods
-    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
-    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
+    //[PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
+    //[PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     public Guid AddJob(Job job, JobData jobData) {
       using (trans.OpenTransaction()) {
@@ -176 +177 @@
     public List<MessageContainer> Heartbeat(Heartbeat heartbeat) {
       using (trans.OpenTransaction()) {
-        return hive.ProcessHeartbeat(heartbeat);
+        return lifecycleManager.ProcessHeartbeat(heartbeat);
       }
     }

@@ -1 +1 @@
 HeuristicLab.Hive-3.4.suo
 TestResults
+HeuristicLab.Hive 3.4.suo