Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/12/11 13:43:05 (13 years ago)
Author:
cneumuel
Message:

#1233

  • changed relationship between Job and HiveExperiment. There is no more HiveExperiment.RootJobId, instead there is Job.HiveExperimentId.
  • One HiveExperiment can now have multiple Experiments.
  • TreeView supports multiple root nodes
  • HiveEngine creates a HiveExperiment for each set of jobs, so jobs cannot be without an parent experiment anymore (no more loose jobs)
  • updated ExperimentManager binaries
Location:
branches/HeuristicLab.Hive-3.4/sources
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Hive-3.4/sources

    • Property svn:ignore

      •  

        old new  
        44PrecompiledWeb
        55CreateEventLogSources
         6WindowsFormsTestProject

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

    r6000 r6006  
    22using System.Collections.Generic;
    33using System.Linq;
    4 using System.Security.Permissions;
    54using System.ServiceModel;
    65using HeuristicLab.Services.Hive.Common;
    … …  
    3332
    3433    #region Job Methods
    35     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    36     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     34    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     35    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    3736    public Guid AddJob(Job job, JobData jobData, IEnumerable<Guid> resourceIds) {
    3837      return trans.UseTransaction(() => {
    … …  
    5352    }
    5453
    55     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    56     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     54    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     55    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    5756    public Guid AddChildJob(Guid parentJobId, Job job, JobData jobData) {
    5857      return trans.UseTransaction(() => {
    … …  
    6261    }
    6362
    64     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    65     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    66     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     63    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     64    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     65    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    6766    public Job GetJob(Guid jobId) {
    6867      return dao.GetJob(jobId);
    6968    }
    7069
    71     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    72     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     70    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     71    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    7372    public IEnumerable<Job> GetJobs() {
    7473      return dao.GetJobs(x => true);
    7574    }
    7675
    77     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    78     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     76    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     77    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    7978    public IEnumerable<LightweightJob> GetLightweightJobs(IEnumerable<Guid> jobIds) {
    8079      return dao.GetJobs(x => jobIds.Contains(x.JobId)).Select(x => new LightweightJob(x)).ToArray();
    8180    }
    8281
    83     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    84     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     82    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     83    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    8584    public IEnumerable<LightweightJob> GetLightweightChildJobs(Guid? parentJobId, bool recursive, bool includeParent) {
    8685      return GetChildJobs(parentJobId, recursive, includeParent).Select(x => new LightweightJob(x)).ToArray();
    8786    }
    8887
    89     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    90     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    91     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     88    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     89    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     90    public IEnumerable<LightweightJob> GetLightweightExperimentJobs(Guid experimentId) {
     91      return dao.GetJobs(x => x.HiveExperimentId == experimentId).Select(x => new LightweightJob(x)).ToArray();
     92    }
     93
     94    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     95    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     96    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    9297    public JobData GetJobData(Guid jobId) {
    9398      return dao.GetJobData(jobId);
    9499    }
    95100
    96     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    97     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    98     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     101    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     102    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     103    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    99104    public void UpdateJob(Job job) {
    100105      trans.UseTransaction(() => {
    … …  
    103108    }
    104109
    105     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    106     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    107     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     110    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     111    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     112    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    108113    public void UpdateJobData(Job job, JobData jobData) {
    109114      trans.UseTransaction(() => {
    … …  
    114119    }
    115120
    116     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    117     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    118     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     121    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     122    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     123    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    119124    public void DeleteJob(Guid jobId) {
    120125      trans.UseTransaction(() => {
    … …  
    123128    }
    124129
    125     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    126     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    127     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     130    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     131    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     132    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    128133    public void DeleteChildJobs(Guid parentJobId) {
    129134      trans.UseTransaction(() => {
    … …  
    136141    }
    137142
    138     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    139     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    140     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     143    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     144    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     145    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    141146    public Job UpdateJobState(Guid jobId, JobState jobState, Guid? slaveId, Guid? userId, string exception) {
    142147      return trans.UseTransaction(() => {
    … …  
    156161
    157162    #region Job Control Methods
    158     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    159     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    160     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     163    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     164    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     165    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    161166    public void StopJob(Guid jobId) {
    162167      trans.UseTransaction(() => {
    … …  
    168173    }
    169174
    170     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    171     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    172     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     175    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     176    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     177    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    173178    public void PauseJob(Guid jobId) {
    174179      trans.UseTransaction(() => {
    … …  
    180185    }
    181186
    182     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    183     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    184     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     187    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     188    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     189    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    185190    public void RestartJob(Guid jobId) {
    186191      trans.UseTransaction(() => {
    … …  
    193198
    194199    #region HiveExperiment Methods
    195     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    196     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     200    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     201    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    197202    public HiveExperiment GetHiveExperiment(Guid id) {
    198203      return dao.GetHiveExperiments(x =>
    … …  
    202207    }
    203208
    204     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    205     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     209    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     210    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    206211    public IEnumerable<HiveExperiment> GetHiveExperiments() {
    207212      return dao.GetHiveExperiments(x => x.OwnerUserId == auth.UserId || x.HiveExperimentPermissions.Count(hep => hep.Permission != Permission.NotAllowed && hep.GrantedUserId == auth.UserId) > 0);
    208213    }
    209214
    210     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]   
     215    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]   
    211216    public IEnumerable<HiveExperiment> GetAllHiveExperiments() {
    212217      return dao.GetHiveExperiments(x => true);
    213218    }
    214219
    215     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    216     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     220    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     221    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    217222    public Guid AddHiveExperiment(HiveExperiment hiveExperimentDto) {
    218223      return trans.UseTransaction(() => {
    … …  
    223228    }
    224229
    225     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    226     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     230    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     231    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    227232    public void UpdateHiveExperiment(HiveExperiment hiveExperimentDto) {
    228233      trans.UseTransaction(() => {
    … …  
    231236    }
    232237
    233     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    234     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     238    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     239    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    235240    public void DeleteHiveExperiment(Guid hiveExperimentId) {
    236241      trans.UseTransaction(() => {
    … …  
    242247
    243248    #region Login Methods
    244     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     249    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    245250    public void Hello(Slave slaveInfo) {
    246251      trans.UseTransaction(() => {
    … …  
    275280    }
    276281
    277     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     282    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    278283    public void GoodBye(Guid slaveId) {
    279284      trans.UseTransaction(() => {
    … …  
    288293
    289294    #region Heartbeat Methods
    290     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     295    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    291296    public List<MessageContainer> Heartbeat(Heartbeat heartbeat) {
    292297      TriggerLifecycle(false);
    … …  
    296301
    297302    #region Plugin Methods
    298     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    299     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     303    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     304    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    300305    public Guid AddPlugin(Plugin plugin, List<PluginData> pluginDatas) {
    301306      return trans.UseTransaction(() => {
    … …  
    318323    }
    319324
    320     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    321     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    322     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     325    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     326    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     327    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    323328    public Plugin GetPlugin(Guid pluginId) {
    324329      return dao.GetPlugin(pluginId);
    325330    }
    326331
    327     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    328     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    329     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     332    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     333    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     334    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    330335    public IEnumerable<Plugin> GetPlugins() {
    331336      return dao.GetPlugins(x => x.IsLocal == false);
    332337    }
    333338
    334     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    335     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    336     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
     339    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     340    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     341    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    337342    public IEnumerable<PluginData> GetPluginDatas(List<Guid> pluginIds) {
    338343      List<PluginData> pluginDatas = new List<PluginData>();
    … …  
    354359
    355360    #region Slave Methods
    356     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    357     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     361    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     362    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    358363    public Guid AddSlave(Slave slave) {
    359364      return trans.UseTransaction(() => dao.AddSlave(slave));
    360365    }
    361366
    362     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    363     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     367    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     368    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    364369    public Guid AddSlaveGroup(SlaveGroup slaveGroup) {
    365370      return trans.UseTransaction(() => dao.AddSlaveGroup(slaveGroup));
    366371    }
    367372
    368     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    369     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     373    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     374    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    370375    public Slave GetSlave(Guid slaveId) {
    371376      return dao.GetSlave(slaveId);
    … …  
    376381    }
    377382
    378     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    379     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     383    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     384    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    380385    public IEnumerable<Slave> GetSlaves() {
    381386      return dao.GetSlaves(x => true);
    382387    }
    383388
    384     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    385     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     389    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     390    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    386391    public IEnumerable<SlaveGroup> GetSlaveGroups() {
    387392      return dao.GetSlaveGroups(x => true);
    388393    }
    389394
    390     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    391     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     395    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     396    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    392397    public void UpdateSlave(Slave slave) {
    393398      trans.UseTransaction(() => {
    … …  
    396401    }
    397402
    398     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    399     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     403    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     404    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    400405    public void UpdateSlaveGroup(SlaveGroup slaveGroup) {
    401406      trans.UseTransaction(() => {
    … …  
    404409    }
    405410
    406     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    407     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     411    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     412    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    408413    public void DeleteSlave(Guid slaveId) {
    409414      trans.UseTransaction(() => {
    … …  
    412417    }
    413418
    414     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    415     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     419    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     420    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    416421    public void DeleteSlaveGroup(Guid slaveGroupId) {
    417422      trans.UseTransaction(() => {
    … …  
    420425    }
    421426
    422     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    423     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     427    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     428    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    424429    public void AddResourceToGroup(Guid slaveGroupId, Guid resourceId) {
    425430      trans.UseTransaction(() => {
    … …  
    430435    }
    431436
    432     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    433     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     437    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     438    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    434439    public void RemoveResourceFromGroup(Guid slaveGroupId, Guid resourceId) {
    435440      trans.UseTransaction(() => {
    … …  
    440445    }
    441446
    442     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    443     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
     447    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     448    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
    444449    public Guid GetResourceId(string resourceName) {
    445450      return trans.UseTransaction(() => {
    … …  
    485490    #region Appointment Methods
    486491
    487     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     492    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    488493    public Guid AddAppointment(Appointment appointment) {
    489494      return trans.UseTransaction(() => dao.AddAppointment(appointment));
    490495    }
    491496
    492     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     497    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    493498    public void DeleteAppointment(Guid appointmentId) {
    494499      trans.UseTransaction(() => {
    … …  
    497502    }
    498503
    499     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     504    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    500505    public void UpdateAppointment(Appointment appointment) {
    501506      trans.UseTransaction(() => {
    … …  
    504509    }
    505510
    506     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
     511    // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    507512    public IEnumerable<Appointment> GetScheduleForResource(Guid resourceId) {
    508513      return trans.UseTransaction(() => dao.GetAppointments(x => x.ResourceId == resourceId));
Note: See TracChangeset for help on using the changeset viewer.