Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/20/11 13:54:57 (12 years ago)
Author:
spimming
Message:

#1680:

  • merged changes from trunk into branch

' removed pre-build event for multiple app.configs

Location:
branches/HeuristicLab.Hive.Azure
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Hive.Azure

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3

    • Property svn:ignore

      •  

        old new  
        11obj
        22Plugin.cs
         3bin

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/HiveAdminClient.cs

    r6976 r7215  
    7979        resources = new ItemList<Resource>();
    8080
    81         ServiceLocator.Instance.CallHiveService(service => {
     81        HiveServiceLocator.Instance.CallHiveService(service => {
    8282          service.GetSlaveGroups().ForEach(g => resources.Add(g));
    8383          service.GetSlaves().ForEach(s => resources.Add(s));
    … …  
    101101          downtimes = new ItemList<Downtime>();
    102102
    103           ServiceLocator.Instance.CallHiveService(service => {
     103          HiveServiceLocator.Instance.CallHiveService(service => {
    104104            service.GetDowntimesForResource(downtimeForResourceId).ForEach(d => downtimes.Add(d));
    105105          });
    … …  
    119119      if (item.Id == Guid.Empty) {
    120120        if (item is SlaveGroup) {
    121           item.Id = ServiceLocator.Instance.CallHiveService((s) => s.AddSlaveGroup((SlaveGroup)item));
     121          item.Id = HiveServiceLocator.Instance.CallHiveService((s) => s.AddSlaveGroup((SlaveGroup)item));
    122122        }
    123123        if (item is Slave) {
    124           item.Id = ServiceLocator.Instance.CallHiveService((s) => s.AddSlave((Slave)item));
     124          item.Id = HiveServiceLocator.Instance.CallHiveService((s) => s.AddSlave((Slave)item));
    125125        }
    126126        if (item is Downtime) {
    127           item.Id = ServiceLocator.Instance.CallHiveService((s) => s.AddDowntime((Downtime)item));
     127          item.Id = HiveServiceLocator.Instance.CallHiveService((s) => s.AddDowntime((Downtime)item));
    128128        }
    129129      } else {
    130130        if (item is SlaveGroup) {
    131           ServiceLocator.Instance.CallHiveService((s) => s.UpdateSlaveGroup((SlaveGroup)item));
     131          HiveServiceLocator.Instance.CallHiveService((s) => s.UpdateSlaveGroup((SlaveGroup)item));
    132132        }
    133133        if (item is Slave) {
    134           ServiceLocator.Instance.CallHiveService((s) => s.UpdateSlave((Slave)item));
     134          HiveServiceLocator.Instance.CallHiveService((s) => s.UpdateSlave((Slave)item));
    135135        }
    136136        if (item is Downtime) {
    137           ServiceLocator.Instance.CallHiveService((s) => s.UpdateDowntime((Downtime)item));
     137          HiveServiceLocator.Instance.CallHiveService((s) => s.UpdateDowntime((Downtime)item));
    138138        }
    139139      }
    … …  
    144144    public static void Delete(IHiveItem item) {
    145145      if (item is SlaveGroup) {
    146         ServiceLocator.Instance.CallHiveService((s) => s.DeleteSlaveGroup(item.Id));
     146        HiveServiceLocator.Instance.CallHiveService((s) => s.DeleteSlaveGroup(item.Id));
    147147      } else if (item is Slave) {
    148         ServiceLocator.Instance.CallHiveService((s) => s.DeleteSlave(item.Id));
     148        HiveServiceLocator.Instance.CallHiveService((s) => s.DeleteSlave(item.Id));
    149149      } else if (item is Downtime) {
    150         ServiceLocator.Instance.CallHiveService((s) => s.DeleteDowntime(item.Id));
     150        HiveServiceLocator.Instance.CallHiveService((s) => s.DeleteDowntime(item.Id));
    151151      }
    152152    }
Note: See TracChangeset for help on using the changeset viewer.