Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Hive-3.4/sources

    • Property svn:ignore
      •  

        old new  
        11HeuristicLab.Hive-3.4.suo
        22TestResults
         3HeuristicLab.Hive 3.4.suo
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/ServiceLocator.cs

    r5028 r5095  
    77namespace HeuristicLab.Services.Hive {
    88
    9   public class ServiceLocator {
    10     private static ServiceLocator instance;
    11     public static ServiceLocator Instance {
     9  public class ServiceLocator : IServiceLocator {
     10    private static IServiceLocator instance;
     11    public static IServiceLocator Instance {
    1212      get {
    1313        if (instance == null) instance = new ServiceLocator();
    1414        return instance;
    1515      }
     16      set { instance = value; }
    1617    }
    1718
     
    4041    }
    4142
    42     private Hive hive;
    43     public Hive Hive {
     43    private ILifecycleManager lifecycleManager;
     44    public ILifecycleManager LifecycleManager {
    4445      get {
    45         if (hive == null) hive = new Hive();
    46         return hive;
     46        if (lifecycleManager == null) lifecycleManager = new LifecycleManager();
     47        return lifecycleManager;
    4748      }
    4849    }
Note: See TracChangeset for help on using the changeset viewer.