Changeset 3578

Timestamp:

05/01/10 13:58:24 (14 years ago)

Author:

kgrading

Message:

Removed References to HiveLogging and updated the default logging mechanism (#991)

Location:

trunk/sources

Files:

• HeuristicLab.Grid/3.2/ProcessingEngine.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Common/3.2/HeuristicLab.Hive.Client.Common-3.2.csproj (modified) (1 diff)
• HeuristicLab.Hive.Client.Communication/3.2/CommunicationsPlugin.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Communication/3.2/HeuristicLab.Hive.Client.Communication-3.2.csproj (modified) (1 diff)
• HeuristicLab.Hive.Client.Communication/3.2/WcfService.cs (modified) (19 diffs)
• HeuristicLab.Hive.Client.Core/3.2/ConfigurationManager/UptimeManager.cs (modified) (3 diffs)
• HeuristicLab.Hive.Client.Core/3.2/Core.cs (modified) (27 diffs)
• HeuristicLab.Hive.Client.Core/3.2/CorePlugin.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/3.2/Heartbeat.cs (modified) (4 diffs)
• HeuristicLab.Hive.Client.Core/3.2/HeuristicLab.Hive.Client.Core-3.2.csproj (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/3.2/JobStorage/JobStorageManager.cs (modified) (8 diffs)
• HeuristicLab.Hive.Client.Core/3.2/PluginCache.cs (modified) (4 diffs)
• HeuristicLab.Hive.Client.Core/3.2/Properties/Settings.Designer.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/3.2/ApplicationConstants.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/3.2/BusinessObjects/JobDto.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/3.2/HeuristicLab.Hive.Contracts-3.2.csproj (modified) (1 diff)
• HeuristicLab.Hive.Contracts/3.2/Interfaces/IJobManager.cs (modified) (2 diffs)
• HeuristicLab.Hive.Engine/3.2/HiveEngine.cs (modified) (6 diffs)
• HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.Designer.cs (modified) (10 diffs)
• HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.cs (modified) (8 diffs)
• HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.resx (modified) (5 diffs)
• HeuristicLab.Hive.Server.Core/3.2/ClientCommunicator.cs (modified) (35 diffs)
• HeuristicLab.Hive.Server.Core/3.2/HiveServerCorePlugin.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.2/JobManager.cs (modified) (13 diffs)
• HeuristicLab.Hive.Server.Core/3.2/ServerConsoleFacade.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.DataAccess/3.2/IJobDao.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.DataAccess/3.2/IPluginInfoDao.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/BaseDao.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/ClientConfigDao.cs (modified) (3 diffs)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/ClientDao.cs (modified) (4 diffs)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/ClientGroupDao.cs (modified) (5 diffs)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/ContextFactory.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/HeuristicLab.Hive.Server.LINQDataAccess-3.2.csproj (modified) (1 diff)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/Hive.dbml (modified) (1 diff)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/Hive.designer.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/JobDao.cs (modified) (8 diffs)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/LINQDataAccessPlugin.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/PluginInfoDao.cs (modified) (4 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/VarBinaryStream.cs (modified) (3 diffs)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/app.config (modified) (1 diff)
• HeuristicLab.Hive.Server/3.2/HeuristicLab.Hive.Server-3.2.csproj (modified) (1 diff)
• HeuristicLab.Hive.Server/3.2/HiveServerPlugin.cs (modified) (1 diff)
• HeuristicLab.Hive.Server/3.2/ServiceCallInterception.cs (modified) (3 diffs)
• HeuristicLab.PluginInfrastructure/Sandboxing/SandboxManager.cs (modified) (1 diff)
• HeuristicLab.Security.Core/3.2/Properties/Settings.Designer.cs (modified) (1 diff)
• HeuristicLab.Security.Core/3.2/Properties/Settings.settings (modified) (1 diff)
• HeuristicLab.Security.Core/3.2/app.config (modified) (1 diff)
• HeuristicLab.Tracing/3.2/HeuristicLab.Hive.log4net.xml (modified) (3 diffs)

trunk/sources/HeuristicLab.Grid/3.2/ProcessingEngine.cs

@@ -81 +81 @@
         } catch(Exception ex) {
           errorMessage = CreateErrorMessage(ex);
-          HeuristicLab.Tracing.HiveLogger.Error(errorMessage);
+          HeuristicLab.Tracing.Logger.Error(errorMessage);
           // push operation on stack again
           myExecutionStack.Push(atomicOperation);

trunk/sources/HeuristicLab.Hive.Client.Common/3.2/HeuristicLab.Hive.Client.Common-3.2.csproj

@@ -82 +82 @@
   <ItemGroup>
     <Compile Include="CommonPlugin.cs" />
-    <Compile Include="Logging.cs" />
     <Compile Include="MessageQueue.cs" />
     <Compile Include="NetworkEnum.cs" />

trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/CommunicationsPlugin.cs

@@ -35 +35 @@
   [PluginDependency("HeuristicLab.Hive.Client.Common-3.2")]
   [PluginDependency("HeuristicLab.Hive.Contracts-3.2")]
+  [PluginDependency("HeuristicLab.Tracing")]
   public class CommunicationsPlugin : PluginBase {
   }

trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/HeuristicLab.Hive.Client.Communication-3.2.csproj

@@ -120 +120 @@
       <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>
   <ItemGroup>

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

@@ -33 +33 @@
 using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;
+using HeuristicLab.Tracing;
 
 namespace HeuristicLab.Hive.Client.Communication {
@@ -45 +46 @@
     /// <returns>the Instance of the WcfService class</returns>
     public static WcfService Instance {
-      get {
+      get {        
         if (instance == null) {
+          Logger.Debug("New WcfService Instance created");
           instance = new WcfService();
         }
@@ -76 +78 @@
     public void Connect() {
       try {
+        Logger.Debug("Starting the Connection Process");
         if (String.Empty.Equals(ServerIP) || ServerPort == 0) {
-          Logging.Instance.Info(this.ToString(), "No Server IP or Port set!");
+          Logger.Info("No Server IP or Port set!");
           return;
         }
+
+        Logger.Debug("Creating the new connection proxy");
         proxy = new ClientFacadeClient(
           WcfSettings.GetStreamedBinding(),
           new EndpointAddress("net.tcp://" + ServerIP + ":" + ServerPort + "/HiveServer/ClientCommunicator")
         );
-
+        Logger.Debug("Created the new connection proxy");
+
+        Logger.Debug("Registring new Events");
         proxy.LoginCompleted += new EventHandler<LoginCompletedEventArgs>(proxy_LoginCompleted);
         proxy.SendStreamedJobCompleted += new EventHandler<SendStreamedJobCompletedEventArgs>(proxy_SendStreamedJobCompleted);
@@ -90 +97 @@
         proxy.ProcessSnapshotStreamedCompleted += new EventHandler<ProcessSnapshotStreamedCompletedEventArgs>(proxy_ProcessSnapshotStreamedCompleted);
         proxy.ProcessHeartBeatCompleted += new EventHandler<ProcessHeartBeatCompletedEventArgs>(proxy_ProcessHeartBeatCompleted);
+        Logger.Debug("Registered new Events");
+        Logger.Debug("Opening the Connection");
         proxy.Open();
+        Logger.Debug("Opened the Connection");
 
         ConnState = NetworkEnum.WcfConnState.Connected;
         ConnectedSince = DateTime.Now;
-        
-        if (Connected != null)
-          Connected(this, new EventArgs());                               
-        //Todo: This won't be hit. EVER        
+
+        if (Connected != null) {
+          Logger.Debug("Calling the connected Event");
+          Connected(this, new EventArgs());
+          //Todo: This won't be hit. EVER        
+        }
         if (ConnState == NetworkEnum.WcfConnState.Failed)
           ConnectionRestored(this, new EventArgs());        
@@ -113 +125 @@
     /// <param name="serverPort">current Server Port</param>
     public void Connect(String serverIP, int serverPort) {
+      Logger.Debug("Called Connected with " + serverIP + ":" + serverPort);
       String oldIp = this.ServerIP;
       int oldPort = this.ServerPort;
@@ -124 +137 @@
 
     public void SetIPAndPort(String serverIP, int serverPort) {
+      Logger.Debug("Called with " + serverIP + ":" + serverPort);
       this.ServerIP = serverIP;
       this.ServerPort = serverPort;
@@ -141 +155 @@
     private void HandleNetworkError(Exception e) {
       ConnState = NetworkEnum.WcfConnState.Failed;
-      Logging.Instance.Error(this.ToString(), "exception: ", e);
+      Logger.Error("Network exception occurred: " + e);
     }
 
@@ -152 +166 @@
     public event System.EventHandler<LoginCompletedEventArgs> LoginCompleted;
     public void LoginAsync(ClientDto clientInfo) {
-      if (ConnState == NetworkEnum.WcfConnState.Connected)
+      if (ConnState == NetworkEnum.WcfConnState.Connected) {
+        Logger.Debug("STARTED: Login Async");
         proxy.LoginAsync(clientInfo);
+      }
     }
     private void proxy_LoginCompleted(object sender, LoginCompletedEventArgs e) {
-      if (e.Error == null)
+      if (e.Error == null) {
+        Logger.Debug("ENDED: Login Async");
         LoginCompleted(sender, e);
-      else
+      } else
         HandleNetworkError(e.Error.InnerException);
     }
@@ -165 +182 @@
       try {
         if (ConnState == NetworkEnum.WcfConnState.Connected) {
+          Logger.Debug("STARTED: Login Sync");
           Response res = proxy.Login(clientInfo);
           if (!res.Success) {
-            Logging.Instance.Error(this.ToString(), "Login Failed! " + res.StatusMessage);
-            HandleNetworkError(new Exception(res.StatusMessage));
+            Logger.Error("FAILED: Login Failed! " + res.StatusMessage);
+            throw new Exception(res.StatusMessage);
           } else {
-            ConnState = NetworkEnum.WcfConnState.Loggedin;
-            Logging.Instance.Info(this.ToString(), res.StatusMessage);
+            Logger.Info("ENDED: Login succeeded" + res.StatusMessage);
+            ConnState = NetworkEnum.WcfConnState.Loggedin;            
           }
         }
@@ -188 +206 @@
     public event System.EventHandler<SendJobCompletedEventArgs> SendJobCompleted;
     public void SendJobAsync(Guid guid) {
-      if (ConnState == NetworkEnum.WcfConnState.Loggedin)        
+      if (ConnState == NetworkEnum.WcfConnState.Loggedin) {
+        Logger.Debug("STARTED: Fetching of Jobs from Server for Client");
         proxy.SendStreamedJobAsync(guid);
+      }
     }
 
     void proxy_SendStreamedJobCompleted(object sender, SendStreamedJobCompletedEventArgs e) {
       if (e.Error == null) {
+        Logger.Debug("ENDED: Fetching of Jobs from Server for Client");
         Stream stream = null;
         MemoryStream memStream = null;
@@ -220 +241 @@
             new SendJobCompletedEventArgs(new object[] { response, memStream.GetBuffer() }, e.Error, e.Cancelled, e.UserState);
           SendJobCompleted(sender, completedEventArgs);
-        }
-        finally {
+        } catch (Exception ex) {
+          Logger.Error(ex);
+        } finally {
           if(stream != null)
             stream.Dispose();
@@ -241 +263 @@
     public void StoreFinishedJobResultAsync(Guid clientId, Guid jobId, byte[] result, double percentage, Exception exception, bool finished) {
       if (ConnState == NetworkEnum.WcfConnState.Loggedin) {
+        Logger.Debug("STARTED: Sending back the finished job results");
+        Logger.Debug("Building stream");
         Stream stream =
           GetStreamedJobResult(clientId, jobId, result, percentage, exception);
-
+        Logger.Debug("Builded stream");
+        Logger.Debug("Making the call");
         proxy.StoreFinishedJobResultStreamedAsync(stream, stream);
       }
      }
     private void proxy_StoreFinishedJobResultStreamedCompleted(object sender, StoreFinishedJobResultStreamedCompletedEventArgs e) {
+      Logger.Debug("Finished storing the job");
       Stream stream =
         (Stream)e.UserState;
-      if (stream != null)
+      if (stream != null) {
+        Logger.Debug("Stream not null, disposing it");
         stream.Dispose();
-      
+      }
       if (e.Error == null) {
         StoreFinishedJobResultCompletedEventArgs args =
           new StoreFinishedJobResultCompletedEventArgs(
             new object[] { e.Result }, e.Error, e.Cancelled, e.UserState);
+        Logger.Debug("calling the Finished Job Event");
         StoreFinishedJobResultCompleted(sender, args);
+        Logger.Debug("ENDED: Sending back the finished job results");
       } else
         HandleNetworkError(e.Error);
@@ -300 +329 @@
     public void SendHeartBeatAsync(HeartBeatData hbd) {
       if (ConnState == NetworkEnum.WcfConnState.Loggedin)
+        Logger.Debug("STARTING: sending heartbeat");
         proxy.ProcessHeartBeatAsync(hbd);
     }
 
     private void proxy_ProcessHeartBeatCompleted(object sender, ProcessHeartBeatCompletedEventArgs e) {
-      if (e.Error == null && e.Result.Success == true)
+      if (e.Error == null && e.Result.Success == true) {
         SendHeartBeatCompleted(sender, e);
-      else {
+        Logger.Debug("ENDED: sending heartbeats");
+      } else {
         try {
-          Logging.Instance.Error(this.ToString(), "Error: " + e.Result.StatusMessage);
-        } catch (Exception ex) {
-          Logging.Instance.Error(this.ToString(), "Error: ", ex);          
+          Logger.Error("Error: " + e.Result.StatusMessage);
+        }
+        catch (Exception ex) {
+          Logger.Error("Error: ", ex);
         }
         HandleNetworkError(e.Error);
@@ -351 +383 @@
     public Response IsJobStillNeeded(Guid jobId) {
       try {
-        return proxy.IsJobStillNeeded(jobId);
+        Logger.Debug("STARTING: Sync call: IsJobStillNeeded");
+        Response res = proxy.IsJobStillNeeded(jobId);
+        Logger.Debug("ENDED: Sync call: IsJobStillNeeded");
+        return res;
       }
       catch (Exception e) {
@@ -361 +396 @@
 
     public ResponseResultReceived ProcessSnapshotSync(Guid clientId, Guid jobId, byte[] result, double percentage, Exception exception) {
-      try {
-        Logging.Instance.Info(this.ToString(), "Snapshot for Job " + jobId + " submitted");
+      try {        
         return proxy.ProcessSnapshotStreamed(
           GetStreamedJobResult(clientId, jobId, result, percentage, exception));
@@ -374 +408 @@
     public List<CachedHivePluginInfoDto> RequestPlugins(List<HivePluginInfoDto> requestedPlugins) {
       try {
+        Logger.Debug("STARTED: Requesting Plugins for Job");
+        Logger.Debug("STARTED: Getting the stream");
         Stream stream = proxy.SendStreamedPlugins(requestedPlugins.ToArray());
-
+        Logger.Debug("ENDED: Getting the stream");
         BinaryFormatter formatter =
           new BinaryFormatter();
+        Logger.Debug("STARTED: Deserializing the stream");
         ResponsePlugin response = (ResponsePlugin)formatter.Deserialize(stream);
+        Logger.Debug("ENDED: Deserializing the stream");
+        if (stream != null)
+          stream.Dispose();        
         return response.Plugins;        
       }
@@ -389 +429 @@
     public void Logout(Guid guid) {
       try {
+        Logger.Debug("STARTED: Logout");
         proxy.Logout(guid);
+        Logger.Debug("ENDED: Logout");
       }
       catch (Exception e) {
@@ -398 +440 @@
     public ResponseCalendar GetCalendarSync(Guid clientId) {
       try {
-        return proxy.GetCalendar(clientId);        
+        Logger.Debug("STARTED: Syncing Calendars");
+        ResponseCalendar cal = proxy.GetCalendar(clientId);
+        Logger.Debug("ENDED: Syncing Calendars");
+        return cal;
       }
       catch (Exception e) {
@@ -408 +453 @@
     public Response SetCalendarStatus (Guid clientId, CalendarState state) {
       try {
-        return proxy.SetCalendarStatus(clientId, state);        
+        Logger.Debug("STARTED: Setting Calendar status to: " + state);
+        Response resp = proxy.SetCalendarStatus(clientId, state);
+        Logger.Debug("ENDED: Setting Calendar status to: " + state);
+        return resp;
       } catch (Exception e) {
         HandleNetworkError(e);

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/ConfigurationManager/UptimeManager.cs

@@ -9 +9 @@
 using HeuristicLab.Hive.Contracts.BusinessObjects;
 using HeuristicLab.Hive.Contracts;
+using HeuristicLab.Tracing;
 
 namespace HeuristicLab.Hive.Client.Core.ConfigurationManager {
@@ -49 +50 @@
       }
       catch (Exception e) {
-        Logging.Instance.Error(this.ToString(), "Persistance of the Calendar failed!", e);
+        Logger.Error("Persistance of the Calendar failed!", e);
       }
       finally {
@@ -68 +69 @@
         }
         catch (Exception e) {
-          Logging.Instance.Error(this.ToString(), "Deserialization of Calendar failed", e);
-          Logging.Instance.Info(this.ToString(), "Starting with a new one");
+          Logger.Error("Deserialization of Calendar failed", e);
+          Logger.Info("Starting with a new one");
           _appContainer = new AppointmentContainer();
           CalendarAvailable = false;

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

@@ -44 +44 @@
 using HeuristicLab.Hive.JobBase;
 using HeuristicLab.Hive.Client.Core.JobStorage;
+using HeuristicLab.Tracing;
 
 namespace HeuristicLab.Hive.Client.Core {
@@ -51 +52 @@
   public class Core : MarshalByRefObject {
     public static bool abortRequested { get; set; }
-    private bool currentlyFetching = false;
+
+    private bool _currentlyFetching;
+    private bool CurrentlyFetching { 
+      get {
+        return _currentlyFetching;
+      } set {        
+        _currentlyFetching = value;
+        Logger.Debug("Set CurrentlyFetching to " + _currentlyFetching);
+      } 
+    }
 
     private Dictionary<Guid, Executor> engines = new Dictionary<Guid, Executor>();
@@ -65 +75 @@
     public void Start() {
       abortRequested = false;
-      Logging.Instance.Info(this.ToString(), "Hive Client started");
+      Logger.Info("Hive Client started");
       ClientConsoleServer server = new ClientConsoleServer();
       server.StartClientConsoleServer(new Uri("net.tcp://127.0.0.1:8000/ClientConsole/"));
@@ -104 +114 @@
         DetermineAction(container);
       }
-      System.Console.WriteLine("ended");
+      Logger.Info("Program shutdown");
     }
 
@@ -112 +122 @@
     /// <param name="container">The Container, containing the message</param>
     private void DetermineAction(MessageContainer container) {
-      Logging.Instance.Info(this.ToString(), "Message: " + container.Message.ToString() + " for job: " + container.JobId);        
+      Logger.Info("Message: " + container.Message.ToString() + " for job: " + container.JobId);        
       switch (container.Message) {
         //Server requests to abort a job
@@ -119 +129 @@
             engines[container.JobId].Abort();
           else
-            Logging.Instance.Error(this.ToString(), "AbortJob: Engine doesn't exist");
+            Logger.Error("AbortJob: Engine doesn't exist");
           break;
         //Job has been successfully aborted
@@ -136 +146 @@
               GC.Collect();
             } else
-              Logging.Instance.Error(this.ToString(), "JobAbort: Engine doesn't exist");
+              Logger.Error("JobAbort: Engine doesn't exist");
           }
           break;
@@ -146 +156 @@
             engines[container.JobId].RequestSnapshot();
           else
-            Logging.Instance.Error(this.ToString(), "RequestSnapshot: Engine doesn't exist");
+            Logger.Error("RequestSnapshot: Engine doesn't exist");
           break;
 
@@ -158 +168 @@
         //Pull a Job from the Server
         case MessageContainer.MessageType.FetchJob:          
-          if (!currentlyFetching) {
+          if (!CurrentlyFetching) {
             wcfService.SendJobAsync(ConfigManager.Instance.GetClientInfo().Id);
-            currentlyFetching = true;
+            CurrentlyFetching = true;
           } else
-            Logging.Instance.Info(this.ToString(), "Currently fetching, won't fetch this time!");
+            Logger.Info("Currently fetching, won't fetch this time!");
           break;          
         
@@ -174 +184 @@
         //When the timeslice is up
         case MessageContainer.MessageType.UptimeLimitDisconnect:
-          Logging.Instance.Info(this.ToString(), "Uptime Limit reached, storing jobs and sending them back");
+          Logger.Info("Uptime Limit reached, storing jobs and sending them back");
 
           //check if there are running jobs
           if (engines.Count > 0) {
             //make sure there is no more fetching of jobs while the snapshots get processed
-            currentlyFetching = true;
+            CurrentlyFetching = true;
             //request a snapshot of each running job
             foreach (KeyValuePair<Guid, Executor> kvp in engines) {
@@ -193 +203 @@
           //Fetch or Force Fetch Calendar!
         case MessageContainer.MessageType.FetchOrForceFetchCalendar:
-          ResponseCalendar rescal = wcfService.GetCalendarSync(ConfigManager.Instance.GetClientInfo().Id);
-          if(rescal.Success) {
-            if(!UptimeManager.Instance.SetAppointments(false, rescal)) {
-              wcfService.SetCalendarStatus(ConfigManager.Instance.GetClientInfo().Id, CalendarState.NotAllowedToFetch);              
-            } else {
-              wcfService.SetCalendarStatus(ConfigManager.Instance.GetClientInfo().Id, CalendarState.Fetched);              
-            }
-          } else {
-            wcfService.SetCalendarStatus(ConfigManager.Instance.GetClientInfo().Id, CalendarState.NotAllowedToFetch);
-          }
+          Logger.Info("Fetch Calendar from Server");
+          FetchCalendarFromServer();  
         break;
 
         //Hard shutdown of the client
         case MessageContainer.MessageType.Shutdown:
+          Logger.Info("Shutdown Signal received");
           lock (engines) {
+            Logger.Debug("engines locked");
             foreach (KeyValuePair<Guid, AppDomain> kvp in appDomains) {
+              Logger.Debug("Shutting down Appdomain for " + kvp.Key);
               appDomains[kvp.Key].UnhandledException -= new UnhandledExceptionEventHandler(appDomain_UnhandledException);
               AppDomain.Unload(kvp.Value);
             }
           }
+          Logger.Debug("Stopping heartbeat");
           abortRequested = true;
           beat.StopHeartBeat();
+          Logger.Debug("Logging out");
           WcfService.Instance.Logout(ConfigManager.Instance.GetClientInfo().Id);
           break;
@@ -230 +237 @@
     private void GetFinishedJob(object jobId) {
       Guid jId = (Guid)jobId;
-      Logging.Instance.Info(this.ToString(), "Getting the finished job with id: " + jId);
+      Logger.Info("Getting the finished job with id: " + jId);
       try {
         if (!engines.ContainsKey(jId)) {
-          Logging.Instance.Error(this.ToString(), "GetFinishedJob: Engine doesn't exist");
+          Logger.Info("Engine doesn't exist");
           return;
         }
@@ -240 +247 @@
 
         if (WcfService.Instance.ConnState == NetworkEnum.WcfConnState.Loggedin) {
-          Logging.Instance.Info(this.ToString(), "Sending the finished job with id: " + jId);
+          Logger.Info("Sending the finished job with id: " + jId);
           wcfService.StoreFinishedJobResultAsync(ConfigManager.Instance.GetClientInfo().Id,
             jId,
@@ -248 +255 @@
             true);
         } else {
-          Logging.Instance.Info(this.ToString(), "Storing the finished job with id: " + jId + " to hdd");
+          Logger.Info("Storing the finished job with id: " + jId + " to hdd");
           JobStorageManager.PersistObjectToDisc(wcfService.ServerIP, wcfService.ServerPort, jId, sJob);
           lock (engines) {
             appDomains[jId].UnhandledException -= new UnhandledExceptionEventHandler(appDomain_UnhandledException);
             AppDomain.Unload(appDomains[jId]);
-            appDomains.Remove(jId);
-            engines.Remove(jId);
+            Logger.Debug("Unloaded appdomain");
+            appDomains.Remove(jId);            
+            engines.Remove(jId);            
             jobs.Remove(jId);
+            Logger.Debug("Removed job from appDomains, Engines and Jobs");
           }
         }
       }
       catch (InvalidStateException ise) {
-        Logging.Instance.Error(this.ToString(), "Exception: ", ise);
+        Logger.Error("Invalid State while Snapshoting:", ise);
       }
     }
 
     private void GetSnapshot(object jobId) {
-      Logging.Instance.Info(this.ToString(), "Fetching a snapshot for job " + jobId);
+      Logger.Info("Fetching a snapshot for job " + jobId);
       Guid jId = (Guid)jobId;
       byte[] obj = engines[jId].GetSnapshot();
-      Logging.Instance.Info(this.ToString(), "BEGIN: Sending snapshot sync");
+      Logger.Debug("BEGIN: Sending snapshot sync");
       wcfService.ProcessSnapshotSync(ConfigManager.Instance.GetClientInfo().Id,
         jId,
@@ -274 +283 @@
         engines[jId].Progress,
         null);
-      Logging.Instance.Info(this.ToString(), "END: Sended snapshot sync");
+      Logger.Debug("END: Sended snapshot sync");
       //Uptime Limit reached, now is a good time to destroy this jobs.
+      Logger.Debug("Checking if uptime limit is reached");
       if (!UptimeManager.Instance.IsOnline()) {
+        Logger.Debug("Uptime limit reached");
+        Logger.Debug("Killing Appdomain");
         KillAppDomain(jId);
-        //Still anything running?
-        if (engines.Count == 0)
+        //Still anything running?  
+        if (engines.Count == 0) {
+          Logger.Info("All jobs snapshotted and sent back, disconnecting");          
           WcfService.Instance.Disconnect();
+        } else {
+          Logger.Debug("There are still active Jobs in the Field, not disconnecting");
+        }
 
       } else {
-        Logging.Instance.Info(this.ToString(), "Restarting the job" + jobId);
+        Logger.Debug("Restarting the job" + jobId);
         engines[jId].StartOnlyJob();
+        Logger.Info("Restarted the job" + jobId);
       }
     }
@@ -299 +316 @@
     void wcfService_LoginCompleted(object sender, LoginCompletedEventArgs e) {
       if (e.Result.Success) {
-        currentlyFetching = false;
-        Logging.Instance.Info(this.ToString(), "Login completed to Hive Server @ " + DateTime.Now);
+        CurrentlyFetching = false;
+        Logger.Info("Login completed to Hive Server @ " + DateTime.Now);
       } else
-        Logging.Instance.Error(this.ToString(), e.Result.StatusMessage);
+        Logger.Error("Error during login: " + e.Result.StatusMessage);
     }
 
@@ -312 +329 @@
     void wcfService_SendJobCompleted(object sender, SendJobCompletedEventArgs e) {
       if (e.Result.StatusMessage != ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOBS_LEFT) {
-        Logging.Instance.Info(this.ToString(), "Received new job with id " + e.Result.Job.Id);      
+        Logger.Info("Received new job with id " + e.Result.Job.Id);      
         bool sandboxed = false;
         List<byte[]> files = new List<byte[]>();
-        Logging.Instance.Info(this.ToString(), "Fetching plugins for job " + e.Result.Job.Id);
+        Logger.Debug("Fetching plugins for job " + e.Result.Job.Id);
         foreach (CachedHivePluginInfoDto plugininfo in PluginCache.Instance.GetPlugins(e.Result.Job.PluginsNeeded))
           files.AddRange(plugininfo.PluginFiles);
-        Logging.Instance.Info(this.ToString(), "Plugins fetched for job " + e.Result.Job.Id);
+        Logger.Debug("Plugins fetched for job " + e.Result.Job.Id);
         AppDomain appDomain = HeuristicLab.PluginInfrastructure.Sandboxing.SandboxManager.CreateAndInitSandbox(e.Result.Job.Id.ToString(), files);
         appDomain.UnhandledException += new UnhandledExceptionEventHandler(appDomain_UnhandledException);
@@ -325 +342 @@
             jobs.Add(e.Result.Job.Id, e.Result.Job);
             appDomains.Add(e.Result.Job.Id, appDomain);
-            Logging.Instance.Info(this.ToString(), "Creating AppDomain");
+            Logger.Debug("Creating AppDomain");
             Executor engine = (Executor)appDomain.CreateInstanceAndUnwrap(typeof(Executor).Assembly.GetName().Name, typeof(Executor).FullName);
-            Logging.Instance.Info(this.ToString(), "Created AppDomain");
+            Logger.Debug("Created AppDomain");
             engine.JobId = e.Result.Job.Id;
             engine.Queue = MessageQueue.GetInstance();
-            Logging.Instance.Info(this.ToString(), "Starting Engine for job " + e.Result.Job.Id);
+            Logger.Debug("Starting Engine for job " + e.Result.Job.Id);
             engine.Start(e.Data);
             engines.Add(e.Result.Job.Id, engine);
@@ -336 +353 @@
             ClientStatusInfo.JobsFetched++;
 
-            Debug.WriteLine("Increment FetchedJobs to:" + ClientStatusInfo.JobsFetched);
+            Logger.Info("Increment FetchedJobs to:" + ClientStatusInfo.JobsFetched);
           }
         }
       } else
-        Logging.Instance.Info(this.ToString(), "No more jobs left!");
-      currentlyFetching = false;
+        Logger.Info("No more jobs left!");
+      CurrentlyFetching = false;
     }
 
@@ -350 +367 @@
     /// <param name="e"></param>
     void wcfService_StoreFinishedJobResultCompleted(object sender, StoreFinishedJobResultCompletedEventArgs e) {
-      Logging.Instance.Info(this.ToString(), "Job submitted with id " + e.Result.JobId);
+      Logger.Info("Job submitted with id " + e.Result.JobId);
       KillAppDomain(e.Result.JobId);
       if (e.Result.Success) {
         ClientStatusInfo.JobsProcessed++;
-        Debug.WriteLine("ProcessedJobs to:" + ClientStatusInfo.JobsProcessed);
+        Logger.Info("Increased ProcessedJobs to:" + ClientStatusInfo.JobsProcessed);
       } else {
-        Logging.Instance.Error(this.ToString(), "Sending of job " + e.Result.JobId + " failed, job has been wasted. Message: " + e.Result.StatusMessage);
+        Logger.Error("Sending of job " + e.Result.JobId + " failed, job has been wasted. Message: " + e.Result.StatusMessage);
       }
     }
@@ -366 +383 @@
     /// <param name="e"></param>
     void wcfService_ProcessSnapshotCompleted(object sender, ProcessSnapshotCompletedEventArgs e) {
-      Logging.Instance.Info(this.ToString(), "Snapshot " + e.Result.JobId + " has been transmitted according to plan.");
+      Logger.Info("Snapshot " + e.Result.JobId + " has been transmitted according to plan.");
     }
 
@@ -375 +392 @@
     /// <param name="e"></param>
     void wcfService_ServerChanged(object sender, EventArgs e) {
-      Logging.Instance.Info(this.ToString(), "ServerChanged has been called");
+      Logger.Info("ServerChanged has been called");
       lock (engines) {
         foreach (KeyValuePair<Guid, Executor> entries in engines) {
@@ -394 +411 @@
     /// <param name="e"></param>
     void wcfService_Connected(object sender, EventArgs e) {
+      Logger.Info("WCF Service got a connection");
       if (!UptimeManager.Instance.CalendarAvailable) {
-        ResponseCalendar calres = wcfService.GetCalendarSync(ConfigManager.Instance.GetClientInfo().Id);
-        if(calres.Success) {
-          if (UptimeManager.Instance.SetAppointments(false, calres))
-            wcfService.SetCalendarStatus(ConfigManager.Instance.GetClientInfo().Id, CalendarState.Fetched);
-          else
-            wcfService.SetCalendarStatus(ConfigManager.Instance.GetClientInfo().Id, CalendarState.NotAllowedToFetch);
-        }
-        else {
-          wcfService.SetCalendarStatus(ConfigManager.Instance.GetClientInfo().Id, CalendarState.NotAllowedToFetch);
-        }
+        Logger.Info("No local calendar available, fetch it");
+        FetchCalendarFromServer();
       }
       //if the fetching from the server failed - still set the client online... maybe we get 
-      //a result within the next few heartbeats
+      //a result within the next few heartbeats      
       if (!UptimeManager.Instance.CalendarAvailable || UptimeManager.Instance.IsOnline()) {
+        Logger.Info("CalendarAvailable is " + UptimeManager.Instance.CalendarAvailable + " and IsOnline is: " + UptimeManager.Instance.IsOnline());
+        Logger.Info("Setting client online");
         wcfService.LoginSync(ConfigManager.Instance.GetClientInfo());
         JobStorageManager.CheckAndSubmitJobsFromDisc();
-        currentlyFetching = false;
+        CurrentlyFetching = false;
+      }
+    }
+
+    private void FetchCalendarFromServer() {
+      ResponseCalendar calres = wcfService.GetCalendarSync(ConfigManager.Instance.GetClientInfo().Id);
+      if(calres.Success) {
+        if (UptimeManager.Instance.SetAppointments(false, calres)) {
+          Logger.Info("Remote calendar installed");
+          wcfService.SetCalendarStatus(ConfigManager.Instance.GetClientInfo().Id, CalendarState.Fetched);
+        } else {
+          Logger.Info("Remote calendar installation failed, setting state to " + CalendarState.NotAllowedToFetch);
+          wcfService.SetCalendarStatus(ConfigManager.Instance.GetClientInfo().Id, CalendarState.NotAllowedToFetch);
+        }
+      } else {
+        Logger.Info("Remote calendar installation failed, setting state to " + CalendarState.NotAllowedToFetch);
+        wcfService.SetCalendarStatus(ConfigManager.Instance.GetClientInfo().Id, CalendarState.NotAllowedToFetch);
       }
     }
@@ -417 +445 @@
     //this is a little bit tricky - 
     void wcfService_ConnectionRestored(object sender, EventArgs e) {
-      Logging.Instance.Info(this.ToString(), "Reconnected to old server - checking currently running appdomains");
+      Logger.Info("Reconnected to old server - checking currently running appdomains");
 
       foreach (KeyValuePair<Guid, Executor> execKVP in engines) {
         if (!execKVP.Value.Running && execKVP.Value.CurrentMessage == MessageContainer.MessageType.NoMessage) {
-          Logging.Instance.Info(this.ToString(), "Checking for JobId: " + execKVP.Value.JobId);
+          Logger.Info("Checking for JobId: " + execKVP.Value.JobId);
           Thread finThread = new Thread(new ParameterizedThreadStart(GetFinishedJob));
           finThread.Start(execKVP.Value.JobId);
@@ -435 +463 @@
 
     void appDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) {
-      Logging.Instance.Error(this.ToString(), "Exception in AppDomain: " + e.ExceptionObject.ToString());
+      Logger.Error("Exception in AppDomain: " + e.ExceptionObject.ToString());    
     }
 
@@ -447 +475 @@
     /// <param name="id">the GUID of the job</param>
     private void KillAppDomain(Guid id) {
-      Logging.Instance.Info(this.ToString(), "Shutting down Appdomain for Job " + id);
+      Logger.Debug("Shutting down Appdomain for Job " + id);
       lock (engines) {
         try {
@@ -457 +485 @@
         }
         catch (Exception ex) {
-          Logging.Instance.Error(this.ToString(), "Exception when unloading the appdomain: ", ex);
+          Logger.Error("Exception when unloading the appdomain: ", ex);
         }
       }

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/CorePlugin.cs

@@ -36 +36 @@
   [PluginDependency("HeuristicLab.Hive.Contracts-3.2")]
   [PluginDependency("HeuristicLab.Hive.JobBase-3.2")]
+  [PluginDependency("HeuristicLab.Tracing", "3.2.0")]
   public class CorePlugin: PluginBase {
   }

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

@@ -32 +32 @@
 using HeuristicLab.Hive.Client.Core.ConfigurationManager;
 using HeuristicLab.Hive.Client.Communication.ServerService;
+using HeuristicLab.Tracing;
 //using BO = HeuristicLab.Hive.Contracts.BusinessObjects;
 
@@ -92 +93 @@
           //That's quiet simple: Just reconnect and you're good for new jobs
           if (wcfService.ConnState != NetworkEnum.WcfConnState.Loggedin) {
-            Logging.Instance.Info(this.ToString(), "Client goes online according to timetable");
+            Logger.Info("Client goes online according to timetable");
             wcfService.Connect();
           }
@@ -103 +104 @@
         wcfService.Connect();
       } else if (wcfService.ConnState == NetworkEnum.WcfConnState.Loggedin) {
-        Logging.Instance.Info(this.ToString(), "Sending Heartbeat: " + heartBeatData);        
+        Logger.Debug("Sending Heartbeat: " + heartBeatData);        
         wcfService.SendHeartBeatAsync(heartBeatData);
       }
@@ -109 +110 @@
 
     void wcfService_ProcessHeartBeatCompleted(object sender, ProcessHeartBeatCompletedEventArgs e) {
-      Logging.Instance.Info(this.ToString(), "Heartbeat received");
+      Logger.Debug("Heartbeat received");
       e.Result.ActionRequest.ForEach(mc => MessageQueue.GetInstance().AddMessage(mc));      
     }

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/HeuristicLab.Hive.Client.Core-3.2.csproj

@@ -157 +157 @@
       <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>
+  <ItemGroup>
+    <WCFMetadata Include="Service References\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

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

@@ -11 +11 @@
 using System.Diagnostics;
 using System.Xml;
+using HeuristicLab.Tracing;
 
 namespace HeuristicLab.Hive.Client.Core.JobStorage {
@@ -28 +29 @@
         jobstream.Write(job, 0, job.Length);
         storedJobsList.Add(info);        
-        Logging.Instance.Info("JobStorageManager", "Job " + info.JobID + " stored on the harddisc");
+        Logger.Info("Job " + info.JobID + " stored on the harddisc");
       }
       catch (Exception e) {
-        Logging.Instance.Error("JobStorageManager", "Exception: ", e);
+        Logger.Error("Exception: ", e);
       }
       finally {
@@ -46 +47 @@
         if (WcfService.Instance.ConnState == NetworkEnum.WcfConnState.Loggedin && (storedJobsList[index-1].ServerIP == WcfService.Instance.ServerIP && storedJobsList[index-1].ServerPort == WcfService.Instance.ServerPort)) {
           String filename = storedJobsList[index-1].ServerIP + "." + storedJobsList[index-1].ServerPort + "." + storedJobsList[index-1].JobID.ToString();          
-          Logging.Instance.Info("JobStorageManager", "Sending stored job " + storedJobsList[index - 1].JobID + " to the server");
+          Logger.Info("Sending stored job " + storedJobsList[index - 1].JobID + " to the server");
           try {
             byte[] job = File.ReadAllBytes(path + filename + ".dat");
@@ -52 +53 @@
               ResponseResultReceived res = WcfService.Instance.SendStoredJobResultsSync(ConfigManager.Instance.GetClientInfo().Id, storedJobsList[index - 1].JobID, job, 1.00, null, true);
               if (!res.Success)
-                Logging.Instance.Error("JobStorageManager", "sending of job failed: " + res.StatusMessage);
+                Logger.Error("sending of job failed: " + res.StatusMessage);
               else
-                Logging.Instance.Info("JobStorageManager", "Sending of job " + storedJobsList[index - 1].JobID + " done");
+                Logger.Info("Sending of job " + storedJobsList[index - 1].JobID + " done");
             }
             ClientStatusInfo.JobsProcessed++;
@@ -61 +62 @@
           }
           catch (Exception e) {
-            Logging.Instance.Error("JobStorageManager", "Job not on hdd but on list - deleting job from list", e);
+            Logger.Error("Job not on hdd but on list - deleting job from list ", e);
             storedJobsList.Remove(storedJobsList[index - 1]);
             StoreJobList();
@@ -78 +79 @@
 
     static JobStorageManager() {
-      Logging.Instance.Info("JobStorageManager", "Restoring Joblist from Harddisk");
+      Logger.Info("Restoring Joblist from Harddisk");
       if (!Directory.Exists(path))
         Directory.CreateDirectory(path);
@@ -89 +90 @@
           XmlTextReader reader = new XmlTextReader(stream);
           storedJobsList = (List<JobStorageInfo>)serializer.Deserialize(reader);
-          Logging.Instance.Info("JobStorageManager", "Loaded " + storedJobsList.Count + " Elements");
+          Logger.Info("Loaded " + storedJobsList.Count + " Elements");
         }
         catch (Exception e) {
-          Logging.Instance.Error("JobStorageManager", "Exception while loading the Stored Job List", e);
+          Logger.Error("Exception while loading the Stored Job List", e);
         } finally {
           if(stream != null) 
@@ -98 +99 @@
         }
       } else {
-        Logging.Instance.Info("JobStorageManager", "no stored jobs on harddisk, starting new list");
+        Logger.Info("no stored jobs on harddisk, starting new list");
         storedJobsList = new List<JobStorageInfo>();
       }

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/PluginCache.cs

@@ -7 +7 @@
 using HeuristicLab.Hive.Client.Common;
 using HeuristicLab.Hive.Contracts.BusinessObjects;
+using HeuristicLab.Tracing;
 
 namespace HeuristicLab.Hive.Client.Core {
@@ -32 +33 @@
 
     public List<CachedHivePluginInfoDto> GetPlugins(List<HivePluginInfoDto> requests) {
+      Logger.Debug("Fetching plugins for job");
       List<CachedHivePluginInfoDto> neededPlugins = new List<CachedHivePluginInfoDto>();
       List<HivePluginInfoDto> missingPlugins = new List<HivePluginInfoDto>();
@@ -40 +42 @@
         foreach (CachedHivePluginInfoDto cache in pluginCache) {
           if (info.Name.Equals(cache.Name) && info.Version.Equals(cache.Version) && info.BuildDate <= cache.BuildDate) {
+            Logger.Debug("Found plugin " + info.Name + ", " + info.Version);
             neededPlugins.Add(cache);
             found = true;
@@ -46 +49 @@
         }
         if (!found)
+          Logger.Debug("Found NOT found " + info.Name + ", " + info.Version);
           missingPlugins.Add(info);
         found = false;
       }
 
+      Logger.Debug("Requesting missing plugins");
       List<CachedHivePluginInfoDto> receivedPlugins = WcfService.Instance.RequestPlugins(missingPlugins);
+      Logger.Debug("Requested missing plugins");
+
       if (receivedPlugins != null) {
         neededPlugins.AddRange(receivedPlugins);
         pluginCache.AddRange(receivedPlugins);
       } else
-        Logging.Instance.Error(this.ToString(), "Fetching of the plugins failed!");
+        Logger.Error("Fetching of the plugins failed!");
 
       return neededPlugins;

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/Properties/Settings.Designer.cs

@@ -2 +2 @@
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3053
+//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

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

@@ -24 +24 @@
 using System.Linq;
 using System.Text;
+using System.Data;
 
 namespace HeuristicLab.Hive.Contracts {
   public class ApplicationConstants {
 
+    public static System.Data.IsolationLevel ISOLATION_LEVEL = IsolationLevel.ReadCommitted;
+
+    public static System.Transactions.IsolationLevel ISOLATION_LEVEL_SCOPE =
+      System.Transactions.IsolationLevel.ReadCommitted;
     public static int HEARTBEAT_MAX_DIF = 120; // value in seconds
     public static int JOB_TIME_TO_LIVE = 5;

trunk/sources/HeuristicLab.Hive.Contracts/3.2/BusinessObjects/JobDto.cs

@@ -48 +48 @@
     public DateTime? DateCalculated { get; set; }
     [DataMember]
+    public DateTime? DateFinished { get; set; }
+    [DataMember]
     public int Priority { get; set; }
     [DataMember]

trunk/sources/HeuristicLab.Hive.Contracts/3.2/HeuristicLab.Hive.Contracts-3.2.csproj

@@ -76 +76 @@
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
     </Reference>
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Xml.Linq">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>

trunk/sources/HeuristicLab.Hive.Contracts/3.2/Interfaces/IJobManager.cs

@@ -34 +34 @@
   public interface IJobManager {
     [OperationContract]
+    ResponseList<JobDto> GetAllJobsWithFilter(State jobState, int offset, int count);
+    [OperationContract]
     ResponseList<JobDto> GetAllJobs();
     [OperationContract]
     ResponseObject<JobDto> GetJobById(Guid jobId);
+    [OperationContract]
+    ResponseObject<JobDto> GetJobByIdWithDetails(Guid jobId);
     [OperationContract]
     ResponseObject<JobDto> AddNewJob(SerializedJob job);
@@ -62 +66 @@
     ResponseList<JobDto> GetJobsByProject(Guid projectId);
     [OperationContract]
-    ResponseObject<JobDto> AddJobWithGroupStrings(SerializedJob job, IEnumerable<string> resources);
+    ResponseObject<JobDto> AddJobWithGroupStrings(SerializedJob job, IEnumerable<string> resources);    
   }
 }

trunk/sources/HeuristicLab.Hive.Engine/3.2/HiveEngine.cs

@@ -135 +135 @@
           Thread.Sleep(RESULT_POLLING_INTERVAL_MS);
           lock (locker) {
-            HiveLogger.Debug("HiveEngine: Results-polling - GetLastResult");
+            Logger.Debug("HiveEngine: Results-polling - GetLastResult");
             response = executionEngineFacade.GetLastSerializedResult(jobId, false);
-            HiveLogger.Debug("HiveEngine: Results-polling - Server: " + response.StatusMessage + " success: " + response.Success);
+            Logger.Debug("HiveEngine: Results-polling - Server: " + response.StatusMessage + " success: " + response.Success);
             // loop while 
             // 1. the user doesn't request an abort 
@@ -145 +145 @@
             if (abortRequested) return;
             if (response.Success && response.Obj != null) {
-              HiveLogger.Debug("HiveEngine: Results-polling - Got result!");
+              Logger.Debug("HiveEngine: Results-polling - Got result!");
               restoredJob = (Job)PersistenceManager.RestoreFromGZip(response.Obj.SerializedJobData);
-              HiveLogger.Debug("HiveEngine: Results-polling - IsSnapshotResult: " + (restoredJob.Progress<1.0));
+              Logger.Debug("HiveEngine: Results-polling - IsSnapshotResult: " + (restoredJob.Progress < 1.0));
             }
           }
@@ -157 +157 @@
         OnFinished();
       });
-      HiveLogger.Debug("HiveEngine: Starting results-polling thread");
+      Logger.Debug("HiveEngine: Starting results-polling thread");
       t.Start();
     }
@@ -166 +166 @@
       ResponseObject<SerializedJob> response;
       lock (locker) {
-        HiveLogger.Debug("HiveEngine: Abort - RequestSnapshot");
+        Logger.Debug("HiveEngine: Abort - RequestSnapshot");
         Response snapShotResponse = executionEngineFacade.RequestSnapshot(jobId);
         if (snapShotResponse.StatusMessage == ApplicationConstants.RESPONSE_JOB_IS_NOT_BEEING_CALCULATED) {
           // job is finished already
-          HiveLogger.Debug("HiveEngine: Abort - GetLastResult(false)");
+          Logger.Debug("HiveEngine: Abort - GetLastResult(false)");
           response = executionEngineFacade.GetLastSerializedResult(jobId, false);
-          HiveLogger.Debug("HiveEngine: Abort - Server: " + response.StatusMessage + " success: " + response.Success);
+          Logger.Debug("HiveEngine: Abort - Server: " + response.StatusMessage + " success: " + response.Success);
         } else {
           // server sent snapshot request to client
@@ -178 +178 @@
           do {
             Thread.Sleep(SNAPSHOT_POLLING_INTERVAL_MS);
-            HiveLogger.Debug("HiveEngine: Abort - GetLastResult(true)");
+            Logger.Debug("HiveEngine: Abort - GetLastResult(true)");
             response = executionEngineFacade.GetLastSerializedResult(jobId, true);
-            HiveLogger.Debug("HiveEngine: Abort - Server: " + response.StatusMessage + " success: " + response.Success);
+            Logger.Debug("HiveEngine: Abort - Server: " + response.StatusMessage + " success: " + response.Success);
             retryCount++;
             // loop while
@@ -194 +194 @@
       SerializedJob jobResult = response.Obj;
       if (jobResult != null) {
-        HiveLogger.Debug("HiveEngine: Results-polling - Got result!");
+        Logger.Debug("HiveEngine: Results-polling - Got result!");
         job = (Job)PersistenceManager.RestoreFromGZip(jobResult.SerializedJobData);
         ControlManager.Manager.ShowControl(job.Engine.CreateView());

trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.Designer.cs

@@ -55 +55 @@
       this.chContent = new System.Windows.Forms.ColumnHeader();
       this.chDetails = new System.Windows.Forms.ColumnHeader();
-      this.lvSnapshots = new System.Windows.Forms.ListView();
-      this.chClientCalculated = new System.Windows.Forms.ColumnHeader();
-      this.chProgress = new System.Windows.Forms.ColumnHeader();
-      this.chSnapshotTime = new System.Windows.Forms.ColumnHeader();
       this.lblProgress = new System.Windows.Forms.Label();
       this.lblStatus = new System.Windows.Forms.Label();
@@ -85 +81 @@
       this.menuItemAddGroup = new System.Windows.Forms.ToolStripMenuItem();
       this.menuItemDeleteGroup = new System.Windows.Forms.ToolStripMenuItem();
+      this.menuItemOpenCalendar = new System.Windows.Forms.ToolStripMenuItem();
       this.lvClientControl = new System.Windows.Forms.ListView();
       this.tcManagementConsole = new System.Windows.Forms.TabControl();
       this.checkBox1 = new System.Windows.Forms.CheckBox();
-      this.menuItemOpenCalendar = new System.Windows.Forms.ToolStripMenuItem();
       this.menuStrip1.SuspendLayout();
       this.plClientDetails.SuspendLayout();
@@ -350 +346 @@
       this.plJobDetails.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
       this.plJobDetails.Controls.Add(this.lvJobDetails);
-      this.plJobDetails.Controls.Add(this.lvSnapshots);
       this.plJobDetails.Controls.Add(this.lblProgress);
       this.plJobDetails.Controls.Add(this.lblStatus);
@@ -372 +367 @@
       this.lvJobDetails.Location = new System.Drawing.Point(17, 124);
       this.lvJobDetails.Name = "lvJobDetails";
-      this.lvJobDetails.Size = new System.Drawing.Size(382, 175);
+      this.lvJobDetails.Size = new System.Drawing.Size(382, 243);
       this.lvJobDetails.TabIndex = 17;
       this.lvJobDetails.UseCompatibleStateImageBehavior = false;
@@ -386 +381 @@
       this.chDetails.Text = "Details";
       this.chDetails.Width = 255;
-      // 
-      // lvSnapshots
-      // 
-      this.lvSnapshots.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.chClientCalculated,
-            this.chProgress,
-            this.chSnapshotTime});
-      this.lvSnapshots.Enabled = false;
-      this.lvSnapshots.FullRowSelect = true;
-      this.lvSnapshots.GridLines = true;
-      this.lvSnapshots.Location = new System.Drawing.Point(17, 310);
-      this.lvSnapshots.Name = "lvSnapshots";
-      this.lvSnapshots.Size = new System.Drawing.Size(382, 69);
-      this.lvSnapshots.TabIndex = 16;
-      this.lvSnapshots.UseCompatibleStateImageBehavior = false;
-      this.lvSnapshots.View = System.Windows.Forms.View.Details;
-      // 
-      // chClientCalculated
-      // 
-      this.chClientCalculated.Text = "Client Calculated";
-      this.chClientCalculated.Width = 112;
-      // 
-      // chProgress
-      // 
-      this.chProgress.Text = "Progress";
-      this.chProgress.Width = 100;
-      // 
-      // chSnapshotTime
-      // 
-      this.chSnapshotTime.Text = "Snapshot request";
-      this.chSnapshotTime.Width = 166;
       // 
       // lblProgress
@@ -657 +621 @@
             this.menuItemOpenCalendar});
       this.contextMenuGroup.Name = "contextMenuJob";
-      this.contextMenuGroup.Size = new System.Drawing.Size(154, 92);
+      this.contextMenuGroup.Size = new System.Drawing.Size(154, 70);
       // 
       // menuItemAddGroup
@@ -670 +634 @@
       this.menuItemDeleteGroup.Size = new System.Drawing.Size(153, 22);
       this.menuItemDeleteGroup.Text = "Delete Group";
+      // 
+      // menuItemOpenCalendar
+      // 
+      this.menuItemOpenCalendar.Name = "menuItemOpenCalendar";
+      this.menuItemOpenCalendar.Size = new System.Drawing.Size(153, 22);
+      this.menuItemOpenCalendar.Text = "Open Calendar";
       // 
       // lvClientControl
@@ -705 +675 @@
       this.checkBox1.Text = "checkBox1";
       this.checkBox1.UseVisualStyleBackColor = true;
-      // 
-      // menuItemOpenCalendar
-      // 
-      this.menuItemOpenCalendar.Name = "menuItemOpenCalendar";
-      this.menuItemOpenCalendar.Size = new System.Drawing.Size(153, 22);
-      this.menuItemOpenCalendar.Text = "Open Calendar";
       // 
       // HiveServerManagementConsole
@@ -782 +746 @@
     private System.Windows.Forms.Label lblStatus;
     private System.Windows.Forms.Label lblProgress;
-    private System.Windows.Forms.ListView lvSnapshots;
-    private System.Windows.Forms.ColumnHeader chClientCalculated;
-    private System.Windows.Forms.ColumnHeader chProgress;
     private System.Windows.Forms.Label lblStateClient;
     private System.Windows.Forms.Label lblState;
@@ -796 +757 @@
     private System.Windows.Forms.ListView lvJobControl;
     private System.Windows.Forms.CheckBox checkBox1;
-    private System.Windows.Forms.ColumnHeader chSnapshotTime;
     private System.Windows.Forms.ContextMenuStrip contextMenuJob;
     private System.Windows.Forms.ToolStripMenuItem menuItemAbortJob;

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

@@ -242 +242 @@
         CloneList(jobsOld, out jobsOldHelp);
 
-        GetDelta(jobsOld.List, jobsOldHelp);
+        if(jobsOld != null && jobsOld.List != null && jobsOldHelp != null)
+          GetDelta(jobsOld.List, jobsOldHelp);
 
       }
@@ -419 +420 @@
       lvJobDetails.Items.Clear();
 
-      lvSnapshots.Enabled = true;
-
-      if (currentJob.State == State.offline) {
+      ResponseObject<JobDto> response = ServiceLocator.GetJobManager().GetJobByIdWithDetails(currentJob.Id);
+
+      if(response.Success == false || response.Obj == null)
+        return;
+
+      JobDto job = response.Obj;
+
+      //lvSnapshots.Enabled = true;
+
+      if (job.State == State.offline) {
         pbJobControl.Image = ilLargeImgJob.Images[2];
-      } else if (currentJob.State == State.calculating) {
+      } else if (job.State == State.calculating) {
         pbJobControl.Image = ilLargeImgJob.Images[1];
-      } else if (currentJob.State == State.finished) {
+      } else if (job.State == State.finished) {
         pbJobControl.Image = ilLargeImgJob.Images[0];
       }
 
-      lblJobName.Text = currentJob.Id.ToString();
-      if (currentJob.Percentage != null) {
+      lblJobName.Text = job.Id.ToString();
+      if (job.Percentage != null) {
         progressJob.Value = (int) (currentJob.Percentage*100);
         lblProgress.Text = (int) (currentJob.Percentage*100) + "% calculated";
@@ -437 +445 @@
       ListViewItem lvi = new ListViewItem();
       lvi.Text = "User:";
-      lvi.SubItems.Add(currentJob.UserId.ToString());
+      lvi.SubItems.Add(job.UserId.ToString());
       lvJobDetails.Items.Add(lvi);
 
@@ -443 +451 @@
       lvi = new ListViewItem();
       lvi.Text = "created at:";
-      lvi.SubItems.Add(currentJob.DateCreated.ToString());
+      lvi.SubItems.Add(job.DateCreated.ToString());
       lvJobDetails.Items.Add(lvi);
 
-      if (currentJob.ParentJob != null) {
+      if (job.ParentJob != null) {
         lvi = null;
         lvi = new ListViewItem();
         lvi.Text = "Parent job:";
-        lvi.SubItems.Add(currentJob.ParentJob.ToString());
+        lvi.SubItems.Add(job.ParentJob.ToString());
         lvJobDetails.Items.Add(lvi);
       }
@@ -457 +465 @@
       lvi = new ListViewItem();
       lvi.Text = "Priority:";
-      lvi.SubItems.Add(currentJob.Priority.ToString());
+      lvi.SubItems.Add(job.Priority.ToString());
       lvJobDetails.Items.Add(lvi);
 
-      if (currentJob.Project != null) {
+      if (job.Project != null) {
         lvi = null;
         lvi = new ListViewItem();
         lvi.Text = "Project:";
-        lvi.SubItems.Add(currentJob.Project.Name.ToString());
+        lvi.SubItems.Add(job.Project.Name.ToString());
         lvJobDetails.Items.Add(lvi);
       }
 
-      if (currentJob.Client != null) {
+      if (job.Client != null) {
         lvi = null;
         lvi = new ListViewItem();
         lvi.Text = "Calculation begin:";
-        lvi.SubItems.Add(currentJob.DateCalculated.ToString());
+        lvi.SubItems.Add(job.DateCalculated.ToString());
         lvJobDetails.Items.Add(lvi);
 
@@ -479 +487 @@
         lvi = new ListViewItem();
         lvi.Text = "Client calculated:";
-        lvi.SubItems.Add(currentJob.Client.Name.ToString());
+        lvi.SubItems.Add(job.Client.Name.ToString());
         lvJobDetails.Items.Add(lvi);
 
-        if (currentJob.State == State.finished) {
-          IJobManager jobManager =
-            ServiceLocator.GetJobManager();
-          ResponseObject<JobResult> jobRes = null;
-          //Todo: jobManager.GetLastJobResultOf(currentJob.Id);
-
-          if (jobRes != null && jobRes.Obj != null) {
-            lvi = null;
+        if (job.State == State.finished) {
+          lvi = null;
             lvi = new ListViewItem();
             lvi.Text = "Calculation ended:";
-            lvi.SubItems.Add(jobRes.Obj.DateFinished.ToString());
+            lvi.SubItems.Add(job.DateFinished.ToString());
             lvJobDetails.Items.Add(lvi);
           }
         }
-      }
-      if (currentJob.State != State.offline) {
-        lvSnapshots.Items.Clear();
-        GetSnapshotList();
-      } else {
-        lvSnapshots.Visible = false;
-      }
-    }
+      } 
 
     /// <summary>
@@ -776 +771 @@
     private void CloneList(ResponseList<JobDto> oldList, out IDictionary<int, JobDto> newList) {
       newList = new Dictionary<int, JobDto>();
-      for (int i = 0; i < oldList.List.Count; i++) {
-        newList.Add(i, oldList.List[i]);
+      if (oldList != null && oldList.List != null) {
+        for (int i = 0; i < oldList.List.Count; i++) {
+          newList.Add(i, oldList.List[i]);
+        }
       }
     }
 
     private bool IsEqual(ClientDto ci1, ClientDto ci2) {
+      if (ci1 == null && ci2 == null) {
+        return true;
+      }
       if (ci2 == null) {
         return false;
@@ -849 +849 @@
     }
 
-    private void GetSnapshotList() {
-
-      lvSnapshots.Items.Clear();
-      IJobManager jobManager = ServiceLocator.GetJobManager();
-
-      ResponseList<JobResult> jobRes = jobManager.GetAllJobResults(currentJob.Id);
-
-      if (jobRes != null && jobRes.List != null) {
-        foreach (JobResult jobresult in jobRes.List) {
-          ListViewItem curSnapshot = new ListViewItem(jobresult.ClientId.ToString());
-          double percentage = jobresult.Percentage * 100;
-          curSnapshot.SubItems.Add(percentage.ToString() + " %");
-          curSnapshot.SubItems.Add(jobresult.Timestamp.ToString());
-          lvSnapshots.Items.Add(curSnapshot);
-        }
-      }
-
-      if ((jobRes.List == null) || (jobRes.List.Count == 0)) {
-        lvSnapshots.Visible = false;
-      } else {
-        lvSnapshots.Visible = true;
-      }
-
-    }
-
     #endregion
 

trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.resx

@@ -129 +129 @@
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABo
-        FwAAAk1TRnQBSQFMAgEBBAEAAQwBAAEMAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        FwAAAk1TRnQBSQFMAgEBBAEAARQBAAEUAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABgAMAAUADAAEBAQABCAYAASAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
@@ -239 +239 @@
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAO
-        DgAAAk1TRnQBSQFMAgEBAwEAAQwBAAEMAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        DgAAAk1TRnQBSQFMAgEBAwEAARQBAAEUAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABgAMAASADAAEBAQABCAYAARAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
@@ -312 +312 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAABcQgAA
-        XEIB62nEUwAAA3hJREFUSEu1ls1PE2EQxj229ouPVNErgZOJicZDjR68mHg1JgYvxov/gIlHxARBoxGU
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAABcQQAA
+        XEEBRtDlPgAAA3hJREFUSEu1ls1PE2EQxj229ouPVNErgZOJicZDjR68mHg1JgYvxov/gIlHxARBoxGU
         KlJUVJDypVIQKkXBpIootoC0tLS0pZEIiILfikAfZ5Zuu9sWaDQ2edLt7vvOrzPzzsxuALBBquIeRR7p
         CKmQVJSmeC3vyUu0FzNOD3NIFhJYpU8VuGBXpiVeK+6L2sgRQQKAbm4hTZ/pVcA8ooN9Ug/H7GY4Z3PS
@@ -342 +342 @@
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABy
-        DAAAAk1TRnQBSQFMAgEBBAEAAQwBAAEMAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        DAAAAk1TRnQBSQFMAgEBBAEAARQBAAEUAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
@@ -409 +409 @@
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABq
-        CQAAAk1TRnQBSQFMAgEBAwEAAQwBAAEMAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBAwEAARQBAAEUAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5

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

@@ -90 +90 @@
     /// <param name="e"></param>
     void lifecycleManager_OnServerHeartbeat(object sender, EventArgs e) {
-      HiveLogger.Info(this.ToString() + ": Server Heartbeat ticked");
-
-      using (TransactionScope scope = new TransactionScope()) {
+      Logger.Debug("Server Heartbeat ticked");
+
+      using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required, new TransactionOptions { IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE })) {
 
         List<ClientDto> allClients = new List<ClientDto>(DaoLocator.ClientDao.FindAll());
@@ -101 +101 @@
 
             if (!lastHeartbeats.ContainsKey(client.Id)) {
-              HiveLogger.Info(this.ToString() + ": Client " + client.Id +
+              Logger.Info("Client " + client.Id +
                               " wasn't offline but hasn't sent heartbeats - setting offline");
               client.State = State.offline;
               DaoLocator.ClientDao.Update(client);
-              HiveLogger.Info(this.ToString() + ": Client " + client.Id +
+              Logger.Info("Client " + client.Id +
                               " wasn't offline but hasn't sent heartbeats - Resetting all his jobs");
               foreach (JobDto job in DaoLocator.JobDao.FindActiveJobsOfClient(client)) {
                 //maybe implementa n additional Watchdog? Till then, just set them offline..
-                DaoLocator.JobDao.SetJobOffline(job);                
-                //jobManager.ResetJobsDependingOnResults(job);
+                DaoLocator.JobDao.SetJobOffline(job);                                
               }
             } else {
@@ -119 +118 @@
               if (dif.TotalSeconds > ApplicationConstants.HEARTBEAT_MAX_DIF) {
                 // if client calculated jobs, the job must be reset
-                HiveLogger.Info(this.ToString() + ": Client timed out and is on RESET");
+                Logger.Info("Client timed out and is on RESET");
                 foreach (JobDto job in DaoLocator.JobDao.FindActiveJobsOfClient(client)) {
                   jobManager.ResetJobsDependingOnResults(job);
@@ -127 +126 @@
                   }
                 }
-
+                Logger.Debug("setting client offline");
                 // client must be set offline
                 client.State = State.offline;
@@ -134 +133 @@
                 DaoLocator.ClientDao.Update(client);
 
+                Logger.Debug("removing it from the heartbeats list");
                 heartbeatLock.EnterWriteLock();
                 lastHeartbeats.Remove(client.Id);
@@ -264 +264 @@
     /// <returns></returns>
     public ResponseHB ProcessHeartBeat(HeartBeatData hbData) {
-      HiveLogger.Debug(this.ToString() + ": BEGIN Processing Heartbeat for Client " + hbData.ClientId);
-      HiveLogger.Debug(this.ToString() + ": BEGIN Fetching Adapters");
-      HiveLogger.Debug(this.ToString() + ": END Fetched Adapters");
-      HiveLogger.Debug(this.ToString() + ": BEGIN Starting Transaction");
-
-      HiveLogger.Debug(this.ToString() + ": END Started Transaction");
+      Logger.Debug("BEGIN Processing Heartbeat for Client " + hbData.ClientId);
 
       ResponseHB response = new ResponseHB();
       response.ActionRequest = new List<MessageContainer>();
 
-      HiveLogger.Debug(this.ToString() + ": BEGIN Started Client Fetching");
+      Logger.Debug("BEGIN Started Client Fetching");
       ClientDto client = DaoLocator.ClientDao.FindById(hbData.ClientId);
-      HiveLogger.Debug(this.ToString() + ": END Finished Client Fetching");
+      Logger.Debug("END Finished Client Fetching");
       // check if the client is logged in
       if (client.State == State.offline || client.State == State.nullState) {
@@ -283 +278 @@
         response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.NoMessage));
 
-        HiveLogger.Error(this.ToString() + " ProcessHeartBeat: Client state null or offline: " + client);
+        Logger.Error("ProcessHeartBeat: Client state null or offline: " + client);
 
         return response;
@@ -292 +287 @@
 
       // save timestamp of this heartbeat
-      HiveLogger.Debug(this.ToString() + ": BEGIN Locking for Heartbeats");
+      Logger.Debug("BEGIN Locking for Heartbeats");
       heartbeatLock.EnterWriteLock();
-      HiveLogger.Debug(this.ToString() + ": END Locked for Heartbeats");
+      Logger.Debug("END Locked for Heartbeats");
       if (lastHeartbeats.ContainsKey(hbData.ClientId)) {
         lastHeartbeats[hbData.ClientId] = DateTime.Now;
@@ -302 +297 @@
       heartbeatLock.ExitWriteLock();
 
-      HiveLogger.Debug(this.ToString() + ": BEGIN Processing Heartbeat Jobs");
+      Logger.Debug("BEGIN Processing Heartbeat Jobs");
       processJobProcess(hbData, response);
-      HiveLogger.Debug(this.ToString() + ": END Processed Heartbeat Jobs");
+      Logger.Debug("END Processed Heartbeat Jobs");
 
       //check if new Cal must be loaded
@@ -314 +309 @@
         //client.CalendarSyncStatus = CalendarState.Fetching;
         
-        HiveLogger.Info(this.ToString() + " fetch or forcefetch sent");        
+        Logger.Info("fetch or forcefetch sent");        
       }
 
       // check if client has a free core for a new job
       // if true, ask scheduler for a new job for this client
-      HiveLogger.Debug(this.ToString() + ": BEGIN Looking for Client Jobs");
+      Logger.Debug(" BEGIN Looking for Client Jobs");
       if (hbData.FreeCores > 0 && scheduler.ExistsJobForClient(hbData)) {
         response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.FetchJob));
@@ -325 +320 @@
         response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.NoMessage));
       }
-      HiveLogger.Debug(this.ToString() + ": END Looked for Client Jobs");
+      Logger.Debug(" END Looked for Client Jobs");
       response.Success = true;
       response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_HEARTBEAT_RECEIVED;
@@ -332 +327 @@
 
       //tx.Commit();
-      HiveLogger.Debug(this.ToString() + ": END Processed Heartbeat for Client " + hbData.ClientId);
+      Logger.Debug(" END Processed Heartbeat for Client " + hbData.ClientId);
       return response;
     }
@@ -344 +339 @@
     /// <param name="response"></param>
     private void processJobProcess(HeartBeatData hbData, ResponseHB response) {
-      HiveLogger.Info(this.ToString() + " processJobProcess: Started for Client " + hbData.ClientId);
+      Logger.Debug("Started for Client " + hbData.ClientId);
       List<JobDto> jobsOfClient = new List<JobDto>(DaoLocator.JobDao.FindActiveJobsOfClient(DaoLocator.ClientDao.FindById(hbData.ClientId)));
       if (hbData.JobProgress != null && hbData.JobProgress.Count > 0) {        
@@ -350 +345 @@
           response.Success = false;
           response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED;
-          HiveLogger.Error(this.ToString() + " processJobProcess: There is no job calculated by this user " + hbData.ClientId);
+          Logger.Error("There is no job calculated by this user " + hbData.ClientId);
           return;
         }
@@ -360 +355 @@
             response.Success = false;
             response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED;
-            HiveLogger.Error(this.ToString() + " processJobProcess: There is no job calculated by this user " + hbData.ClientId + " Job: " + curJob);
+            Logger.Error("There is no job calculated by this user " + hbData.ClientId + " Job: " + curJob);
           } else if (curJob.State == State.abort) {
             // a request to abort the job has been set
@@ -392 +387 @@
             if (newAssignedJobs.ContainsKey(currJob.Id)) {
               newAssignedJobs[currJob.Id]--;
-              HiveLogger.Error(this.ToString() + " processJobProcess: Job TTL Reduced by one for job: " + currJob + "and is now: " + newAssignedJobs[currJob.Id] + ". User that sucks: " + currJob.Client);
+              Logger.Error("Job TTL Reduced by one for job: " + currJob + "and is now: " + newAssignedJobs[currJob.Id] + ". User that sucks: " + currJob.Client);
               if (newAssignedJobs[currJob.Id] <= 0) {
-                HiveLogger.Error(this.ToString() + " processJobProcess: Job TTL reached Zero, Job gets removed: " + currJob + " and set back to offline. User that sucks: " + currJob.Client);
+                Logger.Error("Job TTL reached Zero, Job gets removed: " + currJob + " and set back to offline. User that sucks: " + currJob.Client);
 
                 currJob.State = State.offline;
@@ -404 +399 @@
               }
             } else {
-              HiveLogger.Error(this.ToString() + " processJobProcess: Job ID wasn't with the heartbeats:  " + currJob);
+              Logger.Error("Job ID wasn't with the heartbeats:  " + currJob);
               currJob.State = State.offline;
               DaoLocator.JobDao.Update(currJob);
@@ -413 +408 @@
 
             if (newAssignedJobs.ContainsKey(currJob.Id)) {
-              HiveLogger.Info(this.ToString() + " processJobProcess: Job is sending a heart beat, removing it from the newAssignedJobList: " + currJob);
+              Logger.Info("Job is sending a heart beat, removing it from the newAssignedJobList: " + currJob);
               newAssignedJobs.Remove(currJob.Id);
             }
@@ -427 +422 @@
     /// <param name="clientId"></param>
     /// <returns></returns>
-    /*public ResponseSerializedJob SendSerializedJob(Guid clientId) {
-      ISession session = factory.GetSessionForCurrentThread();
-      ITransaction tx = null;
-
-      try {
-        IJobAdapter jobAdapter =
-          session.GetDataAdapter<JobDto, IJobAdapter>();
-
-        tx = session.BeginTransaction();
-
-        ResponseSerializedJob response = new ResponseSerializedJob();
-
-        JobDto job2Calculate = scheduler.GetNextJobForClient(clientId);
-        if (job2Calculate != null) {
-          SerializedJob computableJob =
-            jobAdapter.GetSerializedJob(job2Calculate.Id);
-
-          response.Job = computableJob;
-          response.Success = true;
-          HiveLogger.Info(this.ToString() + " SendSerializedJob: Job pulled: " + computableJob.JobInfo + " for user " + clientId);                      
-          response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_PULLED;
-          lock (newAssignedJobs) {
-            if (!newAssignedJobs.ContainsKey(job2Calculate.Id))
-              newAssignedJobs.Add(job2Calculate.Id, ApplicationConstants.JOB_TIME_TO_LIVE);
-          }
-        } else {
-          HiveLogger.Info(this.ToString() + " SendSerializedJob: No more Jobs left for " + clientId);                      
-          response.Success = false;
-          response.Job = null;
-          response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOBS_LEFT;
-        }
-
-        tx.Commit();
-
-        return response;
-      }
-      catch (Exception ex) {
-        if (tx != null)
-          tx.Rollback();
-        throw ex;
-      }
-      finally {
-        if (session != null)
-          session.EndSession();
-      }
-    }     */
-
-    /// <summary>
-    /// if the client was told to pull a job he calls this method
-    /// the server selects a job and sends it to the client
-    /// </summary>
-    /// <param name="clientId"></param>
-    /// <returns></returns>
     public ResponseJob SendJob(Guid clientId) {
 
@@ -487 +429 @@
       if (job2Calculate != null) {
         response.Job = job2Calculate;
+        response.Job.PluginsNeeded = DaoLocator.PluginInfoDao.GetPluginDependenciesForJob(response.Job);
         response.Success = true;
-        HiveLogger.Info(this.ToString() + " SendSerializedJob: Job pulled: " + job2Calculate + " for user " + clientId);
+        Logger.Info("Job pulled: " + job2Calculate + " for user " + clientId);
         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_PULLED;
         lock (newAssignedJobs) {
@@ -494 +437 @@
             newAssignedJobs.Add(job2Calculate.Id, ApplicationConstants.JOB_TIME_TO_LIVE);
         }
-      } else {
+      } else {                  
         response.Success = false;
         response.Job = null;
         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOBS_LEFT;
-        HiveLogger.Info(this.ToString() + " SendSerializedJob: No more Jobs left for " + clientId);
+        Logger.Info("No more Jobs left for " + clientId);
       }
 
@@ -510 +453 @@
       bool finished) {
 
-      HiveLogger.Info(this.ToString() + " ProcessJobResult: BEGIN Job received for Storage - main method:");
+      Logger.Info("BEGIN Job received for Storage - main method:");
 
 
@@ -547 +490 @@
         jobStream.Close();
       }
-      HiveLogger.Info(this.ToString() + " ProcessJobResult: END Job received for Storage:");
+      Logger.Info("END Job received for Storage:");
       return response;
     }
@@ -559 +502 @@
       bool finished) {
 
-      HiveLogger.Info(this.ToString() + " ProcessJobResult: BEGIN Job received for Storage - SUB method: " + jobId);
+      Logger.Info("BEGIN Job received for Storage - SUB method: " + jobId);
 
       ResponseResultReceived response = new ResponseResultReceived();
@@ -579 +522 @@
         response.JobId = jobId;
 
-        HiveLogger.Error(this.ToString() + " ProcessJobResult: No job with Id " + jobId);
+        Logger.Error("No job with Id " + jobId);
 
         //tx.Rollback();
@@ -588 +531 @@
         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_WAS_ABORTED;
 
-        HiveLogger.Error(this.ToString() + " ProcessJobResult: Job was aborted! " + job.JobInfo);
+        Logger.Error("Job was aborted! " + job.JobInfo);
 
         //tx.Rollback();
@@ -598 +541 @@
         response.JobId = jobId;
 
-        HiveLogger.Error(this.ToString() + " ProcessJobResult: Job is not being calculated (client = null)! " + job.JobInfo);
+        Logger.Error("Job is not being calculated (client = null)! " + job.JobInfo);
 
         //tx.Rollback();
@@ -608 +551 @@
         response.JobId = jobId;
 
-        HiveLogger.Error(this.ToString() + " ProcessJobResult: Wrong Client for this Job! " + job.JobInfo + ", Sending Client is: " + clientId);
+        Logger.Error("Wrong Client for this Job! " + job.JobInfo + ", Sending Client is: " + clientId);
 
         //tx.Rollback();
@@ -618 +561 @@
         response.JobId = jobId;
 
-        HiveLogger.Error(this.ToString() + " ProcessJobResult: Job already finished! " + job.JobInfo + ", Sending Client is: " + clientId);
+        Logger.Error("Job already finished! " + job.JobInfo + ", Sending Client is: " + clientId);
 
         //tx.Rollback();
         return response;
       }
+      //Todo: RequestsnapshotSent => calculating?
       if (job.JobInfo.State == State.requestSnapshotSent) {
         job.JobInfo.State = State.calculating;
@@ -632 +576 @@
         response.JobId = jobId;
 
-        HiveLogger.Error(this.ToString() + " ProcessJobResult: Wrong Job State, job is: " + job.JobInfo);
+        Logger.Error("Wrong Job State, job is: " + job.JobInfo);
 
         //tx.Rollback();
@@ -641 +585 @@
       if (finished) {
         job.JobInfo.State = State.finished;
+        job.JobInfo.DateFinished = DateTime.Now;
       }
 
@@ -652 +597 @@
       response.finished = finished;
 
-      HiveLogger.Info(this.ToString() + " ProcessJobResult: END Job received for Storage - SUB method: " + jobId);
+      Logger.Info("END Job received for Storage - SUB method: " + jobId);
       return response;
 
@@ -691 +636 @@
     public Response Logout(Guid clientId) {
 
-      HiveLogger.Info("Client logged out " + clientId);
+      Logger.Info("Client logged out " + clientId);
       
       Response response = new Response();
@@ -736 +681 @@
         response.Success = false;
         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_DOESNT_EXIST;
-        HiveLogger.Error(this.ToString() + " IsJobStillNeeded: Job doesn't exist (anymore)! " + jobId);
+        Logger.Error("Job doesn't exist (anymore)! " + jobId);
         return response;
       }
@@ -742 +687 @@
         response.Success = true;
         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_ALLREADY_FINISHED;
-        HiveLogger.Error(this.ToString() + " IsJobStillNeeded: already finished! " + job);
+        Logger.Error("already finished! " + job);
         return response;
       }

trunk/sources/HeuristicLab.Hive.Server.Core/3.2/HiveServerCorePlugin.cs

@@ -35 +35 @@
   [PluginDependency("HeuristicLab.Hive.Server.LINQDataAccess-3.2")]
   [PluginDependency("HeuristicLab.Security.Contracts-3.2")]
+  [PluginDependency("HeuristicLab.Tracing", "3.2.0")]
   public class HiveServerCorePlugin : PluginBase {
   }

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

@@ -35 +35 @@
 using System.Transactions;
 using HeuristicLab.Hive.Server.LINQDataAccess;
+using IsolationLevel=System.Transactions.IsolationLevel;
 
 namespace HeuristicLab.Hive.Server.Core {
@@ -57 +58 @@
 
     public void ResetJobsDependingOnResults(JobDto job) {
-      HiveLogger.Info(this.ToString() + ": Setting job " + job.Id + " offline");
+      Logger.Info("Setting job " + job.Id + " offline");
       if (job != null) {
         DaoLocator.JobDao.SetJobOffline(job);
@@ -65 +66 @@
 
     void checkForDeadJobs() {
-      HiveLogger.Info(this.ToString() + " Searching for dead Jobs");
-      using (TransactionScope scope = new TransactionScope()) {
+      Logger.Info("Searching for dead Jobs");
+      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) {
@@ -91 +92 @@
     /// <returns></returns>
     public ResponseList<JobDto> GetAllJobs() {
-       /*ISession session = factory.GetSessionForCurrentThread();
-
-       try {
-         IJobAdapter jobAdapter =
-             session.GetDataAdapter<JobDto, IJobAdapter>();*/
-
          ResponseList<JobDto> response = new ResponseList<JobDto>();
 
@@ -104 +99 @@
 
          return response;
-       /*}
-       finally {
-         if (session != null)
-           session.EndSession();
-       } */
-    }
+    }
+
+    public ResponseList<JobDto> GetAllJobsWithFilter(State jobState, int offset, int count) {
+      ResponseList<JobDto> response = new ResponseList<JobDto>();
+      response.List = new List<JobDto>(DaoLocator.JobDao.FindWithLimitations(jobState, offset, count));
+      return response;
+    }  
 
     /// <summary>
@@ -126 +122 @@
     /// <returns></returns>
     public ResponseObject<JobDto> GetJobById(Guid jobId) {
-      /*ISession session = factory.GetSessionForCurrentThread();
-
-      try {              
-        IJobAdapter jobAdapter =
-            session.GetDataAdapter<JobDto, IJobAdapter>();*/
-
         ResponseObject<JobDto> response = new ResponseObject<JobDto>();
 
@@ -145 +135 @@
         return response;
       }
-      /*finally {
-        if (session != null)
-          session.EndSession();
-      }
-    }   */
+
+    public ResponseObject<JobDto> GetJobByIdWithDetails(Guid jobId) {
+      ResponseObject<JobDto> job = new ResponseObject<JobDto>();
+      job.Obj = DaoLocator.JobDao.FindById(jobId);
+      if (job.Obj != null) {
+        job.Success = true;
+        job.StatusMessage = ApplicationConstants.RESPONSE_JOB_GET_JOB_BY_ID;
+
+        job.Obj.Client = DaoLocator.ClientDao.GetClientForJob(jobId);
+      } else {
+        job.Success = false;
+        job.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_DOESNT_EXIST;
+      }      
+      return job;
+    }
 
     public ResponseObject<JobDto> AddJobWithGroupStrings(SerializedJob job, IEnumerable<string> resources) {
@@ -167 +167 @@
     /// <returns></returns>
     public ResponseObject<JobDto> AddNewJob(SerializedJob job) {
-      /*ISession session = factory.GetSessionForCurrentThread();
-
-      try {
-        IJobAdapter jobAdapter =
-            session.GetDataAdapter<JobDto, IJobAdapter>();*/
-
         ResponseObject<JobDto> response = new ResponseObject<JobDto>();
 
@@ -218 +212 @@
     /// <returns></returns>
     public Response RemoveJob(Guid jobId) {
-      /*ISession session = factory.GetSessionForCurrentThread();
-
-      try {
-        IJobAdapter jobAdapter =
-            session.GetDataAdapter<JobDto, IJobAdapter>();*/
-
         Response response = new Response();
 
@@ -238 +226 @@
         return response;
       }
-      /*finally {
-        if (session != null)
-          session.EndSession();
-      }
-    }   */
 
     public ResponseObject<JobDto> GetLastJobResultOf(Guid jobId) {
@@ -258 +241 @@
     public ResponseObject<SerializedJob>
       GetLastSerializedJobResultOf(Guid jobId, bool requested) {
-      /*ISession session = factory.GetSessionForCurrentThread();
-
-      ITransaction tx = null;
-
-      try {
-        IJobAdapter jobAdapter =
-            session.GetDataAdapter<JobDto, IJobAdapter>();
-
-        IJobResultsAdapter jobResultsAdapter =
-          session.GetDataAdapter<JobResult, IJobResultsAdapter>();
-
-        tx = session.BeginTransaction();                          */
 
         ResponseObject<SerializedJob> response =
@@ -386 +357 @@
 
     public ResponseList<JobResult> GetAllJobResults(Guid jobId) {
-     /* ISession session = factory.GetSessionForCurrentThread();
-      ResponseList<JobResult> response = new ResponseList<JobResult>();
-
-      try {
-        IJobResultsAdapter jobResultAdapter =
-            session.GetDataAdapter<JobResult, IJobResultsAdapter>();
-        IJobAdapter jobAdapter = session.GetDataAdapter<JobDto, IJobAdapter>();
-
-        JobDto job = jobAdapter.GetById(jobId);
-        if (job == null) {
-          response.Success = false;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_DOESNT_EXIST;
-          return response;
-        }
-        response.List = new List<JobResult>(jobResultAdapter.GetResultsOf(job.Id));
-        response.Success = true;
-        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_RESULT_SENT;
-
-        return response;
-      }
-      finally {
-        if(session != null)
-          session.EndSession();
-      }  */
       return new ResponseList<JobResult>();
     }
 
     public ResponseList<ProjectDto> GetAllProjects() {
-      /*ISession session = factory.GetSessionForCurrentThread();
-      ResponseList<ProjectDto> response = new ResponseList<ProjectDto>();
-
-      try {
-        IProjectAdapter projectAdapter =
-          session.GetDataAdapter<ProjectDto, IProjectAdapter>();
-
-        List<ProjectDto> allProjects = new List<ProjectDto>(projectAdapter.GetAll());
-        response.List = allProjects;
-        response.Success = true;
-        return response;
-      }
-      finally {
-        if (session != null)
-          session.EndSession();
-      } */
       return null;
     }
 
     private Response createUpdateProject(ProjectDto project) {
-      /*ISession session = factory.GetSessionForCurrentThread();
-      Response response = new Response();
-      ITransaction tx = null;
-
-      try {
-        IProjectAdapter projectAdapter =
-          session.GetDataAdapter<ProjectDto, IProjectAdapter>();
-
-        if (project.Name == null || project.Name == "") {
-          response.Success = false;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_PROJECT_NAME_EMPTY;
-          return response;
-        }
-        tx = session.BeginTransaction();
-        projectAdapter.Update(project);
-
-        tx.Commit();
-        response.Success = true;
-        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_PROJECT_ADDED;
-      } catch (ConstraintException ce) {
-        if (tx != null)
-          tx.Rollback();
-        response.Success = false;
-        response.StatusMessage = ce.Message;
-      }
-      catch (Exception ex) {
-        if (tx != null)
-          tx.Rollback();
-        throw ex;
-      }
-      finally {
-        if (session != null)
-          session.EndSession();
-      }
-      return response;    */
       return null;
     }
@@ -481 +377 @@
 
     public Response DeleteProject(Guid projectId) {
-      /*ISession session = factory.GetSessionForCurrentThread();
-      Response response = new Response();
-      ITransaction tx = null;
-
-      try {
-        IProjectAdapter projectAdapter =
-          session.GetDataAdapter<ProjectDto, IProjectAdapter>();
-
-        ProjectDto project = projectAdapter.GetById(projectId);
-        if (project == null) {
-          response.Success = false;
-          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_PROJECT_DOESNT_EXIST;
-          return response;
-        }
-        projectAdapter.Delete(project);
-        tx.Commit();
-        response.Success = true;
-        response.StatusMessage = ApplicationConstants.RESPONSE_JOB_PROJECT_DELETED;
-      }
-      catch (Exception e) {
-        if (tx != null)
-          tx.Rollback();
-        response.Success = false;
-        response.StatusMessage = e.Message;
-      }
-      finally {
-        if (session != null)
-          session.EndSession();
-      }     
-      return response; */
       return null;
     }
 
     public ResponseList<JobDto> GetJobsByProject(Guid projectId) {
-      /*ISession session = factory.GetSessionForCurrentThread();
-      ResponseList<JobDto> response = new ResponseList<JobDto>();
-
-      try {
-        IJobAdapter jobAdapter =
-          session.GetDataAdapter<JobDto, IJobAdapter>();
-        List<JobDto> jobsByProject = new List<JobDto>(jobAdapter.GetJobsByProject(projectId));
-        response.List = jobsByProject;
-        response.Success = true;
-      }
-      finally {
-        if (session != null)
-          session.EndSession();
-      } 
-       
-      return response;*/
       return null;      
     }
-
     #endregion
   }

trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ServerConsoleFacade.cs

@@ -97 +97 @@
     }
 
+    public ResponseList<JobDto> GetAllJobsWithFilter(State jobState, int offset, int count) {
+      secMan.Authorize("AccessJobs", sessionID, Guid.Empty);
+      return jobManager.GetAllJobsWithFilter(jobState, offset, count);
+    }
+
     public ResponseObject<JobDto> GetJobById(Guid jobId) {
       secMan.Authorize("AccessJobs", sessionID, jobId);
       return jobManager.GetJobById(jobId);
+    }
+
+    public ResponseObject<JobDto> GetJobByIdWithDetails(Guid jobId) {
+      secMan.Authorize("AccessJobs", sessionID, jobId);
+      return jobManager.GetJobByIdWithDetails(jobId);
     }
 

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

@@ -21 +21 @@
     IEnumerable<JobDto> FindFittingJobsForClient(State state, int freeCores, int freeMemory, Guid clientGuid);
     Stream GetSerializedJobStream(Guid jobId);
+
+    IEnumerable<JobDto> FindWithLimitations(State jobState, int offset, int count);
   }
 }

trunk/sources/HeuristicLab.Hive.Server.DataAccess/3.2/IPluginInfoDao.cs

@@ -7 +7 @@
   public interface IPluginInfoDao: IGenericDao<HivePluginInfoDto> {    
     void InsertPluginDependenciesForJob(JobDto jobDto);
+    List<HivePluginInfoDto> GetPluginDependenciesForJob(JobDto jobDto);
   }
 }

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

@@ -3 +3 @@
 using System.Linq;
 using System.Text;
+using System.Data.Linq;
+using HeuristicLab.Tracing;
 
 namespace HeuristicLab.Hive.Server.LINQDataAccess {
@@ -12 +14 @@
     }
 
+    protected void CommitChanges() {
+      try {
+        Context.SubmitChanges(ConflictMode.ContinueOnConflict);
+      } catch (ChangeConflictException e) {
+        Logger.Warn("Concurrency Exception! " + e.Message);
+        foreach (ObjectChangeConflict conflict in Context.ChangeConflicts) {          
+          conflict.Resolve(RefreshMode.KeepChanges);
+        }
+      }
+    }
+
     public abstract TDatabaseEntity DtoToEntity(TBusiness source, TDatabaseEntity target);
     public abstract TBusiness EntityToDto(TDatabaseEntity source, TBusiness target);

trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/ClientConfigDao.cs

@@ -26 +26 @@
       ClientConfig c = DtoToEntity(bObj, null);
       Context.ClientConfigs.InsertOnSubmit(c);
-      Context.SubmitChanges();
+      CommitChanges();
       bObj.Id = c.ClientConfigId;
       return bObj;  
@@ -33 +33 @@
     public void Delete(ClientConfigDto bObj) {
       Context.ClientConfigs.DeleteOnSubmit(Context.ClientConfigs.SingleOrDefault(c => c.ClientConfigId.Equals(bObj.Id)));
-      Context.SubmitChanges();
+      CommitChanges();
     }
 
@@ -39 +39 @@
       ClientConfig cc = Context.ClientConfigs.SingleOrDefault(c => c.ClientConfigId.Equals(bObj.Id));
       DtoToEntity(bObj, cc);
-      Context.SubmitChanges();
+      CommitChanges();
     }
 

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

@@ -43 +43 @@
       dbclient.UseCalendarFromResourceId = clientGroupId;
       dbclient.CalendarSyncStatus = Enum.GetName(typeof(CalendarState), CalendarState.Fetch);
-      Context.SubmitChanges();
+      CommitChanges();
     }
 
@@ -49 +49 @@
       Client c = DtoToEntity(info, null);      
       Context.Clients.InsertOnSubmit(c);
-      Context.SubmitChanges();
+      CommitChanges();
       info.Id = c.ResourceId;
       return info;
@@ -58 +58 @@
       Resource res = Context.Resources.SingleOrDefault(c => c.ResourceId.Equals(info.Id));            
       Context.Resources.DeleteOnSubmit(res);
-      Context.SubmitChanges();
+      CommitChanges();
     }
 
@@ -64 +64 @@
       Client client = Context.Clients.SingleOrDefault(c => c.ResourceId.Equals(info.Id));
       DtoToEntity(info, client);
-      try {
-        Console.WriteLine("Sending from thread: " + Thread.CurrentThread.ManagedThreadId);
-        Context.SubmitChanges();
-      } catch (System.Data.Linq.ChangeConflictException cce) {
-        Console.WriteLine(cce);        
-      }
+      CommitChanges();      
     }
 

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

@@ -31 +31 @@
       ClientGroup cc = DtoToEntity(bObj, null);
       Context.ClientGroups.InsertOnSubmit(cc);
-      Context.SubmitChanges();
+      CommitChanges();
       bObj.Id = cc.ResourceId;
       return bObj;
@@ -44 +44 @@
 
       Context.Resources.DeleteOnSubmit(res);
-      Context.SubmitChanges();
+      CommitChanges();
     }
 
@@ -50 +50 @@
       ClientGroup client = Context.ClientGroups.SingleOrDefault(c => c.ResourceId.Equals(bObj.Id));
       DtoToEntity(bObj, client);
-      Context.SubmitChanges();
+      CommitChanges();
     }
 
@@ -57 +57 @@
       Resource res = Context.Resources.SingleOrDefault(r => r.ResourceId.Equals(resource));
       cg.ClientGroup_Resources.Add(new ClientGroup_Resource { ClientGroup = cg, Resource = res });      
-      Context.SubmitChanges();
+      CommitChanges();
     }
 
@@ -65 +65 @@
           cg => cg.ResourceId.Equals(resource) && cg.ClientGroupId.Equals(clientGroupId));
       Context.ClientGroup_Resources.DeleteOnSubmit(cgr);
-      Context.SubmitChanges();
+      CommitChanges();
     }
 

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

@@ -9 +9 @@
   public class ContextFactory {
     [ThreadStatic]
-    private static HiveDataContext _hiveDataContext;
+    private static HiveDataContext _hiveDataContext = null;
 
     [ThreadStatic]
-    private static SqlTransaction _currentTransaction;
+    private static SqlTransaction _currentTransaction = null;
 
     public static HiveDataContext Context { 

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

@@ -134 +134 @@
       <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>
   <ItemGroup>

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

@@ -88 +88 @@
       <Column Name="ResourceId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
       <Column Name="Percentage" Type="System.Double" DbType="Float" CanBeNull="true" />
-      <Column Name="SerializedJob" Type="System.Data.Linq.Binary" DbType="VarBinary(MAX)" CanBeNull="true" UpdateCheck="Never" />
+      <Column Name="SerializedJob" Type="System.Data.Linq.Binary" DbType="VarBinary(MAX)" CanBeNull="true" UpdateCheck="Never" IsDelayLoaded="true" />
       <Column Name="DateCreated" Type="System.DateTime" DbType="DateTime" CanBeNull="true" />
       <Column Name="DateCalculated" Type="System.DateTime" DbType="DateTime" CanBeNull="true" />

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

@@ -1774 +1774 @@
     private System.Nullable<double> _Percentage;
     
-    private System.Data.Linq.Binary _SerializedJob;
+    private System.Data.Linq.Link<System.Data.Linq.Binary> _SerializedJob;
     
     private System.Nullable<System.DateTime> _DateCreated;
@@ -1957 +1957 @@
     }
     
-    [Column(Storage="_SerializedJob", DbType="VarBinary(MAX)", CanBeNull=true, UpdateCheck=UpdateCheck.Never)]
+    [Column(Storage="_SerializedJob", DbType="VarBinary(MAX)", UpdateCheck=UpdateCheck.Never)]
     public System.Data.Linq.Binary SerializedJob
     {
       get
       {
-        return this._SerializedJob;
-      }
-      set
-      {
-        if ((this._SerializedJob != value))
+        return this._SerializedJob.Value;
+      }
+      set
+      {
+        if ((this._SerializedJob.Value != value))
         {
           this.OnSerializedJobChanging(value);
           this.SendPropertyChanging();
-          this._SerializedJob = value;
+          this._SerializedJob.Value = value;
           this.SendPropertyChanged("SerializedJob");
           this.OnSerializedJobChanged();

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

@@ -25 +25 @@
     }
 
+    public IEnumerable<JobDto> FindWithLimitations(State jobState, int offset, int count) {
+
+      IQueryable<JobDto> query = null;
+      if (jobState == State.finished) {
+         query = from job in Context.Jobs
+                 where job.JobState == Enum.GetName(typeof (State), jobState)
+                 orderby job.DateFinished
+                 select EntityToDto(job, null);
+      } else if (jobState == State.calculating || jobState == State.requestSnapshot || jobState == State.requestSnapshotSent) {
+        query = from job in Context.Jobs
+                    where job.JobState == Enum.GetName(typeof(State), jobState)
+                    orderby job.DateCalculated
+                    select EntityToDto(job, null);
+      } else {
+        query = from job in Context.Jobs
+                    where job.JobState == Enum.GetName(typeof(State), jobState)
+                    orderby job.DateCreated
+                    select EntityToDto(job, null);
+      }
+
+      return query.Skip(offset).Take(count).ToList();
+    }
+
+
     public byte[] GetBinaryJobFile(Guid jobId) {
       return (from job in Context.Jobs
@@ -34 +58 @@
       Job j = DtoToEntity(bObj, null);
       Context.Jobs.InsertOnSubmit(j);
-      Context.SubmitChanges();
+      CommitChanges();
       bObj.Id = j.JobId;
       return bObj;
@@ -45 +69 @@
         j.AssignedResources.Add(new AssignedResource { ResourceId = assignRessourceId});
       Context.Jobs.InsertOnSubmit(j);
-      Context.SubmitChanges();
+      CommitChanges();
       job.JobInfo.Id = j.JobId;
       return job;
@@ -54 +78 @@
       Job job = Context.Jobs.SingleOrDefault(j => j.JobId.Equals(bObj.Id));
       Context.Jobs.DeleteOnSubmit(job);
-      Context.SubmitChanges();
+      CommitChanges();
     }
 
     public void Update(JobDto bObj) {
       Job job = Context.Jobs.SingleOrDefault(j => j.JobId.Equals(bObj.Id));
-      DtoToEntity(bObj, job);
-      try {
-        Context.SubmitChanges();
-      } catch (ChangeConflictException cfe) {
-        
-      }
+      DtoToEntity(bObj, job);    
+      CommitChanges(); 
     }
 
@@ -105 +125 @@
       c.Jobs.Add(j);
       j.Client = c;
-      Context.SubmitChanges();      
+      CommitChanges();      
     }
 
@@ -112 +132 @@
       j.Client = null;
       j.JobState = Enum.GetName(typeof(State), State.offline); 
-      Context.SubmitChanges();
+      CommitChanges();
     }
 
@@ -137 +157 @@
       target.DateCalculated = source.DateCalculated;
       target.DateCreated = source.DateCreated;
+      target.DateFinished = source.DateFinished;
       target.JobId = source.Id;
 
@@ -162 +183 @@
       target.MemoryNeeded = source.MemoryNeeded;
 
-
-
       target.DateCalculated = source.DateCalculated;
       target.DateCreated = source.DateCreated;
+      target.DateFinished = source.DateFinished;
       target.Id = source.JobId;
-      
-          
+       
       target.Percentage = source.Percentage;
       

trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/LINQDataAccessPlugin.cs

@@ -11 +11 @@
   [PluginDependency("HeuristicLab.Hive.Contracts-3.2")]
   [PluginDependency("HeuristicLab.Hive.Server.DataAccess-3.2")]
+  [PluginDependency("HeuristicLab.Tracing", "3.2.0")]
   public class LINQDataAccessPlugin: PluginBase {
   }

trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/PluginInfoDao.cs

@@ -26 +26 @@
       PluginInfo pi = DtoToEntity(bObj, null);
       Context.PluginInfos.InsertOnSubmit(pi);
-      Context.SubmitChanges();
+      CommitChanges();
       bObj.Id = pi.PluginId;
       return bObj;
@@ -39 +39 @@
       PluginInfo pi = Context.PluginInfos.SingleOrDefault(p => p.PluginId.Equals(bObj.Id));
       DtoToEntity(bObj, pi);
-      Context.SubmitChanges();
+      CommitChanges();
     }
 
@@ -53 +53 @@
                                 };
           Context.PluginInfos.InsertOnSubmit(dbpi);
-          Context.SubmitChanges();
+          CommitChanges();
         }
 
@@ -60 +60 @@
         rq.PluginInfo = dbpi;
         Context.RequiredPlugins.InsertOnSubmit(rq);
-        Context.SubmitChanges();
+        CommitChanges();
       }
+    }
+
+    public List<HivePluginInfoDto> GetPluginDependenciesForJob(JobDto jobDto) {
+      return (from rp in Context.RequiredPlugins
+              where rp.JobId.Equals(jobDto.Id)
+              select EntityToDto(rp.PluginInfo, null)).ToList();
+      
     }
 

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

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

trunk/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=SEMTEX-PC;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&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=SEMTEX-PC;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</Value>
     </Setting>
   </Settings>

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

@@ -60 +60 @@
       UptimeCalendar uc = DtoToEntity(bObj, null);
       Context.UptimeCalendars.InsertOnSubmit(uc);
-      Context.SubmitChanges();
+      CommitChanges();
       bObj.Id = uc.UptimeCalendarId;
       return bObj;
@@ -67 +67 @@
     public void Delete(AppointmentDto bObj) {
       Context.UptimeCalendars.DeleteOnSubmit(Context.UptimeCalendars.SingleOrDefault(uc => uc.UptimeCalendarId.Equals(bObj.Id)));
-      Context.SubmitChanges();
+      CommitChanges();
     }
 
@@ -73 +73 @@
       UptimeCalendar cc = Context.UptimeCalendars.SingleOrDefault(c => c.UptimeCalendarId.Equals(bObj.Id));
       DtoToEntity(bObj, cc);
-      Context.SubmitChanges();
+      CommitChanges();
     }
 
@@ -95 +95 @@
       }
 
-      Context.SubmitChanges();            
+      CommitChanges();            
     }    
 
@@ -143 +143 @@
       }
       
-      Context.SubmitChanges();
+      CommitChanges();
 
       //Get all Subgroups

trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/VarBinaryStream.cs

@@ -7 +7 @@
 using System.Data.SqlClient;
 using System.Data;
+using HeuristicLab.Tracing;
 
 namespace HeuristicLab.Hive.Server.LINQDataAccess {
@@ -253 +254 @@
 
     public void Close() {
+      Logger.Info("Closing Stream");
       if (_transaction != null) {
         _transaction.Commit();
         _transaction = null;
+        Logger.Info("Transaction commited and closed");
       }
 
@@ -262 +265 @@
         ContextFactory.Context.Dispose();
         ContextFactory.Context = null;
+        Logger.Info("Connection and Context disposed and set null");
       }
     }

trunk/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=SEMTEX-PC;Initial Catalog=HeuristicLab.Hive.Linq;Integrated Security=True"
+            connectionString="Data Source=127.0.0.1;Initial Catalog=HeuristicLab.Hive.Linq;Integrated Security=True"
             providerName="System.Data.SqlClient" />
     </connectionStrings>

trunk/sources/HeuristicLab.Hive.Server/3.2/HeuristicLab.Hive.Server-3.2.csproj

@@ -168 +168 @@
       <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>
   <ItemGroup>

trunk/sources/HeuristicLab.Hive.Server/3.2/HiveServerPlugin.cs

@@ -35 +35 @@
   [PluginDependency("HeuristicLab.Hive.Server.LINQDataAccess-3.2")]
   [PluginDependency("HeuristicLab.SpringNET", "1.3.0.0")]
+  [PluginDependency("HeuristicLab.Tracing", "3.2.0")]
   public class HiveServerPlugin : PluginBase {
   }

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

@@ -7 +7 @@
 using HeuristicLab.Hive.Server.LINQDataAccess;
 using System.Transactions;
+using HeuristicLab.Hive.Contracts;
+using HeuristicLab.Tracing;
 
 namespace HeuristicLab.Hive.Server {
   internal class ServiceCallInterception : IMethodInterceptor {
 
-    private bool useTransactions = false;
+    private const bool UseTransactions = true;
 
     public object Invoke(IMethodInvocation invocation) {
-      Console.WriteLine(DateTime.Now + " - " + Thread.CurrentThread.ManagedThreadId + " - Entering Method " +
-                        invocation.Method.Name);
+      Logger.Info("Entering Method: " + invocation.Method.Name);
 
       if(ContextFactory.Context != null) {
-        Console.WriteLine("Error - Not null context found - why wasn't this disposed?");
+        Logger.Info("Not null context found - why wasn't this disposed?");
+        try {
+          Logger.Info("Trying to dispose");
+          ContextFactory.Context.Dispose();
+        } catch (Exception e) {
+          Logger.Error(e);
+        }
         ContextFactory.Context = null;
       }
@@ -26 +33 @@
       if (invocation.Method.Name.Equals("SendStreamedJob") || invocation.Method.Name.Equals("StoreFinishedJobResultStreamed")) {        
         ContextFactory.Context.Connection.Open();
-        if(useTransactions)
-          ContextFactory.Context.Transaction = ContextFactory.Context.Connection.BeginTransaction();
+        if(UseTransactions) {
+          Logger.Debug("Opening Transaction");
+          ContextFactory.Context.Transaction = ContextFactory.Context.Connection.BeginTransaction(ApplicationConstants.ISOLATION_LEVEL);
+        } else {
+          Logger.Debug("Not using a Transaction");
+        }
         try {
           obj = invocation.Proceed();
-          Console.WriteLine("leaving context open for Streaming");
+          Logger.Info("leaving context open for streaming");
         }
-        catch (Exception e) {          
-          Console.WriteLine(e);
+        catch (Exception e) {
+          Logger.Error("Exception occured during method invocation", e);              
           ContextFactory.Context.Dispose();
           ContextFactory.Context = null;
         }        
       } else {
-        if(useTransactions) {
-          using (TransactionScope scope = new TransactionScope()) {
+        if(UseTransactions) {
+          using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required, new TransactionOptions { IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE })) {
             try {
+              Logger.Debug("Current Transaction Isolation level is: " + Transaction.Current.IsolationLevel);
               obj = invocation.Proceed();
               scope.Complete();
             }
             catch (Exception e) {
-              Console.WriteLine("Exception Occured");
-              Console.WriteLine(e);
+              Logger.Error("Exception occured during method invocation", e);              
             }
             finally {
               ContextFactory.Context.Dispose();
-              Console.WriteLine("setting old context null");
+              Logger.Debug("Disposed Context");
               ContextFactory.Context = null;
-              Console.WriteLine("Disposing old Context");
+              Logger.Debug("Set Context Null");
             }
           }
@@ -60 +71 @@
           }
           catch (Exception e) {
-            Console.WriteLine("Exception Occured");
-            Console.WriteLine(e);
+            Logger.Error("Exception occured during method invocation", e);                          
           }
           finally {
             ContextFactory.Context.Dispose();
-            Console.WriteLine("setting old context null");
+            Logger.Debug("Disposed Context");
             ContextFactory.Context = null;
-            Console.WriteLine("Disposing old Context");
+            Logger.Debug("Set Context Null");
           }  
         }
       }
-      Console.WriteLine(DateTime.Now + " - " + Thread.CurrentThread.ManagedThreadId + " - Leaving Method " +
-                          invocation.Method.Name);
+      Logger.Info("Leaving Method: " + invocation.Method.Name);
 
       return obj;

trunk/sources/HeuristicLab.PluginInfrastructure/Sandboxing/SandboxManager.cs

@@ -94 +94 @@
       applicationManager.PrepareApplicationDomain(apps, plugins);
       //if (files != null && files.Count() > 0)
-      //applicationManager.LoadAssemblies(files);
+        //applicationManager.LoadAssemblies(files);
       return applicationDomain;
     }

trunk/sources/HeuristicLab.Security.Core/3.2/Properties/Settings.Designer.cs

@@ -26 +26 @@
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=127.0.0.1;Initial Catalog=HeuristicLab.Security;Persist Security Info" +
-            "=True;User ID=hive;Password=hive;Pooling=true;MultipleActiveResultSets=true")]
+        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=127.0.0.1;Initial Catalog=HeuristicLab.Security;Integrated Security=T" +
+            "rue;Pooling=true;MultipleActiveResultSets=true")]
         public string SecurityServerConnectionString {
             get {

trunk/sources/HeuristicLab.Security.Core/3.2/Properties/Settings.settings

@@ -4 +4 @@
   <Settings>
     <Setting Name="SecurityServerConnectionString" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">Data Source=127.0.0.1;Initial Catalog=HeuristicLab.Security;Persist Security Info=True;User ID=hive;Password=hive;Pooling=true;MultipleActiveResultSets=true</Value>
+      <Value Profile="(Default)">Data Source=127.0.0.1;Initial Catalog=HeuristicLab.Security;Integrated Security=True;Pooling=true;MultipleActiveResultSets=true</Value>
     </Setting>
   </Settings>

trunk/sources/HeuristicLab.Security.Core/3.2/app.config

@@ -10 +10 @@
         <HeuristicLab.Security.Core.Properties.Settings>
             <setting name="SecurityServerConnectionString" serializeAs="String">
-                <value>Data Source=127.0.0.1;Initial Catalog=HeuristicLab.Security;Persist Security Info=True;User ID=hive;Password=hive;Pooling=true;MultipleActiveResultSets=true</value>
+                <value>Data Source=127.0.0.1;Initial Catalog=HeuristicLab.Security;Integrated Security=True;Pooling=true;MultipleActiveResultSets=true</value>
             </setting>
         </HeuristicLab.Security.Core.Properties.Settings>

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

@@ -9 +9 @@
     <staticLogFileName value="true" />
     <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-    <layout type="log4net.Layout.PatternLayout">
-      <conversionPattern value="%-4timestamp %-5level% =>   %message%newline%exception" />
+    <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" />
+    </layout>
+  </appender>
+
+  <appender name="ServerRollingFileAppender" type="log4net.Appender.RollingFileAppender">
+    <file value="Hive.Server.log" />
+    <appendToFile value="true" />
+    <rollingStyle value="Size" />
+    <maxSizeRollBackups value="10" />
+    <maximumFileSize value="1000KB" />
+    <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" />
+    </layout>
+  </appender>
+
+  <appender name="ClientRollingFileAppender" type="log4net.Appender.RollingFileAppender">
+    <file value="Hive.Client.log" />
+    <appendToFile value="true" />
+    <rollingStyle value="Size" />
+    <maxSizeRollBackups value="10" />
+    <maximumFileSize value="1000KB" />
+    <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" />
     </layout>
   </appender>
@@ -18 +44 @@
     <lossy value="true" />
     <evaluator type="log4net.Core.LevelEvaluator">
-        <threshold value="INFO"/>
+        <threshold value="DEBUG"/>
     </evaluator>
     <appender-ref ref="RollingFileAppender" />
@@ -27 +53 @@
     <appender-ref ref="BufferingForwardingAppender" />
   </root>
+
+  <logger name="HeuristicLab.Hive.Server">
+    <level value="DEBUG" />
+    <appender-ref ref="ServerRollingFileAppender" />    
+  </logger>
+
+  <logger name="HeuristicLab.Hive.Client">
+    <level value="DEBUG" />
+    <appender-ref ref="ClientRollingFileAppender" />  
+  </logger>
   
 </log4net>