Changeset 4423 for branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/ClientFacade.cs

Timestamp:

09/17/10 10:26:55 (14 years ago)

Author:

cneumuel

Message:

• Refactored HL.Hive.Experiment. JobItems are not called HiveJobs and OptimizerJobs do not contain a hierarchy anymore.
• Dynamic generation of jobs on a slave are not reflected on the client user interface.
• Optimizer-Trees are now strictly synchronized with the HiveJob-Trees (also the ComputeInParallel property is taken into account when the Child HiveJobs are created)
• Improved the way a class can report progress and lock the UI (IProgressReporter, IProgress, Progress, ProgressView)
• Changes were made to the config-files, so that server and clients work with blade12.hpc.fh-hagenberg.at
• Lots of small changes and bugfixes

File:

• branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/ClientFacade.cs (modified) (8 diffs)

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/ClientFacade.cs

@@ -62 +62 @@
     public Response RequestSnapshot(Guid jobId) {
       using (contextFactory.GetContext()) {
-        ServiceLocator.GetAuthorizationManager().AuthorizeForJobs(jobId);
+        ServiceLocator.GetAuthorizationManager().AuthorizeJobs(jobId);
         return jobManager.RequestSnapshot(jobId);
       }
@@ -71 +71 @@
     public ResponseObject<SerializedJob> GetLastSerializedResult(Guid jobId) {
       using (contextFactory.GetContext(false)) {
-        ServiceLocator.GetAuthorizationManager().AuthorizeForJobs(jobId);
+        ServiceLocator.GetAuthorizationManager().AuthorizeJobs(jobId);
         return jobManager.GetLastSerializedResult(jobId);
       }
@@ -80 +80 @@
     public ResponseObject<SerializedJob> GetSnapshotResult(Guid jobId) {
       using (contextFactory.GetContext(false)) {
-        ServiceLocator.GetAuthorizationManager().AuthorizeForJobs(jobId);
+        ServiceLocator.GetAuthorizationManager().AuthorizeJobs(jobId);
         return jobManager.GetSnapshotResult(jobId);
       }
@@ -89 +89 @@
     public ResponseObject<JobDto> GetJobById(Guid jobId) {
       using (contextFactory.GetContext(false)) {
-        ServiceLocator.GetAuthorizationManager().AuthorizeForJobs(jobId);
+        ServiceLocator.GetAuthorizationManager().AuthorizeJobs(jobId);
         return jobManager.GetJobById(jobId);
       }
@@ -98 +98 @@
     public Response AbortJob(Guid jobId) {
       using (contextFactory.GetContext()) {
-        ServiceLocator.GetAuthorizationManager().AuthorizeForJobs(jobId);
+        ServiceLocator.GetAuthorizationManager().AuthorizeJobs(jobId);
         return jobManager.AbortJob(jobId);
       }
@@ -107 +107 @@
     public ResponseObject<JobResultList> GetJobResults(IEnumerable<Guid> jobIds) {
       using (contextFactory.GetContext(false)) {
-        ServiceLocator.GetAuthorizationManager().AuthorizeForJobs(jobIds.ToArray());
+        ServiceLocator.GetAuthorizationManager().AuthorizeJobs(jobIds.ToArray());
         return jobManager.GetJobResults(jobIds);
       }
@@ -117 +117 @@
       using (contextFactory.GetContext(false)) {
         if (parentJobId.HasValue) {
-          ServiceLocator.GetAuthorizationManager().AuthorizeForJobs(parentJobId.Value);
+          ServiceLocator.GetAuthorizationManager().AuthorizeJobs(parentJobId.Value);
         } 
         // If parentJobId is null, GetChildJobResults will filter the results for the current user
@@ -123 +123 @@
       }
     }
+
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
+    public ResponseObject<HiveExperimentDtoList> GetHiveExperiments() {
+      using (contextFactory.GetContext(false)) {
+        return jobManager.GetHiveExperiments();
+      }
+    }
+
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
+    public ResponseObject<HiveExperimentDto> UpdateHiveExperiment(HiveExperimentDto hiveExperimentDto) {
+      using (contextFactory.GetContext()) {
+        if (hiveExperimentDto.UserId == Guid.Empty) {
+          hiveExperimentDto.UserId = ServiceLocator.GetAuthorizationManager().UserId;
+        } else {
+          ServiceLocator.GetAuthorizationManager().Authorize(hiveExperimentDto.UserId);
+        }
+        return jobManager.UpdateHiveExperiment(hiveExperimentDto);
+      }
+    }
+
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
+    public Response DeleteHiveExperiment(Guid hiveExperimentId) {
+      using (contextFactory.GetContext()) {
+        var hiveExperimentDto = DaoLocator.HiveExperimentDao.FindById(hiveExperimentId);
+        if (hiveExperimentDto != null) {
+          ServiceLocator.GetAuthorizationManager().Authorize(hiveExperimentDto.UserId);
+        }
+        return jobManager.DeleteHiveExperiment(hiveExperimentId);
+      }
+    }
+
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
+    public ResponseObject<JobDto> AddChildJob(Guid parentJobId, SerializedJob serializedJob) {
+      using (contextFactory.GetContext()) {
+        ServiceLocator.GetAuthorizationManager().AuthorizeJobs(parentJobId);
+        return jobManager.AddChildJob(parentJobId, serializedJob);
+      }
+    }
     #endregion
-
-
   }
 }