- Timestamp:
- 03/02/11 12:42:21 (13 years ago)
- Location:
- branches/HeuristicLab.Hive-3.4/sources
- Files:
-
- 3 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/HeuristicLab.Clients.Hive.Slave-3.4.csproj
r5541 r5591 125 125 <Compile Include="WcfService.cs" /> 126 126 <None Include="app_ascheibe.config" /> 127 <None Include="app - F005PC.config" />128 <None Include="app -services.config" />127 <None Include="app_f005pc.config" /> 128 <None Include="app_services.config" /> 129 129 <None Include="HeuristicLabClientsHiveSlavePlugin.cs.frame" /> 130 130 <Compile Include="HeuristicLabClientsHiveSlavePlugin.cs" /> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/HeuristicLabClientsHiveViewsPlugin.cs.frame
r5457 r5591 11 11 [PluginDependency("HeuristicLab.Core", "3.3")] 12 12 [PluginDependency("HeuristicLab.Persistence", "3.3")] 13 [PluginDependency("HeuristicLab. Calendar", "3.3")]13 [PluginDependency("HeuristicLab.DayView", "1.0")] 14 14 public class HeuristicLabClientsHiveViewsPlugin : PluginBase { 15 15 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveExperimentClient.cs
r5535 r5591 707 707 p.Id = service.AddPlugin(p, pd); 708 708 alreadyUploadedPlugins.Add(p); 709 pluginIds.Add(p.Id); 709 710 } else { 710 711 pluginIds.Add(foundPlugin.Id); -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HeuristicLab.Clients.Hive-3.4.csproj
r5541 r5591 113 113 </ItemGroup> 114 114 <ItemGroup> 115 <None Include="app - F005PC.config" />116 <None Include="app -services.config" />115 <None Include="app_f005pc.config" /> 116 <None Include="app_services.config" /> 117 117 <None Include="app.config" /> 118 118 <None Include="HeuristicLabClientsHivePlugin.cs.frame" /> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.ExtLibs/HeuristicLab.DayView/1.0/HeuristicLabDayViewPlugin.cs
r5538 r5591 24 24 namespace HeuristicLab.DayView { 25 25 [Plugin("HeuristicLab.DayView", "1.0.0.0")] 26 [PluginFile("HeuristicLab.DayView-1.0. 0.0.dll", PluginFileType.Assembly)]26 [PluginFile("HeuristicLab.DayView-1.0.dll", PluginFileType.Assembly)] 27 27 [PluginFile("Calendar.DayView.dll", PluginFileType.Assembly)] 28 28 [PluginFile("DayView License.txt", PluginFileType.License)] -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Web/Hive-3.4/App_Code/HiveServerModule.cs
r5511 r5591 24 24 using System.Linq; 25 25 using System.Web; 26 using HeuristicLab.Hive.Server.Core;27 26 using HeuristicLab.Services.Hive.Common.ServiceContracts; 28 27 using HeuristicLab.Services.Hive; … … 30 29 using HeuristicLab.Services.Hive.Common; 31 30 32 namespace HeuristicLab. Hive.Server.Core.IISModules {31 namespace HeuristicLab.Services.Hive.IISModules { 33 32 public class HiveServerModule : IHttpModule { 34 private static IHiveService hiveService;35 33 private static ILifecycleManager lifecycleManager; 36 34 … … 44 42 45 43 public void Dispose() { 46 lifecycleManager.Stop(); 47 lifecycleManager = null; 44 if (lifecycleManager != null) { 45 lifecycleManager.Stop(); 46 lifecycleManager = null; 47 } 48 48 LogFactory.GetLogger(this.GetType().Name).Log("Init(): LifecycleManager stopped"); 49 } 49 } 50 50 } 51 51 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Web/Hive-3.4/Web.config
r5405 r5591 71 71 <system.webServer> 72 72 <modules runAllManagedModulesForAllRequests="true"> 73 <add name="HiveServerModule" type="HeuristicLab. Hive.Server.Core.IISModules.HiveServerModule"/>73 <add name="HiveServerModule" type="HeuristicLab.Services.Hive.IISModules.HiveServerModule"/> 74 74 </modules> 75 75 <directoryBrowse enabled="true"/>
Note: See TracChangeset
for help on using the changeset viewer.