Changeset 3931 for branches/3.2

Timestamp:

06/19/10 09:17:24 (14 years ago)

Author:

kgrading

Message:

added minor speedups and better transaction handling to the server (#828)

Location:

branches/3.2/sources

Files:

• HeuristicLab.Hive.Client.Communication/3.2/WcfService.cs (modified) (3 diffs)
• HeuristicLab.Hive.Client.Console/3.2/HeuristicLab.Hive.Client.Console-3.2.csproj (modified) (2 diffs)
• HeuristicLab.Hive.Client.Console/3.2/HiveClientConsole.cs (modified) (4 diffs)
• HeuristicLab.Hive.Client.Console/3.2/Service References/ClientService/HeuristicLab.Hive.Client.Core.ClientConsoleService.xsd (modified) (2 diffs)
• HeuristicLab.Hive.Client.Console/3.2/Service References/ClientService/Reference.cs (modified) (5 diffs)
• HeuristicLab.Hive.Client.Console/3.2/Service References/ClientService/Reference.svcmap (modified) (1 diff)
• HeuristicLab.Hive.Client.Console/3.2/Service References/ClientService/configuration.svcinfo (modified) (1 diff)
• HeuristicLab.Hive.Client.Console/3.2/Service References/ClientService/configuration91.svcinfo (modified) (3 diffs)
• HeuristicLab.Hive.Client.Console/3.2/Service References/ClientService/service.wsdl (modified) (2 diffs)
• HeuristicLab.Hive.Client.Console/3.2/app.config (modified) (2 diffs)
• HeuristicLab.Hive.Client.Core/3.2/ClientConsoleService/TransferObjects/StatusCommons.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/3.2/ConfigurationManager/ConfigManager.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/3.2/Core.cs (modified) (2 diffs)
• HeuristicLab.Hive.Client.Core/3.2/Heartbeat.cs (modified) (2 diffs)
• HeuristicLab.Hive.Client.Core/3.2/JobStorage/JobStorageManager.cs (modified) (2 diffs)
• HeuristicLab.Hive.Client.ExecutionEngine/3.2/Executor.cs (modified) (3 diffs)
• HeuristicLab.Hive.Contracts/3.2/ApplicationConstants.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/3.2/BusinessObjects/ClientDto.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.ADODataAccess/3.2/ClientAdapter.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Console/3.2/HeuristicLab.Hive.Server.Console-3.2.csproj (modified) (1 diff)
• HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.cs (modified) (4 diffs)
• HeuristicLab.Hive.Server.Core/3.2/ClientCommunicator.cs (modified) (5 diffs)
• HeuristicLab.Hive.Server.Core/3.2/ClientFacade.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.2/DbTestApp.cs (modified) (10 diffs)
• HeuristicLab.Hive.Server.Core/3.2/InternalInterfaces/IInternalJobManager.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.2/JobManager.cs (modified) (14 diffs)
• HeuristicLab.Hive.Server.DataAccess/3.2/IJobDao.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/BaseDao.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/ClientDao.cs (modified) (8 diffs)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/ClientGroupDao.cs (modified) (13 diffs)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/ContextFactory.cs (modified) (3 diffs)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/HeuristicLab.Hive.Server.LINQDataAccess-3.2.csproj (modified) (3 diffs)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/Hive.dbml (modified) (2 diffs)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/Hive.dbml.layout (modified) (1 diff)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/Hive.designer.cs (modified) (6 diffs)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/HiveDataContext.cs (added)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/HiveDataContext.xml (modified) (8 diffs)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/JobDao.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/Properties/Settings.Designer.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/Properties/Settings.settings (modified) (1 diff)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/UptimeCalendarDao.cs (modified) (5 diffs)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/app.config (modified) (1 diff)
• HeuristicLab.Hive.Server/3.2/ServiceCallInterception.cs (modified) (5 diffs)
• HeuristicLab.Tracing/3.2/HeuristicLab.Hive.log4net.xml (modified) (5 diffs)
• HeuristicLab.Tracing/3.2/app.config (modified) (1 diff)

branches/3.2/sources/HeuristicLab.Hive.Client.Communication/3.2/WcfService.cs

@@ -326 +326 @@
     #region Heartbeat
 
-    public event System.EventHandler<ProcessHeartBeatCompletedEventArgs> SendHeartBeatCompleted;
-    public void SendHeartBeatAsync(HeartBeatData hbd) {
+    public event System.EventHandler<ProcessHeartBeatCompletedEventArgs> ProcessHeartBeatCompleted;
+    public void ProcessHeartBeatAsync(HeartBeatData hbd) {
       if (ConnState == NetworkEnum.WcfConnState.Loggedin)
         Logger.Debug("STARTING: sending heartbeat");
@@ -334 +334 @@
 
     private void proxy_ProcessHeartBeatCompleted(object sender, ProcessHeartBeatCompletedEventArgs e) {
-      if (e.Error == null && e.Result.Success == true) {
-        SendHeartBeatCompleted(sender, e);
+      if (e.Error == null && e.Result.Success) {
+        ProcessHeartBeatCompleted(sender, e);
         Logger.Debug("ENDED: sending heartbeats");
       } else {
@@ -376 +376 @@
     }
 
-    public ResponseResultReceived SendStoredJobResultsSync(Guid clientId, Guid jobId, byte[] result, double percentage, Exception exception, bool finished) {      
+    public ResponseResultReceived StoreFinishedJobResultsSync(Guid clientId, Guid jobId, byte[] result, double percentage, Exception exception, bool finished) {      
       return proxy.StoreFinishedJobResultStreamed(
         GetStreamedJobResult(clientId, jobId, result, percentage, exception));

branches/3.2/sources/HeuristicLab.Hive.Client.Console/3.2/HeuristicLab.Hive.Client.Console-3.2.csproj

@@ -202 +202 @@
     <None Include="Properties\DataSources\Calendar.Appointment.datasource" />
     <None Include="Resources\shutdown-icon.png" />
-    <None Include="Service References\ClientService\Calendar.xsd" />
-    <None Include="Service References\ClientService\System.Drawing.xsd" />
   </ItemGroup>
   <ItemGroup>
@@ -213 +211 @@
   <ItemGroup>
     <None Include="Resources\exit-48.png" />
+    <None Include="Service References\ClientService\Calendar1.xsd" />
+    <None Include="Service References\ClientService\System.Drawing1.xsd" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/3.2/sources/HeuristicLab.Hive.Client.Console/3.2/HiveClientConsole.cs

@@ -187 +187 @@
     }
 
-    private void UpdateGraph(JobStatus[] jobs)
+    private void UpdateGraph(StatusCommons sc)
     {
       ZedGraphControl zgc = new ZedGraphControl();
@@ -208 +208 @@
       double done = 0;
 
-      if (jobs.Length == 0)
+      
+      /*if (jobs.Length == 0)
       {
         myPane.AddPieSlice(100, Color.Green, 0.1, "");
@@ -217 +218 @@
         {
           allProgress += jobs[i].Progress;
-        }
-
-        done = allProgress / jobs.Length;
-
-        myPane.AddPieSlice(done, Color.Green, 0, "");
-        myPane.AddPieSlice(1 - done, Color.Red, 0, "");
-      }
+        } */
+
+        //done = allProgress / jobs.Length;
+
+      myPane.AddPieSlice((sc.FreeCores / (double) sc.TotalCores), Color.Red, 0, "");
+      myPane.AddPieSlice(((sc.TotalCores - sc.FreeCores) / (double)sc.TotalCores), Color.Green, 0, "");
+     // }
       //Hides the slice labels
       PieItem.Default.LabelType = PieLabelType.None;
@@ -586 +587 @@
         }
 
-        UpdateGraph(sc.Jobs);
+        UpdateGraph(sc);
 
         if (sc.Status == NetworkEnumWcfConnState.Connected || sc.Status == NetworkEnumWcfConnState.Loggedin)

branches/3.2/sources/HeuristicLab.Hive.Client.Console/3.2/Service References/ClientService/HeuristicLab.Hive.Client.Core.ClientConsoleService.xsd

@@ -7 +7 @@
       <xs:element minOccurs="0" name="ClientGuid" type="ser:guid" />
       <xs:element minOccurs="0" name="ConnectedSince" type="xs:dateTime" />
+      <xs:element minOccurs="0" name="FreeCores" type="xs:int" />
       <xs:element minOccurs="0" name="Jobs" nillable="true" type="tns:ArrayOfJobStatus" />
       <xs:element minOccurs="0" name="JobsAborted" type="xs:int" />
@@ -12 +13 @@
       <xs:element minOccurs="0" name="JobsFetched" type="xs:int" />
       <xs:element xmlns:q1="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Client.Common" minOccurs="0" name="Status" type="q1:NetworkEnum.WcfConnState" />
+      <xs:element minOccurs="0" name="TotalCores" type="xs:int" />
     </xs:sequence>
   </xs:complexType>

branches/3.2/sources/HeuristicLab.Hive.Client.Console/3.2/Service References/ClientService/Reference.cs

@@ -2 +2 @@
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3082
+//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -31 +31 @@
         
         [System.Runtime.Serialization.OptionalFieldAttribute()]
+        private int FreeCoresField;
+        
+        [System.Runtime.Serialization.OptionalFieldAttribute()]
         private HeuristicLab.Hive.Client.Console.ClientService.JobStatus[] JobsField;
         
@@ -44 +47 @@
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private HeuristicLab.Hive.Client.Console.ClientService.NetworkEnumWcfConnState StatusField;
+        
+        [System.Runtime.Serialization.OptionalFieldAttribute()]
+        private int TotalCoresField;
         
         [global::System.ComponentModel.BrowsableAttribute(false)]
@@ -82 +88 @@
         
         [System.Runtime.Serialization.DataMemberAttribute()]
+        public int FreeCores {
+            get {
+                return this.FreeCoresField;
+            }
+            set {
+                if ((this.FreeCoresField.Equals(value) != true)) {
+                    this.FreeCoresField = value;
+                    this.RaisePropertyChanged("FreeCores");
+                }
+            }
+        }
+        
+        [System.Runtime.Serialization.DataMemberAttribute()]
         public HeuristicLab.Hive.Client.Console.ClientService.JobStatus[] Jobs {
             get {
@@ -142 +161 @@
                     this.StatusField = value;
                     this.RaisePropertyChanged("Status");
+                }
+            }
+        }
+        
+        [System.Runtime.Serialization.DataMemberAttribute()]
+        public int TotalCores {
+            get {
+                return this.TotalCoresField;
+            }
+            set {
+                if ((this.TotalCoresField.Equals(value) != true)) {
+                    this.TotalCoresField = value;
+                    this.RaisePropertyChanged("TotalCores");
                 }
             }

branches/3.2/sources/HeuristicLab.Hive.Client.Console/3.2/Service References/ClientService/Reference.svcmap

@@ -26 +26 @@
     <MetadataFile FileName="HeuristicLab.Hive.Client.Core.ClientConsoleService.xsd" MetadataType="Schema" ID="36748734-59b6-4ba4-950d-66ca1a4fc8bb" SourceId="1" SourceUrl="net.tcp://127.0.0.1:8000/ClientConsole/mex" />
     <MetadataFile FileName="HeuristicLab.Hive.Client.Common.xsd" MetadataType="Schema" ID="0c1369fa-d4cc-4149-b202-00da9dd35972" SourceId="1" SourceUrl="net.tcp://127.0.0.1:8000/ClientConsole/mex" />
-    <MetadataFile FileName="Calendar.xsd" MetadataType="Schema" ID="09fa9f67-e082-4dcb-9c41-a7a3f0fb7aef" SourceId="1" SourceUrl="net.tcp://127.0.0.1:8000/ClientConsole/mex" />
-    <MetadataFile FileName="System.Drawing.xsd" MetadataType="Schema" ID="70cfc9bf-b4a8-419b-8c1f-379c0d78f9d2" SourceId="1" SourceUrl="net.tcp://127.0.0.1:8000/ClientConsole/mex" />
+    <MetadataFile FileName="Calendar1.xsd" MetadataType="Schema" ID="5ec19e4e-fed1-451d-971e-01b8df8dcb0a" SourceId="1" SourceUrl="net.tcp://127.0.0.1:8000/ClientConsole/mex" />
+    <MetadataFile FileName="System.Drawing1.xsd" MetadataType="Schema" ID="2aa97a8b-a12e-47ca-8bb7-93a3404f40e5" SourceId="1" SourceUrl="net.tcp://127.0.0.1:8000/ClientConsole/mex" />
   </Metadata>
   <Extensions>

branches/3.2/sources/HeuristicLab.Hive.Client.Console/3.2/Service References/ClientService/configuration.svcinfo

@@ -6 +6 @@
   </bindings>
   <endpoints>
-    <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://127.0.0.1:8000/ClientConsole/ClientConsoleCommunicator&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;NetTcpBinding_IClientConsoleCommunicator&quot; contract=&quot;ClientService.IClientConsoleCommunicator&quot; name=&quot;NetTcpBinding_IClientConsoleCommunicator&quot;&gt;&lt;identity&gt;&lt;userPrincipalName value=&quot;mse08004@fhs-hagenberg.ac.at&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://127.0.0.1:8000/ClientConsole/ClientConsoleCommunicator&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;NetTcpBinding_IClientConsoleCommunicator&quot; contract=&quot;ClientService.IClientConsoleCommunicator&quot; name=&quot;NetTcpBinding_IClientConsoleCommunicator&quot;&gt;&lt;identity&gt;&lt;userPrincipalName value=&quot;mse08004@fhs-hagenberg.ac.at&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" contractName="ClientService.IClientConsoleCommunicator" name="NetTcpBinding_IClientConsoleCommunicator" />
+    <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://127.0.0.1:8000/ClientConsole/ClientConsoleCommunicator&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;NetTcpBinding_IClientConsoleCommunicator&quot; contract=&quot;ClientService.IClientConsoleCommunicator&quot; name=&quot;NetTcpBinding_IClientConsoleCommunicator&quot;&gt;&lt;identity&gt;&lt;userPrincipalName value=&quot;semteX-PC\semteX&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://127.0.0.1:8000/ClientConsole/ClientConsoleCommunicator&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;NetTcpBinding_IClientConsoleCommunicator&quot; contract=&quot;ClientService.IClientConsoleCommunicator&quot; name=&quot;NetTcpBinding_IClientConsoleCommunicator&quot;&gt;&lt;identity&gt;&lt;userPrincipalName value=&quot;semteX-PC\semteX&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" contractName="ClientService.IClientConsoleCommunicator" name="NetTcpBinding_IClientConsoleCommunicator" />
   </endpoints>
 </configurationSnapshot>

branches/3.2/sources/HeuristicLab.Hive.Client.Console/3.2/Service References/ClientService/configuration91.svcinfo

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="LJHqHAg9UO+arib7mQMPUcNSFqQ=">
+<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="BEhVTwOR+7957ZuwDJOXr3mn9MQ=">
   <bindingConfigurations>
     <bindingConfiguration bindingType="netTcpBinding" name="NetTcpBinding_IClientConsoleCommunicator">
@@ -93 +93 @@
         <property path="/security/transport/protectionLevel" isComplexType="false" isExplicitlyDefined="true" clrType="System.Net.Security.ProtectionLevel, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
           <serializedValue>EncryptAndSign</serializedValue>
+        </property>
+        <property path="/security/transport/extendedProtectionPolicy" isComplexType="true" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement</serializedValue>
+        </property>
+        <property path="/security/transport/extendedProtectionPolicy/policyEnforcement" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.PolicyEnforcement, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>Never</serializedValue>
+        </property>
+        <property path="/security/transport/extendedProtectionPolicy/protectionScenario" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.ProtectionScenario, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>TransportSelected</serializedValue>
+        </property>
+        <property path="/security/transport/extendedProtectionPolicy/customServiceNames" isComplexType="true" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.Configuration.ServiceNameElementCollection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>(Collection)</serializedValue>
         </property>
         <property path="/security/message" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.MessageSecurityOverTcpElement, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -137 +149 @@
         </property>
         <property path="/identity/userPrincipalName/value" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-          <serializedValue>mse08004@fhs-hagenberg.ac.at</serializedValue>
+          <serializedValue>semteX-PC\semteX</serializedValue>
         </property>
         <property path="/identity/servicePrincipalName" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.ServicePrincipalNameElement, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

branches/3.2/sources/HeuristicLab.Hive.Client.Console/3.2/Service References/ClientService/service.wsdl

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:tns="http://tempuri.org/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" name="ClientConsoleCommunicator" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:tns="http://tempuri.org/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" name="ClientConsoleCommunicator" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <wsp:Policy wsu:Id="NetTcpBinding_IClientConsoleCommunicator_policy">
     <wsp:ExactlyOne>
@@ -190 +190 @@
         <wsa10:Address>net.tcp://127.0.0.1:8000/ClientConsole/ClientConsoleCommunicator</wsa10:Address>
         <Identity xmlns="http://schemas.xmlsoap.org/ws/2006/02/addressingidentity">
-          <Upn>mse08004@fhs-hagenberg.ac.at</Upn>
+          <Upn>semteX-PC\semteX</Upn>
         </Identity>
       </wsa10:EndpointReference>

branches/3.2/sources/HeuristicLab.Hive.Client.Console/3.2/app.config

@@ -27 +27 @@
                                           enabled="false" />
                                    <security mode="Transport">
-                                          <transport clientCredentialType="Windows" protectionLevel="EncryptAndSign" />
+                                          <transport clientCredentialType="Windows" protectionLevel="EncryptAndSign">
+                                                 <extendedProtectionPolicy policyEnforcement="Never" />
+                                          </transport>
                                           <message clientCredentialType="Windows" />
                                    </security>
@@ -38 +40 @@
                             contract="ClientService.IClientConsoleCommunicator" name="NetTcpBinding_IClientConsoleCommunicator">
                             <identity>
-                                   <userPrincipalName value="mse08004@fhs-hagenberg.ac.at" />
+                                   <userPrincipalName value="semteX-PC\semteX" />
                             </identity>
                      </endpoint>

branches/3.2/sources/HeuristicLab.Hive.Client.Core/3.2/ClientConsoleService/TransferObjects/StatusCommons.cs

@@ -40 +40 @@
     public DateTime ConnectedSince { get; set; }
     [DataMember]
+    public int TotalCores { get; set; }
+    [DataMember]
+    public int FreeCores { get; set; }
+    [DataMember]
     public int JobsFetched { get; set; }
     [DataMember]

branches/3.2/sources/HeuristicLab.Hive.Client.Core/3.2/ConfigurationManager/ConfigManager.cs

@@ -108 +108 @@
       st.ConnectedSince = WcfService.Instance.ConnectedSince;
 
+      st.TotalCores = hardwareInfo.NrOfCores;
+      st.FreeCores = hardwareInfo.NrOfCores - GetUsedCores();
+
       st.JobsAborted = ClientStatusInfo.JobsAborted;
       st.JobsDone = ClientStatusInfo.JobsProcessed;

branches/3.2/sources/HeuristicLab.Hive.Client.Core/3.2/Core.cs

@@ -259 +259 @@
           lock (engines) {
             appDomains[jId].UnhandledException -= new UnhandledExceptionEventHandler(appDomain_UnhandledException);
+            
+            //Disposing it
+            engines[jId].Dispose();
+            
             AppDomain.Unload(appDomains[jId]);
             Logger.Debug("Unloaded appdomain");
@@ -478 +482 @@
       lock (engines) {
         try {
+          engines[id].Dispose();  
           appDomains[id].UnhandledException -= new UnhandledExceptionEventHandler(appDomain_UnhandledException);
           AppDomain.Unload(appDomains[id]);

branches/3.2/sources/HeuristicLab.Hive.Client.Core/3.2/Heartbeat.cs

@@ -65 +65 @@
       heartbeatTimer.Elapsed += new ElapsedEventHandler(heartbeatTimer_Elapsed);
       wcfService = WcfService.Instance;
-      wcfService.SendHeartBeatCompleted += new EventHandler<ProcessHeartBeatCompletedEventArgs>(wcfService_ProcessHeartBeatCompleted);
+      wcfService.ProcessHeartBeatCompleted += new EventHandler<ProcessHeartBeatCompletedEventArgs>(wcfService_ProcessHeartBeatCompleted);
       heartbeatTimer.Start();
     }
@@ -105 +105 @@
       } else if (wcfService.ConnState == NetworkEnum.WcfConnState.Loggedin) {
         Logger.Debug("Sending Heartbeat: " + heartBeatData);        
-        wcfService.SendHeartBeatAsync(heartBeatData);
+        wcfService.ProcessHeartBeatAsync(heartBeatData);
       }
     }

branches/3.2/sources/HeuristicLab.Hive.Client.Core/3.2/JobStorage/JobStorageManager.cs

@@ -1 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -51 +51 @@
             byte[] job = File.ReadAllBytes(path + filename + ".dat");
             if (WcfService.Instance.IsJobStillNeeded(storedJobsList[index - 1].JobID).StatusMessage == ApplicationConstants.RESPONSE_COMMUNICATOR_SEND_JOBRESULT) {
-              ResponseResultReceived res = WcfService.Instance.SendStoredJobResultsSync(ConfigManager.Instance.GetClientInfo().Id, storedJobsList[index - 1].JobID, job, 1.00, null, true);
+              ResponseResultReceived res = WcfService.Instance.StoreFinishedJobResultsSync(ConfigManager.Instance.GetClientInfo().Id, storedJobsList[index - 1].JobID, job, 1.00, null, true);
               if (!res.Success)
                 Logger.Error("sending of job failed: " + res.StatusMessage);

branches/3.2/sources/HeuristicLab.Hive.Client.ExecutionEngine/3.2/Executor.cs

@@ -33 +33 @@
 
 namespace HeuristicLab.Hive.Client.ExecutionEngine {
-  public class Executor: MarshalByRefObject {
+  public class Executor: MarshalByRefObject, IDisposable {
     public Guid JobId { get; set; }
     public IJob Job { get; set; }
@@ -109 +109 @@
         throw new InvalidStateException("Job is still running");
       } else {
-        return SerializeJobObject();
+        byte[] jobArr = SerializeJobObject();        
+        return jobArr;
       }
-    }
+    }    
 
 
@@ -131 +132 @@
       JobIsFinished = false;
       Job = new TestJob();
-    }    
+    }
+
+    #region IDisposable Members
+
+    public void Dispose() {
+      Job.JobFailed -= new EventHandler(Job_JobFailed);
+      Job.JobFailed -= new EventHandler(Job_JobStopped);
+      Queue = null;
+      Job = null;
+    }
+
+    #endregion
   }
 }

branches/3.2/sources/HeuristicLab.Hive.Contracts/3.2/ApplicationConstants.cs

@@ -29 +29 @@
   public class ApplicationConstants {
 
-    public static System.Data.IsolationLevel ISOLATION_LEVEL = IsolationLevel.ReadCommitted;
+    public static System.Data.IsolationLevel ISOLATION_LEVEL = IsolationLevel.ReadUncommitted;
 
     public static System.Transactions.IsolationLevel ISOLATION_LEVEL_SCOPE =
-      System.Transactions.IsolationLevel.ReadCommitted;
+      System.Transactions.IsolationLevel.ReadUncommitted;
     public static int HEARTBEAT_MAX_DIF = 120; // value in seconds
     public static int JOB_TIME_TO_LIVE = 5;

branches/3.2/sources/HeuristicLab.Hive.Contracts/3.2/BusinessObjects/ClientDto.cs

@@ -39 +39 @@
     public int NrOfFreeCores { get; set; }
     [DataMember]
-    public int CpuSpeedPerCore { get; set; }
+    public int? CpuSpeedPerCore { get; set; }
     [DataMember]
     public int Memory { get; set; }
@@ -45 +45 @@
     public int FreeMemory { get; set; }
     [DataMember]
-    public DateTime Login { get; set; }
+    public DateTime? Login { get; set; }
     [DataMember]
     public State State { get; set; }

branches/3.2/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/ClientAdapter.cs

@@ -156 +156 @@
       if (client != null && row != null) {
         row.ResourceId = client.Id;
-        row.CPUSpeed = client.CpuSpeedPerCore;
+       // row.CPUSpeed = client.CpuSpeedPerCore;
         row.Memory = client.Memory;
-        row.Login = client.Login;
+       // row.Login = client.Login;
         if (client.State != State.nullState)
           row.Status = client.State.ToString();

branches/3.2/sources/HeuristicLab.Hive.Server.Console/3.2/HeuristicLab.Hive.Server.Console-3.2.csproj

@@ -217 +217 @@
       <Name>HeuristicLab.PluginInfrastructure</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Tracing\3.2\HeuristicLab.Tracing-3.2.csproj">
+      <Project>{EE2034D9-6E27-48A1-B855-42D45F69A4FC}</Project>
+      <Name>HeuristicLab.Tracing-3.2</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/3.2/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.cs

@@ -33 +33 @@
 using System.Threading;
 using System.ServiceModel;
+using HeuristicLab.Tracing;
 
 namespace HeuristicLab.Hive.Server.ServerConsole {
@@ -263 +264 @@
         IJobManager jobManager =
           ServiceLocator.GetJobManager();
-        jobs = jobManager.GetAllJobs();
-
-        lvJobControl.Items.Clear();
+        if (jobManager == null) {
+          Logger.Error("Jobmanager is null");
+          jobs = new ResponseList<JobDto>();
+        } else {
+          jobs = jobManager.GetAllJobs();
+        }
+
+
+        if (lvJobControl != null) lvJobControl.Items.Clear();
 
         ListViewGroup lvJobCalculating = new ListViewGroup("calculating", HorizontalAlignment.Left);
@@ -311 +318 @@
       }
       catch (Exception ex) {
+        Logger.Error(ex);
         closeFormEvent(true, true);
         this.Close();
@@ -790 +798 @@
     }
 
-    private int CapacityRam(int noCores, int freeCores) {
+    private int CapacityRam(int noCores, int freeCores) {    
       if (noCores > 0) {
         int capacity = ((noCores - freeCores) / noCores) * 100;

branches/3.2/sources/HeuristicLab.Hive.Server.Core/3.2/ClientCommunicator.cs

@@ -120 +120 @@
                 Logger.Info("Client timed out and is on RESET");
                 foreach (JobDto job in DaoLocator.JobDao.FindActiveJobsOfClient(client)) {
-                  jobManager.ResetJobsDependingOnResults(job);
+                  DaoLocator.JobDao.SetJobOffline(job);
                   lock (newAssignedJobs) {
                     if (newAssignedJobs.ContainsKey(job.Id))
@@ -149 +149 @@
               lastHeartbeats.Remove(client.Id);
             foreach (JobDto job in DaoLocator.JobDao.FindActiveJobsOfClient(client)) {
-              jobManager.ResetJobsDependingOnResults(job);
+              DaoLocator.JobDao.SetJobOffline(job);
             }
             heartbeatLock.ExitWriteLock();
@@ -428 +428 @@
       JobDto job2Calculate = scheduler.GetNextJobForClient(clientId);
       if (job2Calculate != null) {
-        response.Job = job2Calculate;
+        response.Job = job2Calculate;        
         response.Job.PluginsNeeded = DaoLocator.PluginInfoDao.GetPluginDependenciesForJob(response.Job);
         response.Success = true;
@@ -481 +481 @@
 
       if (response.Success) {
-        jobStream = DaoLocator.JobDao.GetSerializedJobStream(result.JobId);
-
+        Logger.Debug("Trying to aquire WCF Job Stream");
+        //jobStream = DaoLocator.JobDao.GetSerializedJobStream(result.JobId);
+        //Logger.Debug("Job Stream Aquired");
         byte[] buffer = new byte[3024];
+        List<byte> serializedJob = new List<byte>();
         int read = 0;
-        while ((read = stream.Read(buffer, 0, buffer.Length)) > 0) {
-          jobStream.Write(buffer, 0, read);
-        }
-        jobStream.Close();
+        int i = 0;        
+        while ((read = stream.Read(buffer, 0, buffer.Length)) > 0) {          
+          for (int j = 0; j < read; j++) {
+            serializedJob.Add(buffer[j]);
+          }
+          if (i% 100 == 0)
+            Logger.Debug("Writing to stream: " + i);         
+          //jobStream.Write(buffer, 0, read);
+          i++;
+        }
+        Logger.Debug("Done Writing, closing the stream!");               
+        //jobStream.Close();
+
+        DaoLocator.JobDao.SetBinaryJobFile(result.JobId, serializedJob.ToArray());
       }
       Logger.Info("END Job received for Storage:");
+      stream.Dispose();
       return response;
     }
@@ -656 +669 @@
         foreach (JobDto job in jobsOfClient) {
           if (job.State != State.finished)
-            jobManager.ResetJobsDependingOnResults(job);
+            DaoLocator.JobDao.SetJobOffline(job);
         }
       }

branches/3.2/sources/HeuristicLab.Hive.Server.Core/3.2/ClientFacade.cs

@@ -114 +114 @@
       IJobManager jobManager = 
         ServiceLocator.GetJobManager();
-
+      IInternalJobManager internalJobManager = (IInternalJobManager) jobManager;
+      
       //second stream the job binary data
-      
+      MemoryStream memoryStream = new MemoryStream();      
       if(job.Job != null)
-        stream.AddStream(
-          ((IInternalJobManager) (jobManager)).
-            GetJobStreamById(
-            job.Job.Id));
+        stream.AddStream(new MemoryStream(internalJobManager.GetSerializedJobDataById(job.Job.Id)));
       
       OperationContext clientContext = OperationContext.Current;

branches/3.2/sources/HeuristicLab.Hive.Server.Core/3.2/DbTestApp.cs

@@ -1 +1 @@
 #region License Information
+
 /* HeuristicLab
  * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
@@ -18 +19 @@
  * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
  */
+
 #endregion
 
@@ -37 +39 @@
 using HeuristicLab.Hive.Server.LINQDataAccess;
 using System.Transactions;
+using System.Threading;
+using HeuristicLab.Tracing;
 
 namespace HeuristicLab.Hive.Server {
   [Application("Hive DB Test App", "Test Application for the Hive DataAccess Layer")]
-  class HiveDbTestApplication : ApplicationBase {
+  internal class HiveDbTestApplication : ApplicationBase {
     /*private void TestJobStreaming() {
       ISessionFactory factory =
@@ -111 +115 @@
     } */
 
-    ClientDao clientDao = new ClientDao();
-    ClientGroupDao cgd = new ClientGroupDao();
-
-    private void TestLINQImplementation() {      
-      
-      
+    private ClientDao clientDao = new ClientDao();
+    private ClientGroupDao cgd = new ClientGroupDao();
+
+    private void TestLINQImplementation() {
       ClientDto c1 = new ClientDto();
       c1.Id = Guid.NewGuid();
@@ -143 +145 @@
       c2 = clientDao.Insert(c2);
 
-      //ClientDto info2 = clientDao.FindById(info.Id);
-      //Console.WriteLine(info2);
-      
       ClientGroupDto tg = new ClientGroupDto();
       tg.Name = "TopGroup";
@@ -174 +173 @@
 
       List<ClientGroupDto> list = new List<ClientGroupDto>(cgd.FindAllWithSubGroupsAndClients());
-      
+
       cgd.RemoveRessourceFromClientGroup(sg.Id, tg.Id);
 
@@ -181 +180 @@
       clientDao.Delete(c1);
       clientDao.Delete(c2);
-
     }
 
@@ -220 +218 @@
         sg = cgd.Insert(sg);
         cgd.AddRessourceToClientGroup(sg.Id, mg.Id);
-        populateMainGroup(sg, p-1);
-      }
-
-      
-    }
-
+        populateMainGroup(sg, p - 1);
+      }
+    }
 
 
@@ -235 +230 @@
       //TestJobResultDeserialization();
 
+      //if (ContextFactory.Context.DatabaseExists())
+      //  ContextFactory.Context.DeleteDatabase();
+      //ContextFactory.Context.CreateDatabase();
       //TestLINQImplementation();
+      TestLinqFileHandling();
       //StressTest();
 
       //SpeedTest();
       //TestJobBytearrFetching();
-      TestJobStreamFetching();
-
-    }
-
-    private void TestJobStreamFetching() {
+      //TestJobStreamFetching();
+    }
+
+    private void WriteToJobWithByte(object jobid) {
+      using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+                                                           new TransactionOptions
+                                                           {IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE})
+        ) {
+        Logger.Info("starting bytestuff for job " + jobid);
+        DaoLocator.JobDao.SetBinaryJobFile((Guid)jobid, jobmap[(Guid)jobid]);
+        scope.Complete();
+        Logger.Info("ended bytestuff for job " + jobid);
+      }
+    }
+
+    private void UpdateJobStatus(object jobid) {
+      using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+                                                           new TransactionOptions
+                                                           {IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE})
+        ) {
+        Thread.Sleep(1500);
+        Logger.Info("starting now");
+        JobDto job = DaoLocator.JobDao.FindById((Guid)jobid);
+        job.Percentage = new Random().NextDouble();
+        DaoLocator.JobDao.Update(job);
+        scope.Complete();
+        Logger.Info("ended");
+      }
+    }
+
+    Dictionary<Guid, byte[]> jobmap = new Dictionary<Guid, byte[]>();
+
+
+    private void TestLinqFileHandling() {
+      List<Thread> jobupdateThreads = new List<Thread>();
+      List<Thread> jobProgressThreads = new List<Thread>();
+      
+      Random r = new Random();
+      Stack<JobDto> jobs = new Stack<JobDto>(DaoLocator.JobDao.FindAll());
+      Logger.Info("Fetched jobs");
+      for (int x = 0; x < 10 && jobs.Count > 0; x++ ) {
+        Logger.Info("Creating data for Job");
+        JobDto job = jobs.Pop();
+        byte[] jobarr = new byte[50*1024*1024];
+        for (int i = 0; i < jobarr.Length; i++) {
+          jobarr[i] = (byte) r.Next(255);
+        }
+        jobmap.Add(job.Id, jobarr);
+      }
+      Logger.Info("filled");
+      foreach(KeyValuePair<Guid, byte[]> kvp in jobmap) {
+        Thread tjob = new Thread(new ParameterizedThreadStart(WriteToJobWithByte));      
+        Thread tupdate = new Thread(new ParameterizedThreadStart(UpdateJobStatus));
+        jobupdateThreads.Add(tupdate);
+        jobProgressThreads.Add(tjob);
+        tupdate.Start(kvp.Key);
+        tjob.Start(kvp.Key);
+      }
+      foreach (Thread t in jobupdateThreads) {
+        t.Join();
+      }
+      foreach (Thread t in jobProgressThreads) {
+        t.Join();
+      }
+    }
+
+
+    private
+      void TestJobStreamFetching() {
       //using (TransactionScope scope = new TransactionScope()) {
+
       HiveDataContext context = ContextFactory.Context;
 
-      ContextFactory.Context.Connection.Open();
-      ContextFactory.Context.Transaction = ContextFactory.Context.Connection.BeginTransaction();
-      
+      ContextFactory.Context.Connection.Open
+        ();
+      ContextFactory.Context.Transaction
+        =
+        ContextFactory.Context.Connection.BeginTransaction
+          ();
+
+
       ClientFacade facade = new ClientFacade();
+
       Stream stream = facade.SendStreamedJob(new Guid("F5CFB334-66A0-417C-A585-71711BA21D3F"));
-      
+
+
       byte[] buffer = new byte[3024];
+
       int read = 0;
-      
-      while ((read = stream.Read(buffer, 0, buffer.Length)) > 0) {}
-      
-      stream.Close();
+
+      while ((
+               read
+               =
+               stream.Read
+                 (
+                 buffer
+                 , 0,
+                 buffer.Length
+                 )) > 0) {}
+
+      stream.Close
+        ();
 
       //Stream stream = DaoLocator.JobDao.GetSerializedJobStream(new Guid("bbb51f87-4e2f-4499-a9b6-884e589c78b6"));
@@ -265 +346 @@
     }
 
-    private void TestJobBytearrFetching() {
+    private
+      void TestJobBytearrFetching() {
       byte[] arr = DaoLocator.JobDao.GetBinaryJobFile(new Guid("A3386907-2B3C-4976-BE07-04D660D40A5B"));
-      Console.WriteLine(arr);
-    }
-
-    private void SpeedTest() {
+      Console.WriteLine
+        (
+        arr
+        );
+    }
+
+    private
+      void SpeedTest() {
       DateTime start = new DateTime();
+
       List<ClientGroupDto> list = new List<ClientGroupDto>(cgd.FindAllWithSubGroupsAndClients());
+
       DateTime end = new DateTime();
+
       TimeSpan used = end - start;
-      Console.WriteLine(used.TotalMilliseconds);
-    }
-
-
+      Console.WriteLine
+        (
+        used.TotalMilliseconds
+        );
+    }
   }
 }

branches/3.2/sources/HeuristicLab.Hive.Server.Core/3.2/InternalInterfaces/IInternalJobManager.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Hive.Server.Core.InternalInterfaces {
-  interface IInternalJobManager {
-    void ResetJobsDependingOnResults(JobDto job);
-
+  interface IInternalJobManager {   
     Stream GetJobStreamById(Guid jobId);
+    byte[] GetSerializedJobDataById(Guid jobId);
+    void SetSerializedJobDataById(Guid jobId, byte[] data);
   }
 }

branches/3.2/sources/HeuristicLab.Hive.Server.Core/3.2/JobManager.cs

@@ -1 +1 @@
 #region License Information
+
 /* HeuristicLab
  * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
@@ -18 +19 @@
  * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
  */
+
 #endregion
 
@@ -38 +40 @@
 
 namespace HeuristicLab.Hive.Server.Core {
-  class JobManager: IJobManager, IInternalJobManager {
-
+  internal class JobManager : IJobManager, IInternalJobManager {
     //ISessionFactory factory;
-    ILifecycleManager lifecycleManager;
+    private ILifecycleManager lifecycleManager;
 
     #region IJobManager Members
@@ -53 +54 @@
     }
 
-    private JobDto GetLastJobResult(Guid jobId) {     
+    private JobDto GetLastJobResult(Guid jobId) {
       return DaoLocator.JobDao.FindById(jobId);
     }
 
-    public void ResetJobsDependingOnResults(JobDto job) {
-      Logger.Info("Setting job " + job.Id + " offline");
-      if (job != null) {
-        DaoLocator.JobDao.SetJobOffline(job);
-      }
-    }
-         
-
-    void checkForDeadJobs() {
+
+    private void checkForDeadJobs() {
       Logger.Info("Searching for dead Jobs");
-      using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required, new TransactionOptions { IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE })) {
+      using (
+        TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+                                                      new TransactionOptions
+                                                      {IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE})) {
         List<JobDto> allJobs = new List<JobDto>(DaoLocator.JobDao.FindAll());
         foreach (JobDto curJob in allJobs) {
-          if (curJob.State != State.calculating) {
-            ResetJobsDependingOnResults(curJob);
+          if (curJob.State != State.calculating && curJob.State != State.finished) {
+            DaoLocator.JobDao.SetJobOffline(curJob);
           }
         }
@@ -79 +76 @@
     }
 
-    void lifecycleManager_OnStartup(object sender, EventArgs e) {
+    private void lifecycleManager_OnStartup(object sender, EventArgs e) {
+      Logger.Info("Startup Event Fired, Checking DB for consistency");
       checkForDeadJobs();
-    }
-
-    void lifecycleManager_OnShutdown(object sender, EventArgs e) {
+      Logger.Info("Startup Event Done");
+    }
+
+    private void lifecycleManager_OnShutdown(object sender, EventArgs e) {
+      Logger.Info("Startup Event Fired, Checking DB for consistency");
       checkForDeadJobs();
+      Logger.Info("Startup Event Done");
     }
 
@@ -92 +93 @@
     /// <returns></returns>
     public ResponseList<JobDto> GetAllJobs() {
-         ResponseList<JobDto> response = new ResponseList<JobDto>();
-
-         response.List = new List<JobDto>(DaoLocator.JobDao.FindAll());
-         response.Success = true;
-         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ALL_JOBS;
-
-         return response;
+      ResponseList<JobDto> response = new ResponseList<JobDto>();
+
+      response.List = new List<JobDto>(DaoLocator.JobDao.FindAll());
+      response.Success = true;
+      response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ALL_JOBS;
+
+      return response;
     }
 
@@ -105 +106 @@
       response.List = new List<JobDto>(DaoLocator.JobDao.FindWithLimitations(jobState, offset, count));
       return response;
-    }  
+    }
 
     /// <summary>
@@ -112 +113 @@
     /// <param name="jobId"></param>
     /// <returns></returns>
-    public Stream GetJobStreamById(Guid jobId) {           
+    public Stream GetJobStreamById(Guid jobId) {
       return DaoLocator.JobDao.GetSerializedJobStream(jobId);
-      
     }
 
@@ -122 +122 @@
     /// <returns></returns>
     public ResponseObject<JobDto> GetJobById(Guid jobId) {
-        ResponseObject<JobDto> response = new ResponseObject<JobDto>();
+      ResponseObject<JobDto> response = new ResponseObject<JobDto>();
 
       response.Obj = DaoLocator.JobDao.FindById(jobId);
-        if (response.Obj != null) {
-          response.Success = true;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_GET_JOB_BY_ID;
-        } else {
-          response.Success = false;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_DOESNT_EXIST;
-        }
-
-        return response;
-      }
+      if (response.Obj != null) {
+        response.Success = true;
+        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_GET_JOB_BY_ID;
+      }
+      else {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_DOESNT_EXIST;
+      }
+
+      return response;
+    }
 
     public ResponseObject<JobDto> GetJobByIdWithDetails(Guid jobId) {
@@ -144 +145 @@
 
         job.Obj.Client = DaoLocator.ClientDao.GetClientForJob(jobId);
-      } else {
+      }
+      else {
         job.Success = false;
         job.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_DOESNT_EXIST;
-      }      
+      }
       return job;
     }
@@ -154 +156 @@
       IClientGroupDao cgd = DaoLocator.ClientGroupDao;
       foreach (string res in resources) {
-        foreach(ClientGroupDto cg in cgd.FindByName(res)) {
+        foreach (ClientGroupDto cg in cgd.FindByName(res)) {
           job.JobInfo.AssignedResourceIds.Add(cg.Id);
         }
@@ -167 +169 @@
     /// <returns></returns>
     public ResponseObject<JobDto> AddNewJob(SerializedJob job) {
-        ResponseObject<JobDto> response = new ResponseObject<JobDto>();
-
-        if (job != null && job.JobInfo != null) {
-          if (job.JobInfo.State != State.offline) {
-            response.Success = false;
-            response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOBSTATE_MUST_BE_OFFLINE;
-            return response;
-          }
-          if (job.JobInfo.Id != Guid.Empty) {
-            response.Success = false;
-            response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ID_MUST_NOT_BE_SET;
-            return response;
-          }
-          if (job.SerializedJobData == null) {
-            response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_NULL;
-            response.Success = false;
-            return response;
-          }
-
-          job.JobInfo.DateCreated = DateTime.Now;
-          DaoLocator.JobDao.InsertWithAttachedJob(job);
-          DaoLocator.PluginInfoDao.InsertPluginDependenciesForJob(job.JobInfo);
-          
-          response.Success = true;
-          response.Obj = job.JobInfo;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_ADDED;
-        } else {
+      ResponseObject<JobDto> response = new ResponseObject<JobDto>();
+
+      if (job != null && job.JobInfo != null) {
+        if (job.JobInfo.State != State.offline) {
           response.Success = false;
+          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOBSTATE_MUST_BE_OFFLINE;
+          return response;
+        }
+        if (job.JobInfo.Id != Guid.Empty) {
+          response.Success = false;
+          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ID_MUST_NOT_BE_SET;
+          return response;
+        }
+        if (job.SerializedJobData == null) {
           response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_NULL;
-        }
-
+          response.Success = false;
+          return response;
+        }
+
+        job.JobInfo.DateCreated = DateTime.Now;
+        DaoLocator.JobDao.InsertWithAttachedJob(job);
+        DaoLocator.PluginInfoDao.InsertPluginDependenciesForJob(job.JobInfo);
+
+        response.Success = true;
+        response.Obj = job.JobInfo;
+        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_ADDED;
+      }
+      else {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_NULL;
+      }
+
+      return response;
+    }
+
+    /// <summary>
+    /// Removes a job from the database
+    /// </summary>
+    /// <param name="jobId"></param>
+    /// <returns></returns>
+    public Response RemoveJob(Guid jobId) {
+      Response response = new Response();
+
+      JobDto job = DaoLocator.JobDao.FindById(jobId);
+      if (job == null) {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_DOESNT_EXIST;
         return response;
       }
-    /*  finally {
-        if (session != null)
-          session.EndSession();
-      }
-    } */
-
-    /// <summary>
-    /// Removes a job from the database
-    /// </summary>
-    /// <param name="jobId"></param>
-    /// <returns></returns>
-    public Response RemoveJob(Guid jobId) {
-        Response response = new Response();
-
-      JobDto job = DaoLocator.JobDao.FindById(jobId);
-        if (job == null) {
-          response.Success = false;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_DOESNT_EXIST;
-          return response;
-        }
-        DaoLocator.JobDao.Delete(job);
-        response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_REMOVED;
-
-        return response;
-      }
+      DaoLocator.JobDao.Delete(job);
+      response.Success = false;
+      response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_REMOVED;
+
+      return response;
+    }
 
     public ResponseObject<JobDto> GetLastJobResultOf(Guid jobId) {
@@ -231 +229 @@
         new ResponseObject<JobDto>();
 
-       result.Obj =
-         GetLastJobResult(jobId);
-       result.Success =
-         result.Obj != null;
-
-       return result;
+      result.Obj =
+        GetLastJobResult(jobId);
+      result.Success =
+        result.Obj != null;
+
+      return result;
     }
 
     public ResponseObject<SerializedJob>
       GetLastSerializedJobResultOf(Guid jobId, bool requested) {
-
-        ResponseObject<SerializedJob> response =
-          new ResponseObject<SerializedJob>();
+      ResponseObject<SerializedJob> response =
+        new ResponseObject<SerializedJob>();
 
       JobDto job = DaoLocator.JobDao.FindById(jobId);
-        if (requested && (job.State == State.requestSnapshot || job.State == State.requestSnapshotSent)) {
-          response.Success = true;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE;
-          
-          //tx.Commit();
-          
-          return response;
-        }
-
-        /*JobResult lastResult =
-          jobResultsAdapter.GetLastResultOf(job.Id);*/
-
-        //if (lastResult != null) {
-          response.Success = true;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_RESULT_SENT;
-          response.Obj = new SerializedJob();
-          response.Obj.JobInfo = job;
-          response.Obj.SerializedJobData =
-            DaoLocator.JobDao.GetBinaryJobFile(jobId);
-        //} else {
-        //  response.Success = false;
-        //}
-
-        //tx.Commit();
+      if (requested && (job.State == State.requestSnapshot || job.State == State.requestSnapshotSent)) {
+        response.Success = true;
+        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE;
+
         return response;
       }
-      /*catch (Exception ex) {
-        if (tx != null)
-          tx.Rollback();
-        throw ex;
-      }
-      finally {
-        if (session != null)
-          session.EndSession();
-      }
-    }    */
+
+      response.Success = true;
+      response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_RESULT_SENT;
+      response.Obj = new SerializedJob();
+      response.Obj.JobInfo = job;
+      response.Obj.SerializedJobData =
+        DaoLocator.JobDao.GetBinaryJobFile(jobId);
+      return response;
+    }
 
 
     public Response RequestSnapshot(Guid jobId) {
-     // ISession session = factory.GetSessionForCurrentThread();
       Response response = new Response();
-      
-     /* try {
-        IJobAdapter jobAdapter = session.GetDataAdapter<JobDto, IJobAdapter>();*/
-
-        JobDto job = DaoLocator.JobDao.FindById(jobId);
-        if (job.State == State.requestSnapshot || job.State == State.requestSnapshotSent) {
-          response.Success = true;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_REQUEST_ALLREADY_SET;
-          return response; // no commit needed
-        }
-        if (job.State != State.calculating) {
-          response.Success = false;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_IS_NOT_BEEING_CALCULATED;
-          return response; // no commit needed
-        }
-        // job is in correct state
-        job.State = State.requestSnapshot;
-        DaoLocator.JobDao.Update(job);
-
-        response.Success = true;
-        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_REQUEST_SET;
-
+
+
+      JobDto job = DaoLocator.JobDao.FindById(jobId);
+      if (job.State == State.requestSnapshot || job.State == State.requestSnapshotSent) {
+        response.Success = true;
+        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_REQUEST_ALLREADY_SET;
         return response;
       }
-    /*  finally {
-        if (session != null)
-          session.EndSession();
-      }
-    } */
+      if (job.State != State.calculating) {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_IS_NOT_BEEING_CALCULATED;
+        return response;
+      }
+      // job is in correct state
+      job.State = State.requestSnapshot;
+      DaoLocator.JobDao.Update(job);
+
+      response.Success = true;
+      response.StatusMessage = ApplicationConstants.RESPONSE_JOB_REQUEST_SET;
+
+      return response;
+    }
 
     public Response AbortJob(Guid jobId) {
-      //ISession session = factory.GetSessionForCurrentThread();
       Response response = new Response();
 
-    /*  try {
-        IJobAdapter jobAdapter = session.GetDataAdapter<JobDto, IJobAdapter>();*/
-
-//        JobDto job = jobAdapter.GetById(jobId);
       JobDto job = DaoLocator.JobDao.FindById(jobId);
-        if (job == null) {
-          response.Success = false;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_DOESNT_EXIST;
-          return response; // no commit needed
-        }
-        if (job.State == State.abort) {
-          response.Success = true;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ABORT_REQUEST_ALLREADY_SET;
-          return response; // no commit needed
-        }
-        if (job.State != State.calculating && job.State != State.requestSnapshot && job.State != State.requestSnapshotSent) {
-          response.Success = false;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_IS_NOT_BEEING_CALCULATED;
-          return response; // no commit needed
-        }
-        // job is in correct state
-        job.State = State.abort;
+      if (job == null) {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_DOESNT_EXIST;
+        return response; // no commit needed
+      }
+      if (job.State == State.abort) {
+        response.Success = true;
+        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ABORT_REQUEST_ALLREADY_SET;
+        return response; // no commit needed
+      }
+      if (job.State != State.calculating && job.State != State.requestSnapshot && job.State != State.requestSnapshotSent) {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_IS_NOT_BEEING_CALCULATED;
+        return response; // no commit needed
+      }
+      // job is in correct state
+      job.State = State.abort;
       DaoLocator.JobDao.Update(job);
 
-        response.Success = true;
-        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ABORT_REQUEST_SET;
-
-        return response;
-      }
-      /*finally {
-        if (session != null)
-          session.EndSession();
-      }
-    }   */
+      response.Success = true;
+      response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ABORT_REQUEST_SET;
+
+      return response;
+    }
 
     public ResponseList<JobResult> GetAllJobResults(Guid jobId) {
@@ -381 +339 @@
 
     public ResponseList<JobDto> GetJobsByProject(Guid projectId) {
-      return null;      
-    }
+      return null;
+    }
+
+    public byte[] GetSerializedJobDataById(Guid jobId) {
+      return DaoLocator.JobDao.GetBinaryJobFile(jobId);
+    }
+
+    public void SetSerializedJobDataById(Guid jobId, byte[] data) {
+      DaoLocator.JobDao.SetBinaryJobFile(jobId, data);
+    }
+
     #endregion
   }

branches/3.2/sources/HeuristicLab.Hive.Server.DataAccess/3.2/IJobDao.cs

@@ -23 +23 @@
 
     IEnumerable<JobDto> FindWithLimitations(State jobState, int offset, int count);
+
+    void SetBinaryJobFile(Guid jobId, byte[] data);
   }
 }

branches/3.2/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/BaseDao.cs

@@ -15 +15 @@
 
     protected void CommitChanges() {
+      //TODO: DoWhile
       try {
         Context.SubmitChanges(ConflictMode.ContinueOnConflict);
       } catch (ChangeConflictException e) {
         Logger.Warn("Concurrency Exception! " + e.Message);
-        foreach (ObjectChangeConflict conflict in Context.ChangeConflicts) {          
+        foreach (ObjectChangeConflict conflict in Context.ChangeConflicts) { 
+          Logger.Info("Conflicted: ");
+          foreach (MemberChangeConflict memberChangeConflict in conflict.MemberConflicts) {
+            Logger.Info("    Member in Conflict: " + memberChangeConflict.Member.Name);
+            Logger.Info("    Database Value: " + memberChangeConflict.DatabaseValue);
+            Logger.Info("    Original value: " + memberChangeConflict.OriginalValue);
+            Logger.Info("    Current value: " + memberChangeConflict.CurrentValue);              
+          }
           conflict.Resolve(RefreshMode.KeepChanges);
         }
+        Context.SubmitChanges(ConflictMode.FailOnFirstConflict);
       }
     }

branches/3.2/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/ClientDao.cs

@@ -14 +14 @@
 
     public ClientDto FindById(Guid id) {
-      return (from client in Context.Clients
+      return (from client in Context.Resources.OfType<Client>()                         
               where client.ResourceId.Equals(id)
               select EntityToDto(client, null)
@@ -21 +21 @@
 
     public IEnumerable<ClientDto> FindAll() {
-      return (from client in Context.Clients
+      return (from client in Context.Resources.OfType<Client>()
               select
                 EntityToDto(client, null)
@@ -28 +28 @@
 
     public IEnumerable<ClientDto> FindAllClientsWithoutGroup() {
-      return (from client in Context.Clients
-              where client.Resource.ClientGroup_Resources.Count == 0
+      return (from client in Context.Resources.OfType<Client>()
+              where client.ClientGroup_Resources_Parents.Count == 0
               select EntityToDto(client, null)).ToList();
     }
@@ -40 +40 @@
 
     public void SetServerSideCalendar(ClientDto client, Guid clientGroupId) {
-      Client dbclient = Context.Clients.SingleOrDefault(c => c.ResourceId.Equals(client.Id));
+      Client dbclient = Context.Resources.OfType<Client>().SingleOrDefault(c => c.ResourceId.Equals(client.Id));
       dbclient.UseCalendarFromResourceId = clientGroupId;
       dbclient.CalendarSyncStatus = Enum.GetName(typeof(CalendarState), CalendarState.Fetch);
@@ -48 +48 @@
     public ClientDto Insert(ClientDto info) {
       Client c = DtoToEntity(info, null);      
-      Context.Clients.InsertOnSubmit(c);
+      Context.Resources.InsertOnSubmit(c);
       CommitChanges();
       info.Id = c.ResourceId;
@@ -62 +62 @@
 
     public void Update(ClientDto info) {
-      Client client = Context.Clients.SingleOrDefault(c => c.ResourceId.Equals(info.Id));
+      Client client = Context.Resources.OfType<Client>().SingleOrDefault(c => c.ResourceId.Equals(info.Id));
       DtoToEntity(info, client);
       CommitChanges();      
@@ -75 +75 @@
       target.CPUSpeed = source.CpuSpeedPerCore;
       
-      if(target.Resource == null)
-        target.Resource = new Resource();
-
       target.FreeMemory = source.FreeMemory;
-      target.Resource.Name = source.Name;
-      target.Resource.ResourceId = source.Id;
+      target.Name = source.Name;
+      target.ResourceId = source.Id;
       target.CalendarSyncStatus = Enum.GetName(typeof(CalendarState), source.CalendarSyncStatus);
       target.Login = source.Login;
@@ -96 +93 @@
         target = new ClientDto();
       target.CpuSpeedPerCore = source.CPUSpeed;
-      target.FreeMemory = source.FreeMemory;
+      target.FreeMemory = source.FreeMemory ?? 0;
       target.Id = source.ResourceId;
       target.CalendarSyncStatus = (CalendarState) Enum.Parse(typeof (CalendarState), source.CalendarSyncStatus);
       target.Login = source.Login;
-      target.Memory = source.Memory;
-      target.Name = source.Resource.Name;
-      target.NrOfCores = source.NumberOfCores;
-      target.NrOfFreeCores = source.NumberOfFreeCores;
+      target.Memory = source.Memory ?? 0;
+      target.Name = source.Name;
+      target.NrOfCores = source.NumberOfCores ?? 0;
+      target.NrOfFreeCores = source.NumberOfFreeCores ?? 0;
       target.State = (State) Enum.Parse(typeof (State), source.Status);
       return target;

branches/3.2/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/ClientGroupDao.cs

@@ -13 +13 @@
 
     public ClientGroupDto FindById(Guid id) {
-      return (from cc in Context.ClientGroups
+      return (from cc in Context.Resources.OfType<ClientGroup>()
               where cc.ResourceId.Equals(id)
               select EntityToDto(cc, null)).SingleOrDefault();
@@ -20 +20 @@
 
     public IEnumerable<ClientGroupDto> FindAll() {
-      return (from cc in Context.ClientGroups
+      return (from cc in Context.Resources.OfType<ClientGroup>()
               select EntityToDto(cc, null)).ToList();
     }
@@ -30 +30 @@
 
       ClientGroup cc = DtoToEntity(bObj, null);
-      Context.ClientGroups.InsertOnSubmit(cc);
+      Context.Resources.InsertOnSubmit(cc);
       CommitChanges();
       bObj.Id = cc.ResourceId;
@@ -48 +48 @@
 
     public void Update(ClientGroupDto bObj) {
-      ClientGroup client = Context.ClientGroups.SingleOrDefault(c => c.ResourceId.Equals(bObj.Id));
+      ClientGroup client = Context.Resources.OfType<ClientGroup>().SingleOrDefault(c => c.ResourceId.Equals(bObj.Id));
       DtoToEntity(bObj, client);
       CommitChanges();
@@ -54 +54 @@
 
     public void AddRessourceToClientGroup(Guid resource, Guid clientGroupId) {
-      ClientGroup cg = Context.ClientGroups.SingleOrDefault(c => c.ResourceId.Equals(clientGroupId));
+      ClientGroup cg = Context.Resources.OfType<ClientGroup>().SingleOrDefault(c => c.ResourceId.Equals(clientGroupId));
       Resource res = Context.Resources.SingleOrDefault(r => r.ResourceId.Equals(resource));
-      cg.ClientGroup_Resources.Add(new ClientGroup_Resource { ClientGroup = cg, Resource = res });      
+      cg.ClientGroup_Resources_Children.Add(new ClientGroup_Resource { ClientGroup = cg, Resource = res });      
       CommitChanges();
     }
@@ -77 +77 @@
       List<ClientGroupDto> groupList = new List<ClientGroupDto>();
 
-      var q = (from cg in Context.ClientGroups
+      var q = (from cg in Context.Resources.OfType<ClientGroup>()
                where !Context.ClientGroup_Resources.Any(cgr => cgr.ResourceId.Equals(cg.ResourceId))
                select cg);
@@ -84 +84 @@
         ClientGroupDto cgd = EntityToDto(cg, null);
         groupList.Add(cgd);
-        FillSubGroupsAndClientsRecursivly(cgd, cg.ClientGroup_Resources);        
+        FillSubGroupsAndClientsRecursivly(cgd, cg.ClientGroup_Resources_Children);        
       }
       return groupList;
@@ -93 +93 @@
       //Get all the Groups
       
-      var qGroups = (from cg in Context.ClientGroups
-               where cg.Resource.ClientGroup_Resources.Any(cgr => cgr.ClientGroupId.Equals(parentClientGroup.Id))
+      var qGroups = (from cg in Context.Resources.OfType<ClientGroup>()
+               where cg.ClientGroup_Resources_Parents.Any(cgr => cgr.ClientGroupId.Equals(parentClientGroup.Id))
                select cg);
 
@@ -100 +100 @@
         ClientGroupDto cgd = EntityToDto(cg, null);
         parentClientGroup.Resources.Add(cgd);
-        FillSubGroupsAndClientsRecursivly(cgd, cg.ClientGroup_Resources);
+        FillSubGroupsAndClientsRecursivly(cgd, cg.ClientGroup_Resources_Children);
       }
 
       //get the clients
-      var qClients = (from cl in Context.Clients
-               where cl.Resource.ClientGroup_Resources.Any(cgr => cgr.ClientGroupId.Equals(parentClientGroup.Id))
+      var qClients = (from cl in Context.Resources.OfType<Client>()
+               where cl.ClientGroup_Resources_Parents.Any(cgr => cgr.ClientGroupId.Equals(parentClientGroup.Id))
                select cl);
       foreach (Client client in qClients) {
@@ -114 +114 @@
     public IEnumerable<Guid> FindAllGroupAndParentGroupIdsForClient(Guid clientId) {
       List<Guid> guids = new List<Guid>();
-      Client c = Context.Clients.SingleOrDefault(client => client.ResourceId.Equals(clientId));
-      FindAllGroupAndParentGroupIdsForClientRecursive(c.Resource, guids);
+      Client c = Context.Resources.OfType<Client>().SingleOrDefault(client => client.ResourceId.Equals(clientId));
+      FindAllGroupAndParentGroupIdsForClientRecursive(c, guids);
       return guids;
     }
 
+    //Massivly error Prone
     private void FindAllGroupAndParentGroupIdsForClientRecursive(Resource resource, List<Guid> guids) {
-      foreach (ClientGroup_Resource cgr in resource.ClientGroup_Resources) {
+      foreach (ClientGroup_Resource cgr in resource.ClientGroup_Resources_Parents) {
         guids.Add(cgr.ClientGroupId);
-        FindAllGroupAndParentGroupIdsForClientRecursive(cgr.ClientGroup.Resource, guids);        
+        FindAllGroupAndParentGroupIdsForClientRecursive(cgr.ClientGroup, guids);        
       }
     }
@@ -133 +134 @@
       if (target == null)
         target = new ClientGroup();
-      if (target.Resource == null)
-        target.Resource = new Resource();
 
-      target.Resource.Name = source.Name;
-      target.Resource.ResourceId = source.Id;
+      target.Name = source.Name;
+      target.ResourceId = source.Id;
 
       return target;
@@ -149 +148 @@
 
       target.Id = source.ResourceId;
-      target.Name = source.Resource.Name;
+      target.Name = source.Name;
 
       return target;
@@ -155 +154 @@
 
     public IEnumerable<ClientGroupDto> FindByName(string res) {
-      return (from cq in Context.ClientGroups
-              where cq.Resource.Name == res
+      return (from cq in Context.Resources.OfType<ClientGroup>()
+              where cq.Name == res
               select EntityToDto(cq, null)).ToList();      
     }

branches/3.2/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/ContextFactory.cs

@@ -5 +5 @@
 using System.Data.Common;
 using System.Data.SqlClient;
+using HeuristicLab.Tracing;
 
 namespace HeuristicLab.Hive.Server.LINQDataAccess {
@@ -16 +17 @@
     public static HiveDataContext Context { 
       get {
-        if(_hiveDataContext == null) 
-          _hiveDataContext = new HiveDataContext();
+        if (_hiveDataContext == null) {
+          Logger.Debug("Requested new Data Context");
+          _hiveDataContext = new HiveDataContext("Data Source=127.0.0.1;Initial Catalog=HeuristicLab.Hive.Linq.Test;Integrated Security=SSPI");
+          _hiveDataContext.CommandTimeout = 240;
+        }
         return _hiveDataContext;        
       } 
@@ -32 +36 @@
       } 
     }
+
+    public static bool IsContextNull() {
+      return _hiveDataContext == null;
+    }
   }
 }

branches/3.2/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/HeuristicLab.Hive.Server.LINQDataAccess-3.2.csproj

@@ -91 +91 @@
     <Compile Include="ClientGroupDao.cs" />
     <Compile Include="ContextFactory.cs" />
-    <Compile Include="Hive.designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Hive.dbml</DependentUpon>
-    </Compile>
+    <Compile Include="HiveDataContext.cs" />
     <Compile Include="JobDao.cs" />
     <Compile Include="LINQDataAccessPlugin.cs" />
@@ -109 +105 @@
   </ItemGroup>
   <ItemGroup>
-    <None Include="Hive.dbml">
-      <Generator>MSLinqToSQLGenerator</Generator>
-      <LastGenOutput>Hive.designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </None>
     <None Include="HeuristicLab.snk" />
     <None Include="Properties\AssemblyInfo.frame" />
@@ -144 +135 @@
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="Hive.dbml.layout">
-      <DependentUpon>Hive.dbml</DependentUpon>
-    </None>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="HiveDataContext.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/3.2/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/Hive.dbml

@@ -78 +78 @@
       <Association Name="Resource_UptimeCalendar" Member="UptimeCalendars" ThisKey="ResourceId" OtherKey="ResourceId" Type="UptimeCalendar" />
       <Association Name="Resource_Client" Member="Client" ThisKey="ResourceId" OtherKey="ResourceId" Type="Client" Cardinality="One" />
-      <Association Name="Resource_Client1" Member="Client1" ThisKey="ResourceId" OtherKey="ResourceId" Type="Client" Cardinality="One" />
     </Type>
   </Table>
@@ -133 +132 @@
       <Association Name="Client_Job" Member="Jobs" ThisKey="ResourceId" OtherKey="ResourceId" Type="Job" />
       <Association Name="Resource_Client" Member="Resource" ThisKey="ResourceId" OtherKey="ResourceId" Type="Resource" IsForeignKey="true" DeleteRule="CASCADE" DeleteOnNull="true" />
-      <Association Name="Resource_Client1" Member="Resource1" ThisKey="ResourceId" OtherKey="ResourceId" Type="Resource" IsForeignKey="true" />
       <Association Name="ClientConfig_Client" Member="ClientConfig" ThisKey="ClientConfigId" OtherKey="ClientConfigId" Type="ClientConfig" IsForeignKey="true" DeleteRule="SET NULL" />
     </Type>

branches/3.2/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/Hive.dbml.layout

@@ -166 +166 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(5.0625 : 6.94399251302083); (5.0625 : 8.25)]" fixedFrom="NotFixed" fixedTo="NotFixed">
-      <AssociationMoniker Name="/HiveDataContext/Resource/Resource_Client1" />
-      <nodes>
-        <classShapeMoniker Id="e44e8355-4290-42f0-8b46-4473e91e504b" />
-        <classShapeMoniker Id="51cb317e-413a-4e25-a9b6-e903322f0371" />
-      </nodes>
-    </associationConnector>
     <associationConnector edgePoints="[(4.75 : 12); (4.75 : 11.1747054036458)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/ClientConfig/ClientConfig_Client" />

branches/3.2/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/Hive.designer.cs

@@ -1512 +1512 @@
     private EntityRef<Client> _Client;
     
-    private EntityRef<Client> _Client1;
-    
     #region Extensibility Method Definitions
     partial void OnLoaded();
@@ -1531 +1529 @@
       this._UptimeCalendars = new EntitySet<UptimeCalendar>(new Action<UptimeCalendar>(this.attach_UptimeCalendars), new Action<UptimeCalendar>(this.detach_UptimeCalendars));
       this._Client = default(EntityRef<Client>);
-      this._Client1 = default(EntityRef<Client>);
       OnCreated();
     }
@@ -1668 +1665 @@
           }
           this.SendPropertyChanged("Client");
-        }
-      }
-    }
-    
-    [Association(Name="Resource_Client1", Storage="_Client1", ThisKey="ResourceId", OtherKey="ResourceId", IsUnique=true, IsForeignKey=false)]
-    public Client Client1
-    {
-      get
-      {
-        return this._Client1.Entity;
-      }
-      set
-      {
-        Client previousValue = this._Client1.Entity;
-        if (((previousValue != value) 
-              || (this._Client1.HasLoadedOrAssignedValue == false)))
-        {
-          this.SendPropertyChanging();
-          if ((previousValue != null))
-          {
-            this._Client1.Entity = null;
-            previousValue.Resource1 = null;
-          }
-          this._Client1.Entity = value;
-          if ((value != null))
-          {
-            value.Resource1 = this;
-          }
-          this.SendPropertyChanged("Client1");
         }
       }
@@ -2620 +2588 @@
     private EntityRef<Resource> _Resource;
     
-    private EntityRef<Resource> _Resource1;
-    
     private EntityRef<ClientConfig> _ClientConfig;
     
@@ -2657 +2623 @@
       this._Jobs = new EntitySet<Job>(new Action<Job>(this.attach_Jobs), new Action<Job>(this.detach_Jobs));
       this._Resource = default(EntityRef<Resource>);
-      this._Resource1 = default(EntityRef<Resource>);
       this._ClientConfig = default(EntityRef<ClientConfig>);
       OnCreated();
@@ -2950 +2915 @@
     }
     
-    [Association(Name="Resource_Client1", Storage="_Resource1", ThisKey="ResourceId", OtherKey="ResourceId", IsForeignKey=true)]
-    public Resource Resource1
-    {
-      get
-      {
-        return this._Resource1.Entity;
-      }
-      set
-      {
-        Resource previousValue = this._Resource1.Entity;
-        if (((previousValue != value) 
-              || (this._Resource1.HasLoadedOrAssignedValue == false)))
-        {
-          this.SendPropertyChanging();
-          if ((previousValue != null))
-          {
-            this._Resource1.Entity = null;
-            previousValue.Client1 = null;
-          }
-          this._Resource1.Entity = value;
-          if ((value != null))
-          {
-            value.Client1 = this;
-            this._ResourceId = value.ResourceId;
-          }
-          else
-          {
-            this._ResourceId = default(System.Guid);
-          }
-          this.SendPropertyChanged("Resource1");
-        }
-      }
-    }
-    
     [Association(Name="ClientConfig_Client", Storage="_ClientConfig", ThisKey="ClientConfigId", OtherKey="ClientConfigId", IsForeignKey=true, DeleteRule="SET NULL")]
     public ClientConfig ClientConfig

branches/3.2/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/HiveDataContext.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Database Name="HeuristicLab.Hive.Linq" Class="HiveDataContext" xmlns="http://schemas.microsoft.com/linqtosql/dbml/2007">
+<Database Name="HeuristicLab.Hive.Linq.Test" Class="HiveDataContext" xmlns="http://schemas.microsoft.com/linqtosql/dbml/2007">
   <Table Name="dbo.AssignedResources" Member="AssignedResources">
     <Type Name="AssignedResource">
@@ -6 +6 @@
       <Column Name="JobId" Member="JobId" DbType="UniqueIdentifier NOT NULL" Type="System.Guid" />
       <Column Name="AssignedRessourcesId" Member="AssignedRessourcesId" DbType="UniqueIdentifier NOT NULL" Type="System.Guid" IsPrimaryKey="true" IsDbGenerated="true" AutoSync="OnInsert" />
-      <Association Name="Resource_AssignedResource" Member="Resource" ThisKey="ResourceId" OtherKey="ResourceId" DeleteRule="CASCADE" DeleteOnNull="true" IsForeignKey="true" Type="Resource"/>
-      <Association Name="Job_AssignedResource" Member="Job" ThisKey="JobId" OtherKey="JobId" DeleteRule="CASCADE" DeleteOnNull="true" IsForeignKey="true" Type="Job"/>
+      <Association Name="Resource_AssignedResource" Member="Resource" ThisKey="ResourceId" OtherKey="ResourceId" DeleteRule="CASCADE" IsForeignKey="true" Type="Resource"/>
+      <Association Name="Job_AssignedResource" Member="Job" ThisKey="JobId" OtherKey="JobId" DeleteRule="CASCADE" IsForeignKey="true" Type="Job"/>
     </Type>
   </Table>
@@ -23 +23 @@
       <Column Name="ClientConfigId" Member="ClientConfigId" DbType="UniqueIdentifier NOT NULL" Type="System.Guid" IsPrimaryKey="true" IsDbGenerated="true" AutoSync="OnInsert" />
       <Column Name="UpDownTimeCalendar" Member="UpDownTimeCalendar" DbType="Xml" UpdateCheck="Never" Type="System.Xml.Linq.XElement"/>
-      <Column Name="HeartBeatIntervall" Member="HeartBeatIntervall" DbType="Int" Type="System.Int32"/>
+      <Column Name="HeartBeatIntervall" Member="HeartBeatIntervall" DbType="Int" Type="System.Int32" CanBeNull="true"/>
       <Association Name="ClientConfig_Client" Member="Clients"  ThisKey="ClientConfigId" OtherKey="ClientConfigId" Type="Client"/>
     </Type>
@@ -30 +30 @@
   <Table Name="dbo.ClientGroup_Resource" Member="ClientGroup_Resources">
     <Type Name="ClientGroup_Resource">
-      <Column Name="ClientGroup_RessourceId" Member="ClientGroup_RessourceId" DbType="UniqueIdentifier NOT NULL" Type="System.Guid" IsPrimaryKey="true" IsDbGenerated="true" AutoSync="OnInsert" />
+      <Column Name="ClientGroup_RessourceId" Member="ClientGroup_RessourceId" DbType="UniqueIdentifier NOT NULL" Type="System.Guid" IsPrimaryKey="true" IsDbGenerated="true" AutoSync="OnInsert"  />
       <Column Name="ClientGroupId" Member="ClientGroupId" DbType="UniqueIdentifier NOT NULL" Type="System.Guid" />
       <Column Name="ResourceId" Member="ResourceId" DbType="UniqueIdentifier NOT NULL" Type="System.Guid" />
     
       <Association Name="ClientGroup_ClientGroup_Resource" Member="ClientGroup" ThisKey="ClientGroupId" OtherKey="ResourceId" IsForeignKey="true" Type="ClientGroup" />
-      <Association Name="Resource_ClientGroup_Resource" Member="Resource" ThisKey="ResourceId" OtherKey="ResourceId" DeleteRule="CASCADE" DeleteOnNull="true" IsForeignKey="true" Type="Resource"/>
+      <Association Name="Resource_ClientGroup_Resource" Member="Resource" ThisKey="ResourceId" OtherKey="ResourceId" DeleteRule="CASCADE" IsForeignKey="true" Type="Resource"/>
     </Type>
   </Table>
@@ -59 +59 @@
       <Column Name="JobId" Member="JobId" DbType="UniqueIdentifier NOT NULL" Type="System.Guid" />
       <Column Name="PluginId" Member="PluginId" DbType="UniqueIdentifier NOT NULL" Type="System.Guid" />
-      <Association Name="PluginInfo_RequiredPlugin" Member="PluginInfo" ThisKey="PluginId" OtherKey="PluginId" DeleteRule="CASCADE" DeleteOnNull="true" IsForeignKey="true" Type="PluginInfo"/>
+      <Association Name="PluginInfo_RequiredPlugin" Member="PluginInfo" ThisKey="PluginId" OtherKey="PluginId" DeleteRule="CASCADE" IsForeignKey="true" Type="PluginInfo"/>
       <Association Name="Job_RequiredPlugin" Member="Job" ThisKey="JobId" OtherKey="JobId" IsForeignKey="true" Type="Job"/>
     </Type>
@@ -69 +69 @@
       <Column Name="ResourceType" Member="ResourceType" IsDiscriminator="true" Type="System.String"/>
       <Association Name="Resource_AssignedResource" Member="AssignedResources" ThisKey="ResourceId" OtherKey="ResourceId" Type="AssignedResource"/>      
-      <Association Name="Resource_ClientGroup_Resource" Member="ClientGroup_Resources" ThisKey="ResourceId" OtherKey="ResourceId" Type="ClientGroup_Resource" />
+      <Association Name="Resource_ClientGroup_Resource" Member="ClientGroup_Resources_Parents" ThisKey="ResourceId" OtherKey="ResourceId" Type="ClientGroup_Resource" />
       <Association Name="Resource_UptimeCalendar" Member="UptimeCalendars" ThisKey="ResourceId" OtherKey="ResourceId" Type="UptimeCalendar" />      
       <Type Name="Client" InheritanceCode="CLIENT" IsInheritanceDefault="true">        
-        <Column Name="CPUSpeed" Member="CPUSpeed" DbType="Int NOT NULL" Type="System.Int32" />
-        <Column Name="Memory" Member="Memory" DbType="Int NOT NULL" Type="System.Int32" />
-        <Column Name="Login" Member="Login" DbType="DateTime NOT NULL" Type="System.DateTime" />
-        <Column Name="Status" Member="Status" DbType="VarChar(MAX)" Type="System.String" />
-        <Column Name="CalendarSyncStatus" Member="CalendarSyncStatus" DbType="VarChar(MAX)" Type="System.String" />
-        <Column Name="UseCalendarFromResourceId" Member="UseCalendarFromResourceId" DbType="UniqueIdentifier" Type="System.Guid"/>
-        <Column Name="ClientConfigId" Member="ClientConfigId" DbType="UniqueIdentifier" Type="System.Guid"/>
-        <Column Name="NumberOfCores" Member="NumberOfCores" DbType="Int NOT NULL" Type="System.Int32" />
-        <Column Name="NumberOfFreeCores" Member="NumberOfFreeCores" DbType="Int NOT NULL" Type="System.Int32"/>
-        <Column Name="FreeMemory" Member="FreeMemory" DbType="Int NOT NULL" Type="System.Int32"/>
+        <Column Name="CPUSpeed" Member="CPUSpeed" DbType="Int" Type="System.Int32" CanBeNull="true"/>
+        <Column Name="Memory" Member="Memory" DbType="Int" Type="System.Int32" CanBeNull="true"/>
+        <Column Name="Login" Member="Login" DbType="DateTime" Type="System.DateTime" CanBeNull="true"/>
+        <Column Name="Status" Member="Status" DbType="VarChar(MAX)" Type="System.String" CanBeNull="true"/>
+        <Column Name="CalendarSyncStatus" Member="CalendarSyncStatus" DbType="VarChar(MAX)" Type="System.String" CanBeNull="true"/>
+        <Column Name="UseCalendarFromResourceId" Member="UseCalendarFromResourceId" DbType="UniqueIdentifier" Type="System.Guid" CanBeNull="true"/>
+        <Column Name="ClientConfigId" Member="ClientConfigId" DbType="UniqueIdentifier" Type="System.Guid" CanBeNull="true"/>
+        <Column Name="NumberOfCores" Member="NumberOfCores" DbType="Int" Type="System.Int32" CanBeNull="true"/>
+        <Column Name="NumberOfFreeCores" Member="NumberOfFreeCores" DbType="Int" Type="System.Int32" CanBeNull="true"/>
+        <Column Name="FreeMemory" Member="FreeMemory" DbType="Int" Type="System.Int32" CanBeNull="true"/>
         <Association Name="Client_UptimeStatistic" Member="UptimeStatistics" ThisKey="ResourceId" OtherKey="ResourceId" Type="UptimeStatistic"/>
-        <Association Name="Client_Job" Member="Jobs" ThisKey="ResourceId" OtherKey="ResourceId" Type="Job"/>        
+        <Association Name="Client_Job" Member="Jobs" ThisKey="ResourceId" OtherKey="ResourceId" Type="Job" DeleteRule="SET NULL"/>        
         <Association Name="ClientConfig_Client" Member="ClientConfig" ThisKey="ClientConfigId" OtherKey="ClientConfigId" DeleteRule="SET NULL" IsForeignKey="true" Type="ClientConfig"/>
       </Type>
       <Type Name="ClientGroup" InheritanceCode="GROUP" IsInheritanceDefault="false">
-        <Association Name="ClientGroup_ClientGroup_Resource" Member="ClientGroup_Resources" ThisKey="ResourceId" OtherKey="ClientGroupId" Type="ClientGroup_Resource" />
+        <Association Name="ClientGroup_ClientGroup_Resource" Member="ClientGroup_Resources_Children" ThisKey="ResourceId" OtherKey="ClientGroupId" Type="ClientGroup_Resource" />
       </Type>
     </Type>
@@ -95 +95 @@
     <Type Name="Job">
       <Column Name="JobId" Member="JobId" DbType="UniqueIdentifier NOT NULL" Type="System.Guid" IsPrimaryKey="true" IsDbGenerated="true" AutoSync="OnInsert" />
-      <Column Name="ParentJobId" Member="ParentJobId" DbType="UniqueIdentifier" Type="System.Guid" />
+      <Column Name="ParentJobId" Member="ParentJobId" DbType="UniqueIdentifier" Type="System.Guid" CanBeNull="true" />
       <Column Name="JobState" Member="JobState" DbType="VarChar(MAX)" Type="System.String"/>
-      <Column Name="ResourceId" Member="ResourceId" DbType="UniqueIdentifier" Type="System.Guid"/>
-      <Column Name="Percentage" Member="Percentage" DbType="Float" Type="System.Double"/>
-      <Column Name="SerializedJob" Member="SerializedJob" DbType="VarBinary(MAX)" UpdateCheck="Never" Type="System.Data.Linq.Binary"/>
-      <Column Name="DateCreated" Member="DateCreated" DbType="DateTime" Type="System.DateTime"/>
-      <Column Name="DateCalculated" Member="DateCalculated" DbType="DateTime" Type="System.DateTime"/>
-      <Column Name="DateFinished" Member="DateFinished" DbType="DateTime" Type="System.DateTime"/>
+      <Column Name="ResourceId" Member="ResourceId" DbType="UniqueIdentifier" Type="System.Guid" CanBeNull="true"/>
+      <Column Name="Percentage" Member="Percentage" DbType="Float" Type="System.Double" CanBeNull="true"/>
+      <Column Name="SerializedJob" Member="SerializedJob" DbType="VarBinary(MAX)" UpdateCheck="Never" Type="System.Data.Linq.Binary" IsDelayLoaded="true"/>
+      <Column Name="DateCreated" Member="DateCreated" DbType="DateTime" Type="System.DateTime" CanBeNull="true"/>
+      <Column Name="DateCalculated" Member="DateCalculated" DbType="DateTime" Type="System.DateTime" CanBeNull="true"/>
+      <Column Name="DateFinished" Member="DateFinished" DbType="DateTime" Type="System.DateTime" CanBeNull="true"/>
       <Column Name="Priority" Member="Priority" DbType="Int NOT NULL" Type="System.Int32"/>
-      <Column Name="ProjectId" Member="ProjectId" DbType="UniqueIdentifier" Type="System.Guid"/>
-      <Column Name="UserId" Member="UserId" DbType="UniqueIdentifier" Type="System.Guid"/>
+      <Column Name="ProjectId" Member="ProjectId" DbType="UniqueIdentifier" Type="System.Guid" CanBeNull="true"/>
+      <Column Name="UserId" Member="UserId" DbType="UniqueIdentifier" Type="System.Guid" CanBeNull="true"/>
       <Column Name="CoresNeeded" Member="CoresNeeded" DbType="Int NOT NULL" Type="System.Int32"/>
       <Column Name="MemoryNeeded" Member="MemoryNeeded" DbType="Int NOT NULL" Type="System.Int32"/>
@@ -125 +125 @@
       <Column Name="Recurring" Member="Recurring" DbType="Bit NOT NULL" Type="System.Boolean"/>
       <Column Name="RecurringId" Member="RecurringId" DbType="UniqueIdentifier" Type="System.Guid"/>
-      <Association Name="Resource_UptimeCalendar" Member="Resource" ThisKey="ResourceId" OtherKey="ResourceId" DeleteRule="CASCADE" DeleteOnNull="true" IsForeignKey="true" Type="Resource"/>
+      <Association Name="Resource_UptimeCalendar" Member="Resource" ThisKey="ResourceId" OtherKey="ResourceId" DeleteRule="CASCADE" IsForeignKey="true" Type="Resource"/>
     </Type>
   </Table>

branches/3.2/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/JobDao.cs

@@ -63 +63 @@
     }
 
+    public void SetBinaryJobFile(Guid jobId, byte[] data) {
+      Job j = (from job in Context.Jobs
+               where job.JobId.Equals(jobId)
+               select job).SingleOrDefault();
+      j.SerializedJob = data;
+      CommitChanges();
+    }
+
     public SerializedJob InsertWithAttachedJob(SerializedJob job) {
       Job j = DtoToEntity(job.JobInfo, null);
@@ -121 +129 @@
 
     public void AssignClientToJob(Guid clientId, Guid jobId) {
-      Client c = Context.Clients.SingleOrDefault(client => client.ResourceId.Equals(clientId));
+      Client c = Context.Resources.OfType<Client>().SingleOrDefault(client => client.ResourceId.Equals(clientId));
       Job j = Context.Jobs.SingleOrDefault(job => job.JobId.Equals(jobId));
       c.Jobs.Add(j);

branches/3.2/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/Properties/Settings.Designer.cs

@@ -28 +28 @@
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
         [global::System.Configuration.DefaultSettingValueAttribute("Data Source=127.0.0.1;Initial Catalog=HeuristicLab.Hive.Linq;Integrated Security=" +
-            "True")]
+            "True;MultipleActiveResultSets=True")]
         public string HeuristicLab_Hive_LinqConnectionString {
             get {

branches/3.2/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/Properties/Settings.settings

@@ -6 +6 @@
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=127.0.0.1;Initial Catalog=HeuristicLab.Hive.Linq;Integrated Security=True&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=127.0.0.1;Initial Catalog=HeuristicLab.Hive.Linq;Integrated Security=True;MultipleActiveResultSets=True&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=127.0.0.1;Initial Catalog=HeuristicLab.Hive.Linq;Integrated Security=True</Value>
+      <Value Profile="(Default)">Data Source=127.0.0.1;Initial Catalog=HeuristicLab.Hive.Linq;Integrated Security=True;MultipleActiveResultSets=True</Value>
     </Setting>
   </Settings>

branches/3.2/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/UptimeCalendarDao.cs

@@ -99 +99 @@
 
     public IEnumerable<AppointmentDto> GetCalendarForClient(ClientDto client) {
-      Client dbc = Context.Clients.SingleOrDefault(c => c.ResourceId.Equals(client.Id));
+      Client dbc = Context.Resources.OfType<Client>().SingleOrDefault(c => c.ResourceId.Equals(client.Id));
       IList<AppointmentDto> appointments = new List<AppointmentDto>();
       if (dbc != null) {
         ClientGroup cg =
-          Context.ClientGroups.SingleOrDefault(cgroup => cgroup.ResourceId.Equals(dbc.UseCalendarFromResourceId));
+          Context.Resources.OfType<ClientGroup>().SingleOrDefault(cgroup => cgroup.ResourceId.Equals(dbc.UseCalendarFromResourceId));
         //in case no plan has been set
         if (cg == null)
-          if (dbc.Resource.ClientGroup_Resources.FirstOrDefault() != null)
-            cg = dbc.Resource.ClientGroup_Resources.FirstOrDefault().ClientGroup;
+          if (dbc.ClientGroup_Resources_Parents.FirstOrDefault() != null)
+            cg = dbc.ClientGroup_Resources_Parents.FirstOrDefault().ClientGroup;
 
         if (cg == null)
           return appointments;
 
-        while (cg.Resource.UptimeCalendars.Count == 0) {
-          if (cg.Resource.ClientGroup_Resources.FirstOrDefault() != null)
-            cg = cg.Resource.ClientGroup_Resources.FirstOrDefault().ClientGroup;
+        while (cg.UptimeCalendars.Count == 0) {
+          if (cg.ClientGroup_Resources_Parents.FirstOrDefault() != null)
+            cg = cg.ClientGroup_Resources_Parents.FirstOrDefault().ClientGroup;
           else {
             break;
@@ -120 +120 @@
         }
 
-        foreach (UptimeCalendar appointment in cg.Resource.UptimeCalendars) {
+        foreach (UptimeCalendar appointment in cg.UptimeCalendars) {
           appointments.Add(EntityToDto(appointment,null));  
         }
@@ -131 +131 @@
       
       //Get the current ClientGroup
-      ClientGroup cg = Context.ClientGroups.SingleOrDefault(cgroup => cgroup.ResourceId.Equals(groupId));
+      ClientGroup cg = Context.Resources.OfType<ClientGroup>().SingleOrDefault(cgroup => cgroup.ResourceId.Equals(groupId));
       if(cg == null)
         return;
 
       //Get all the affected clients
-      List<Client> clients = Context.Clients.Where(c => c.UseCalendarFromResourceId.Equals(cg.ResourceId)).ToList();
+      List<Client> clients = Context.Resources.OfType<Client>().Where(c => c.UseCalendarFromResourceId.Equals(cg.ResourceId)).ToList();
       
       //Set new state
@@ -146 +146 @@
 
       //Get all Subgroups
-      List<ClientGroup> groups = (from cg1 in Context.ClientGroups
-                                  where cg1.Resource.ClientGroup_Resources.Any(
+      List<ClientGroup> groups = (from cg1 in Context.Resources.OfType<ClientGroup>()
+                                  where cg1.ClientGroup_Resources_Parents.Any(
                                 cgr => cgr.ClientGroupId.Equals(groupId))
                               select cg1).ToList();
@@ -154 +154 @@
       //otherweise - propagate
       foreach (ClientGroup cgroup in groups) {
-        if(cgroup.Resource.UptimeCalendars.Count == 0)
-          NotifyClientsOfNewCalendar(groupId, forcePush);        
+        if(cgroup.UptimeCalendars.Count == 0)
+          NotifyClientsOfNewCalendar(cgroup.ResourceId, forcePush);        
       }
     }

branches/3.2/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/app.config

@@ -5 +5 @@
     <connectionStrings>
         <add name="HeuristicLab.Hive.Server.LINQDataAccess.Properties.Settings.HeuristicLab_Hive_LinqConnectionString"
-            connectionString="Data Source=127.0.0.1;Initial Catalog=HeuristicLab.Hive.Linq;Integrated Security=True"
+            connectionString="Data Source=127.0.0.1;Initial Catalog=HeuristicLab.Hive.Linq;Integrated Security=True;MultipleActiveResultSets=True"
             providerName="System.Data.SqlClient" />
     </connectionStrings>

branches/3.2/sources/HeuristicLab.Hive.Server/3.2/ServiceCallInterception.cs

@@ -16 +16 @@
 
     public object Invoke(IMethodInvocation invocation) {
+      DateTime start = DateTime.Now;
       Logger.Info("Entering Method: " + invocation.Method.Name);
 
-      if(ContextFactory.Context != null) {
+      if(!ContextFactory.IsContextNull()) {
         Logger.Info("Not null context found - why wasn't this disposed?");
         try {
@@ -28 +29 @@
         ContextFactory.Context = null;
       }
-
+      Logger.Info("Context info: Timeout: " + ContextFactory.Context.Connection.ConnectionTimeout + " | " +
+                  ContextFactory.Context.Connection.State + " | Conn: " + ContextFactory.Context + " | HashCode is: " + ContextFactory.Context.Connection.GetHashCode());
       Object obj = null;
 
-      if (invocation.Method.Name.Equals("SendStreamedJob") || invocation.Method.Name.Equals("StoreFinishedJobResultStreamed")) {        
+      /*if (invocation.Method.Name.Equals("SendStreamedJob") || invocation.Method.Name.Equals("StoreFinishedJobResultStreamed")) {        
         ContextFactory.Context.Connection.Open();
         if(UseTransactions) {
@@ -48 +50 @@
           ContextFactory.Context = null;
         }        
-      } else {
+      } else { */
         if(UseTransactions) {
           using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required, new TransactionOptions { IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE })) {
@@ -57 +59 @@
             }
             catch (Exception e) {
-              Logger.Error("Exception occured during method invocation", e);              
+              Logger.Error("Exception occured during method invocation", e);     
+              Logger.Error("Inner Exception: ", e.InnerException);
             }
             finally {
@@ -80 +83 @@
           }  
         }
+      //}       
+      TimeSpan ts = DateTime.Now - start;
+      if (ts.Seconds > 2) {
+        Logger.Warn("Invocation took: " + ts);
+      } else if (ts.Seconds > 10) {
+        Logger.Error("Invocation took: " + ts);
+      } else {
+        Logger.Info("Invocation took: " + ts); ;
       }
       Logger.Info("Leaving Method: " + invocation.Method.Name);
-
+      
       return obj;
     }

branches/3.2/sources/HeuristicLab.Tracing/3.2/HeuristicLab.Hive.log4net.xml

@@ -6 +6 @@
     <rollingStyle value="Size" />
     <maxSizeRollBackups value="10" />
-    <maximumFileSize value="1000KB" />
+    <maximumFileSize value="100MB" />
     <staticLogFileName value="true" />
     <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
     <layout type="HeuristicLab.Tracing.MethodCallPatternLayout, HeuristicLab.Tracing-3.2">
-      <conversionPattern value="%date{yyyy-MM-dd HH:mm:ss.ffff} %-4timestamp %-5level %logger.%RM - %message%newline%exception" />
+      <conversionPattern value="%date{yyyy-MM-dd HH:mm:ss.ffff} %-4timestamp %-5level %-5thread %logger.%RM - %message%newline%exception" />
     </layout>
   </appender>
@@ -19 +19 @@
     <rollingStyle value="Size" />
     <maxSizeRollBackups value="10" />
-    <maximumFileSize value="1000KB" />
+    <maximumFileSize value="100MB" />
     <staticLogFileName value="true" />
     <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
     <layout type="HeuristicLab.Tracing.MethodCallPatternLayout, HeuristicLab.Tracing-3.2">
-      <conversionPattern value="%date{yyyy-MM-dd HH:mm:ss.ffff} %-4timestamp %-5level %logger.%RM - %message%newline%exception" />
+      <conversionPattern value="%date{yyyy-MM-dd HH:mm:ss.ffff} %-4timestamp %-5level %-5thread %logger.%RM - %message%newline%exception" />
     </layout>
   </appender>
@@ -32 +32 @@
     <rollingStyle value="Size" />
     <maxSizeRollBackups value="10" />
-    <maximumFileSize value="1000KB" />
+    <maximumFileSize value="100MB" />
     <staticLogFileName value="true" />
     <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
     <layout type="HeuristicLab.Tracing.MethodCallPatternLayout, HeuristicLab.Tracing-3.2">
-      <conversionPattern value="%date{yyyy-MM-dd HH:mm:ss.ffff} %-4timestamp %-5level %logger.%RM - %message%newline%exception" />
+      <conversionPattern value="%date{yyyy-MM-dd HH:mm:ss.ffff} %-4timestamp %-5level %-5thread %logger.%RM - %message%newline%exception" />
     </layout>
   </appender>
@@ -48 +48 @@
     <appender-ref ref="RollingFileAppender" />
   </appender>
+
+  <appender name="ClientBufferingForwardingAppender" type="log4net.Appender.BufferingForwardingAppender" >
+    <bufferSize value="128" />
+    <lossy value="true" />
+    <evaluator type="log4net.Core.LevelEvaluator">
+      <threshold value="DEBUG"/>
+    </evaluator>
+    <appender-ref ref="ClientRollingFileAppender" />
+  </appender>
+
+  <appender name="ServerBufferingForwardingAppender" type="log4net.Appender.BufferingForwardingAppender" >
+    <bufferSize value="128" />
+    <lossy value="true" />
+    <evaluator type="log4net.Core.LevelEvaluator">
+      <threshold value="DEBUG"/>
+    </evaluator>
+    <appender-ref ref="ServertRollingFileAppender" />
+  </appender>
+  
+  <appender name="BufferingForwardingAppender" type="log4net.Appender.BufferingForwardingAppender" >
+    <bufferSize value="128" />
+    <lossy value="true" />
+    <evaluator type="log4net.Core.LevelEvaluator">
+      <threshold value="DEBUG"/>
+    </evaluator>
+    <appender-ref ref="RollingFileAppender" />
+  </appender>
   
   <root>
-    <level value="INFO" />
+    <level value="DEBUG" />
     <appender-ref ref="BufferingForwardingAppender" />
   </root>
@@ -56 +83 @@
   <logger name="HeuristicLab.Hive.Server">
     <level value="DEBUG" />
-    <appender-ref ref="ServerRollingFileAppender" />    
+    <appender-ref ref="ServerBufferingForwardingAppender" />    
   </logger>
 
   <logger name="HeuristicLab.Hive.Client">
     <level value="DEBUG" />
-    <appender-ref ref="ClientRollingFileAppender" />  
+    <appender-ref ref="ClientBufferingForwardingAppender" />  
   </logger>
   

branches/3.2/sources/HeuristicLab.Tracing/3.2/app.config

@@ -9 +9 @@
     <HeuristicLab.Tracing.Properties.Settings>
       <setting name="TracingLog4netConfigFile" serializeAs="String">
-        <value />
+        <value>HeuristicLab.Hive.log4net.xml</value>
       </setting>
     </HeuristicLab.Tracing.Properties.Settings>