- Timestamp:
- 12/13/10 16:09:22 (14 years ago)
- Location:
- branches/HeuristicLab.Hive-3.4/sources
- Files:
-
- 3 added
- 1 deleted
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Hive-3.4/sources
- Property svn:ignore
-
old new 1 1 HeuristicLab.Hive-3.4.suo 2 2 TestResults 3 HeuristicLab.Hive 3.4.suo
-
- Property svn:ignore
-
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HeuristicLab.Services.Hive-3.4.csproj
r5055 r5095 78 78 <None Include="HeuristicLabServicesHivePlugin.cs.frame" /> 79 79 <None Include="Properties\AssemblyInfo.cs.frame" /> 80 <Compile Include="Interfaces\ILifecycleManager.cs" /> 81 <Compile Include="Interfaces\IServiceLocator.cs" /> 80 82 <Compile Include="Standalone\HeuristicLabServicesHiveApplication.cs" /> 81 83 <Compile Include="Standalone\MainForm.cs"> … … 87 89 <Compile Include="AuthorizationManager.cs" /> 88 90 <Compile Include="HeuristicLabServicesHivePlugin.cs" /> 89 <Compile Include=" Hive.cs" />91 <Compile Include="LifecycleManager.cs" /> 90 92 <Compile Include="HiveRoles.cs" /> 91 93 <Compile Include="HiveService.cs" /> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs
r5078 r5095 17 17 /// Implementation of the Hive service (interface <see cref="IHiveService"/>). 18 18 /// </summary> 19 [ServiceBehavior(InstanceContextMode=InstanceContextMode.PerCall)] 19 20 public class HiveService : IHiveService { 20 21 private DataAccess.IHiveDao dao { … … 27 28 get { return ServiceLocator.Instance.AuthorizationManager; } 28 29 } 29 private Hive hive{30 get { return ServiceLocator.Instance. Hive; }30 private ILifecycleManager lifecycleManager { 31 get { return ServiceLocator.Instance.LifecycleManager; } 31 32 } 32 33 33 34 #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)] 36 37 public Guid AddJob(Job job, JobData jobData) { 37 38 using (trans.OpenTransaction()) { … … 176 177 public List<MessageContainer> Heartbeat(Heartbeat heartbeat) { 177 178 using (trans.OpenTransaction()) { 178 return hive.ProcessHeartbeat(heartbeat);179 return lifecycleManager.ProcessHeartbeat(heartbeat); 179 180 } 180 181 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/ServiceLocator.cs
r5028 r5095 7 7 namespace HeuristicLab.Services.Hive { 8 8 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 { 12 12 get { 13 13 if (instance == null) instance = new ServiceLocator(); 14 14 return instance; 15 15 } 16 set { instance = value; } 16 17 } 17 18 … … 40 41 } 41 42 42 private Hive hive;43 public Hive Hive{43 private ILifecycleManager lifecycleManager; 44 public ILifecycleManager LifecycleManager { 44 45 get { 45 if ( hive == null) hive = new Hive();46 return hive;46 if (lifecycleManager == null) lifecycleManager = new LifecycleManager(); 47 return lifecycleManager; 47 48 } 48 49 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/Standalone/HeuristicLabServicesHiveApplication.cs
r5040 r5095 12 12 public class HeuristicLabServicesHiveApplication : ApplicationBase { 13 13 private IDictionary<string, ServiceHost> serviceHosts = new Dictionary<string, ServiceHost>(); 14 private Hive hive { get { return ServiceLocator.Instance.Hive; } }14 private ILifecycleManager lifecycleManager { get { return ServiceLocator.Instance.LifecycleManager; } } 15 15 16 16 public override void Run() { … … 25 25 host.Close(); 26 26 } 27 hive.Shutdown();27 lifecycleManager.Stop(); 28 28 } 29 29 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/app.config
r5078 r5095 57 57 </behaviors> 58 58 <services> 59 <service behaviorConfiguration="ServiceBehaviour_IHiveService" 60 name="HeuristicLab.Services.Hive.HiveService"> 59 <service behaviorConfiguration="ServiceBehaviour_IHiveService" name="HeuristicLab.Services.Hive.HiveService"> 61 60 <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="" name="MexEndpoint" contract="IMetadataExchange" /> 62 61 <endpoint binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IHiveService" name="WSHttpBinding_IHiveService" contract="HeuristicLab.Services.Hive.Common.ServiceContracts.IHiveService" />
Note: See TracChangeset
for help on using the changeset viewer.