Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/22/11 15:54:58 (13 years ago)
Author:
cneumuel
Message:

#1233

  • implemented correct downloading of paused jobs. its now also possible to change parameters and resume a algorithm
  • removed Prepare() calls in ExperimentManager and in slave, as it prevents corrent resuming of paused jobs
  • made events in ItemTreeView be invoked in the correct thread
  • reduced log output in ExperimentManager
File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r5779 r5793  
    22using System.Collections.Generic;
    33using System.Linq;
     4using System.Security.Permissions;
    45using System.ServiceModel;
    56using HeuristicLab.Services.Hive.Common;
    … …  
    3233
    3334    #region Job Methods
    34     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    35     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     35    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     36    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    3637    public Guid AddJob(Job job, JobData jobData, IEnumerable<Guid> resourceIds) {
    3738      return trans.UseTransaction(() => {
    … …  
    5253    }
    5354
    54     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    55     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     55    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     56    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    5657    public Guid AddChildJob(Guid parentJobId, Job job, JobData jobData) {
    5758      return trans.UseTransaction(() => {
    … …  
    6162    }
    6263
    63     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    64     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    65     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     64    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     65    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     66    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    6667    public Job GetJob(Guid jobId) {
    6768      return dao.GetJob(jobId);
    6869    }
    6970
    70     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    71     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     71    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     72    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    7273    public IEnumerable<Job> GetJobs() {
    7374      return dao.GetJobs(x => true);
    7475    }
    7576
    76     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    77     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     77    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     78    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    7879    public IEnumerable<LightweightJob> GetLightweightJobs(IEnumerable<Guid> jobIds) {
    7980      return dao.GetJobs(x => jobIds.Contains(x.JobId)).Select(x => new LightweightJob(x)).ToArray();
    8081    }
    8182
    82     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    83     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     83    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     84    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    8485    public IEnumerable<LightweightJob> GetLightweightChildJobs(Guid? parentJobId, bool recursive, bool includeParent) {
    8586      return GetChildJobs(parentJobId, recursive, includeParent).Select(x => new LightweightJob(x)).ToArray();
    8687    }
    8788
    88     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    89     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    90     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     89    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     90    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     91    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    9192    public JobData GetJobData(Guid jobId) {
    9293      return dao.GetJobData(jobId);
    9394    }
    9495
    95     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    96     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    97     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     96    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     97    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     98    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    9899    public void UpdateJob(Job job) {
    99100      trans.UseTransaction(() => {
    … …  
    102103    }
    103104
    104     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    105     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    106     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     105    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     106    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     107    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    107108    public void UpdateJobData(Job job, JobData jobData) {
    108109      trans.UseTransaction(() => {
    … …  
    113114    }
    114115
    115     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    116     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    117     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     116    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     117    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     118    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    118119    public void DeleteJob(Guid jobId) {
    119120      trans.UseTransaction(() => {
    … …  
    122123    }
    123124
    124     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    125     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    126     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     125    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     126    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     127    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    127128    public void DeleteChildJobs(Guid parentJobId) {
    128129      trans.UseTransaction(() => {
    … …  
    135136    }
    136137
    137     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    138     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    139     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     138    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     139    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     140    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    140141    public Job UpdateJobState(Guid jobId, JobState jobState, Guid? slaveId, Guid? userId, string exception) {
    141142      return trans.UseTransaction(() => {
    … …  
    155156
    156157    #region Job Control Methods
    157     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    158     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    159     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     158    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     159    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     160    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    160161    public void StopJob(Guid jobId) {
    161162      trans.UseTransaction(() => {
    … …  
    167168    }
    168169
    169     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    170     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    171     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     170    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     171    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     172    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    172173    public void PauseJob(Guid jobId) {
    173174      trans.UseTransaction(() => {
    … …  
    179180    }
    180181
    181     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    182     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    183     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     182    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     183    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     184    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    184185    public void RestartJob(Guid jobId) {
    185186      trans.UseTransaction(() => {
    … …  
    192193
    193194    #region HiveExperiment Methods
    194     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    195     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     195    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     196    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    196197    public HiveExperiment GetHiveExperiment(Guid id) {
    197198      return dao.GetHiveExperiments(x =>
    … …  
    201202    }
    202203
    203     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    204     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     204    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     205    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    205206    public IEnumerable<HiveExperiment> GetHiveExperiments() {
    206207      return dao.GetHiveExperiments(x => x.OwnerUserId == auth.UserId || x.HiveExperimentPermissions.Count(hep => hep.Permission != Permission.NotAllowed && hep.GrantedUserId == auth.UserId) > 0);
    207208    }
    208209
    209     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]   
     210    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]   
    210211    public IEnumerable<HiveExperiment> GetAllHiveExperiments() {
    211212      return dao.GetHiveExperiments(x => true);
    212213    }
    213214
    214     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    215     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     215    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     216    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    216217    public Guid AddHiveExperiment(HiveExperiment hiveExperimentDto) {
    217218      return trans.UseTransaction(() => {
    … …  
    222223    }
    223224
    224     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    225     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     225    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     226    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    226227    public void UpdateHiveExperiment(HiveExperiment hiveExperimentDto) {
    227228      trans.UseTransaction(() => {
    … …  
    230231    }
    231232
    232     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    233     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     233    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     234    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    234235    public void DeleteHiveExperiment(Guid hiveExperimentId) {
    235236      trans.UseTransaction(() => {
    … …  
    241242
    242243    #region Login Methods
    243     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     244    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    244245    public void Hello(Slave slaveInfo) {
    245246      trans.UseTransaction(() => {
    … …  
    254255    }
    255256
    256     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     257    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    257258    public void GoodBye(Guid slaveId) {
    258259      trans.UseTransaction(() => {
    … …  
    267268
    268269    #region Heartbeat Methods
    269     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     270    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    270271    public List<MessageContainer> Heartbeat(Heartbeat heartbeat) {
    271272      TriggerLifecycle(false);
    … …  
    275276
    276277    #region Plugin Methods
    277     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    278     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     278    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     279    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    279280    public Guid AddPlugin(Plugin plugin, List<PluginData> pluginDatas) {
    280281      return trans.UseTransaction(() => {
    … …  
    290291    }
    291292
    292     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    293     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    294     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     293    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     294    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     295    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    295296    public IEnumerable<Plugin> GetPlugins() {
    296297      return dao.GetPlugins(x => x.IsLocal == false);
    297298    }
    298299
    299     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    300     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    301     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     300    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     301    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     302    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    302303    public IEnumerable<PluginData> GetPluginDatas(List<Guid> pluginIds) {
    303304      List<PluginData> pluginDatas = new List<PluginData>();
    … …  
    319320
    320321    #region Slave Methods
    321     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    322     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     322    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     323    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    323324    public Guid AddSlave(Slave slave) {
    324325      return trans.UseTransaction(() => dao.AddSlave(slave));
    325326    }
    326327
    327     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    328     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     328    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     329    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    329330    public Guid AddSlaveGroup(SlaveGroup slaveGroup) {
    330331      return trans.UseTransaction(() => dao.AddSlaveGroup(slaveGroup));
    331332    }
    332333
    333     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    334     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     334    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     335    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    335336    public Slave GetSlave(Guid slaveId) {
    336337      return dao.GetSlave(slaveId);
    … …  
    341342    }
    342343
    343     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    344     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     344    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     345    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    345346    public IEnumerable<Slave> GetSlaves() {
    346347      return dao.GetSlaves(x => true);
    347348    }
    348349
    349     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    350     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     350    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     351    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    351352    public IEnumerable<SlaveGroup> GetSlaveGroups() {
    352353      return dao.GetSlaveGroups(x => true);
    353354    }
    354355
    355     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    356     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     356    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     357    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    357358    public void UpdateSlave(Slave slave) {
    358359      trans.UseTransaction(() => {
    … …  
    361362    }
    362363
    363     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    364     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     364    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     365    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    365366    public void UpdateSlaveGroup(SlaveGroup slaveGroup) {
    366367      trans.UseTransaction(() => {
    … …  
    369370    }
    370371
    371     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    372     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     372    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     373    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    373374    public void DeleteSlave(Guid slaveId) {
    374375      trans.UseTransaction(() => {
    … …  
    377378    }
    378379
    379     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    380     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     380    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     381    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    381382    public void DeleteSlaveGroup(Guid slaveGroupId) {
    382383      trans.UseTransaction(() => {
    … …  
    385386    }
    386387
    387     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    388     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     388    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     389    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    389390    public void AddResourceToGroup(Guid slaveGroupId, Guid resourceId) {
    390391      trans.UseTransaction(() => {
    … …  
    395396    }
    396397
    397     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    398     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     398    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     399    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    399400    public void RemoveResourceFromGroup(Guid slaveGroupId, Guid resourceId) {
    400401      trans.UseTransaction(() => {
    … …  
    405406    }
    406407
    407     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    408     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     408    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     409    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    409410    public Guid GetResourceId(string resourceName) {
    410411      return trans.UseTransaction(() => {
    … …  
    450451    #region Appointment Methods
    451452
    452     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     453    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    453454    public Guid AddAppointment(Appointment appointment) {
    454455      return trans.UseTransaction(() => dao.AddAppointment(appointment));
    455456    }
    456457
    457     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     458    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    458459    public void DeleteAppointment(Guid appointmentId) {
    459460      trans.UseTransaction(() => {
    … …  
    462463    }
    463464
    464     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     465    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    465466    public void UpdateAppointment(Appointment appointment) {
    466467      trans.UseTransaction(() => {
    … …  
    469470    }
    470471
    471     // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     472    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    472473    public IEnumerable<Appointment> GetScheduleForResource(Guid resourceId) {
    473474      return trans.UseTransaction(() => dao.GetAppointments(x => x.ResourceId == resourceId));
Note: See TracChangeset for help on using the changeset viewer.