Changeset 5591

Timestamp:

03/02/11 12:42:21 (14 years ago)

Author:

cneumuel

Message:

#1233

• fixed wrong number of plugin dependencies
• minor fixes

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/app_f005pc.config (added)
• HeuristicLab.Clients.Hive.Slave/3.4/HeuristicLab.Clients.Hive.Slave-3.4.csproj (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/app_f005pc.config (added)
• HeuristicLab.Clients.Hive.Views/3.4/HeuristicLabClientsHiveViewsPlugin.cs.frame (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveExperimentClient.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.4/HeuristicLab.Clients.Hive-3.4.csproj (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.4/app_f005pc.config (added)
• HeuristicLab.ExtLibs/HeuristicLab.DayView/1.0/HeuristicLabDayViewPlugin.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.Web/Hive-3.4/App_Code/HiveServerModule.cs (modified) (3 diffs)
• HeuristicLab.Services.Hive.Web/Hive-3.4/Web.config (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/HeuristicLab.Clients.Hive.Slave-3.4.csproj

@@ -125 +125 @@
     <Compile Include="WcfService.cs" />
     <None Include="app_ascheibe.config" />
-    <None Include="app - F005PC.config" />
-    <None Include="app - services.config" />
+    <None Include="app_f005pc.config" />
+    <None Include="app_services.config" />
     <None Include="HeuristicLabClientsHiveSlavePlugin.cs.frame" />
     <Compile Include="HeuristicLabClientsHiveSlavePlugin.cs" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/HeuristicLabClientsHiveViewsPlugin.cs.frame

@@ -11 +11 @@
   [PluginDependency("HeuristicLab.Core", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
-  [PluginDependency("HeuristicLab.Calendar", "3.3")]
+  [PluginDependency("HeuristicLab.DayView", "1.0")]
   public class HeuristicLabClientsHiveViewsPlugin : PluginBase {
   }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveExperimentClient.cs

@@ -707 +707 @@
             p.Id = service.AddPlugin(p, pd);
             alreadyUploadedPlugins.Add(p);
+            pluginIds.Add(p.Id);
           } else {
             pluginIds.Add(foundPlugin.Id);

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HeuristicLab.Clients.Hive-3.4.csproj

@@ -113 +113 @@
   </ItemGroup>
   <ItemGroup>
-    <None Include="app - F005PC.config" />
-    <None Include="app - services.config" />
+    <None Include="app_f005pc.config" />
+    <None Include="app_services.config" />
     <None Include="app.config" />
     <None Include="HeuristicLabClientsHivePlugin.cs.frame" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.ExtLibs/HeuristicLab.DayView/1.0/HeuristicLabDayViewPlugin.cs

@@ -24 +24 @@
 namespace HeuristicLab.DayView {
   [Plugin("HeuristicLab.DayView", "1.0.0.0")]
-  [PluginFile("HeuristicLab.DayView-1.0.0.0.dll", PluginFileType.Assembly)]
+  [PluginFile("HeuristicLab.DayView-1.0.dll", PluginFileType.Assembly)]
   [PluginFile("Calendar.DayView.dll", PluginFileType.Assembly)]
   [PluginFile("DayView License.txt", PluginFileType.License)]

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Web/Hive-3.4/App_Code/HiveServerModule.cs

@@ -24 +24 @@
 using System.Linq;
 using System.Web;
-using HeuristicLab.Hive.Server.Core;
 using HeuristicLab.Services.Hive.Common.ServiceContracts;
 using HeuristicLab.Services.Hive;
@@ -30 +29 @@
 using HeuristicLab.Services.Hive.Common;
 
-namespace HeuristicLab.Hive.Server.Core.IISModules {
+namespace HeuristicLab.Services.Hive.IISModules {
   public class HiveServerModule : IHttpModule {
-    private static IHiveService hiveService;
     private static ILifecycleManager lifecycleManager;
 
@@ -44 +42 @@
 
     public void Dispose() {
-      lifecycleManager.Stop();
-      lifecycleManager = null;
+      if (lifecycleManager != null) {
+        lifecycleManager.Stop();
+        lifecycleManager = null;
+      }
       LogFactory.GetLogger(this.GetType().Name).Log("Init(): LifecycleManager stopped");
-    } 
+    }
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Web/Hive-3.4/Web.config

@@ -71 +71 @@
   <system.webServer>
     <modules runAllManagedModulesForAllRequests="true">
-      <add name="HiveServerModule" type="HeuristicLab.Hive.Server.Core.IISModules.HiveServerModule"/>
+      <add name="HiveServerModule" type="HeuristicLab.Services.Hive.IISModules.HiveServerModule"/>
     </modules>
     <directoryBrowse enabled="true"/>