Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Calendar/3.3/Properties/AssemblyInfo.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Calendar/3.3/Properties/AssemblyInfo.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Calendar/3.3/Properties/AssemblyInfo.cs	(revision 4710)
@@ -58,3 +58,3 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.0.4598")]
+[assembly: AssemblyFileVersion("3.3.0.4629")]
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive 3.3.sln
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive 3.3.sln	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive 3.3.sln	(revision 4710)
@@ -82,9 +82,10 @@
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Slave.ExecutionEngine-3.3", "HeuristicLab.Hive.Slave.ExecutionEngine\3.3\HeuristicLab.Hive.Slave.ExecutionEngine-3.3.csproj", "{1605256A-1CB3-44AB-AAFF-577093EE5789}"
 EndProject
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "HiveWeb", "..\..\..\..\..\Web\HiveWeb\", "{F8E2A0BB-5B04-49EE-88CE-F0DF12474221}"
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "HiveWeb", "HiveWeb\", "{590AD383-846B-48FF-8D06-B0AA1B328102}"
 	ProjectSection(WebsiteProperties) = preProject
 		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
+		ProjectReferences = "{134F93D7-E7C8-4ECD-9923-7F63259A60D8}|HeuristicLab.Hive.Contracts-3.3.dll;{9076697B-C151-46CD-95BC-1D059492B478}|HeuristicLab.DataAccess-3.3.dll;{21187322-52DD-4243-80A4-A85F0263E63B}|HeuristicLab.Hive.JobBase-3.3.dll;{898B31CF-81DC-453B-AEB3-BDF83197A7EE}|HeuristicLab.Hive.Server.Core-3.3.dll;{4D5A2A16-66C2-431D-9AA3-BD3041E64B84}|HeuristicLab.Hive.Server.DataAccess-3.3.dll;{A4499DDD-D1B8-414F-98F6-903C2C71BEB0}|HeuristicLab.Hive.Server.LINQDataAccess-3.3.dll;{CDAD2510-299C-4FA2-B351-9D71A5AF20B7}|HeuristicLab.Hive.Tracing-3.3.dll;"
 		Debug.AspNetCompiler.VirtualPath = "/HiveWeb"
-		Debug.AspNetCompiler.PhysicalPath = "..\..\..\..\..\Web\HiveWeb\"
+		Debug.AspNetCompiler.PhysicalPath = "HiveWeb\"
 		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\HiveWeb\"
 		Debug.AspNetCompiler.Updateable = "true"
@@ -93,5 +94,5 @@
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.VirtualPath = "/HiveWeb"
-		Release.AspNetCompiler.PhysicalPath = "..\..\..\..\..\Web\HiveWeb\"
+		Release.AspNetCompiler.PhysicalPath = "HiveWeb\"
 		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\HiveWeb\"
 		Release.AspNetCompiler.Updateable = "true"
@@ -99,5 +100,5 @@
 		Release.AspNetCompiler.FixedNames = "false"
 		Release.AspNetCompiler.Debug = "False"
-		VWDPort = "2681"
+		VWDPort = "3220"
 	EndProjectSection
 EndProject
@@ -392,16 +393,16 @@
 		{1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x86.ActiveCfg = Release|x86
 		{1605256A-1CB3-44AB-AAFF-577093EE5789}.Release|x86.Build.0 = Release|x86
-		{F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Release|x64.ActiveCfg = Debug|Any CPU
-		{F8E2A0BB-5B04-49EE-88CE-F0DF12474221}.Release|x86.ActiveCfg = Debug|Any CPU
+		{590AD383-846B-48FF-8D06-B0AA1B328102}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{590AD383-846B-48FF-8D06-B0AA1B328102}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{590AD383-846B-48FF-8D06-B0AA1B328102}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{590AD383-846B-48FF-8D06-B0AA1B328102}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{590AD383-846B-48FF-8D06-B0AA1B328102}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{590AD383-846B-48FF-8D06-B0AA1B328102}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{590AD383-846B-48FF-8D06-B0AA1B328102}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{590AD383-846B-48FF-8D06-B0AA1B328102}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{590AD383-846B-48FF-8D06-B0AA1B328102}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{590AD383-846B-48FF-8D06-B0AA1B328102}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
+		{590AD383-846B-48FF-8D06-B0AA1B328102}.Release|x64.ActiveCfg = Debug|Any CPU
+		{590AD383-846B-48FF-8D06-B0AA1B328102}.Release|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/HeuristicLab.Hive.Contracts-3.3.csproj
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/HeuristicLab.Hive.Contracts-3.3.csproj	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/HeuristicLab.Hive.Contracts-3.3.csproj	(revision 4710)
@@ -19,4 +19,5 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -90,7 +91,4 @@
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
-    </Reference>
-    <Reference Include="HeuristicLab.Tracing-3.3">
-      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
     </Reference>
     <Reference Include="System" />
@@ -180,4 +178,8 @@
       <Name>HeuristicLab.Hive.JobBase-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Hive.Tracing\3.3\HeuristicLab.Hive.Tracing-3.3.csproj">
+      <Project>{CDAD2510-299C-4FA2-B351-9D71A5AF20B7}</Project>
+      <Name>HeuristicLab.Hive.Tracing-3.3</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/HeuristicLabHiveContractsPlugin.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/HeuristicLabHiveContractsPlugin.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/HeuristicLabHiveContractsPlugin.cs	(revision 4710)
@@ -28,6 +28,6 @@
   [PluginDependency("HeuristicLab.Core", "3.3")]
   [PluginDependency("HeuristicLab.DataAccess", "3.3")]
+  [PluginDependency("HeuristicLab.Hive.Tracing", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
-  [PluginDependency("HeuristicLab.Tracing", "3.3")]
   public class HeuristicLabHiveContractsPlugin : PluginBase {
   }
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/WcfServicePool.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/WcfServicePool.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/WcfServicePool.cs	(revision 4710)
@@ -23,5 +23,5 @@
 using System.ServiceModel;
 using HeuristicLab.Common;
-using HeuristicLab.Tracing;
+using HeuristicLab.Hive.Tracing;
 
 namespace HeuristicLab.Hive.Contracts {
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/WcfSettings.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/WcfSettings.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/WcfSettings.cs	(revision 4710)
@@ -26,5 +26,5 @@
 using System.ServiceModel.Channels;
 using System.ServiceModel.Description;
-using HeuristicLab.Tracing;
+using HeuristicLab.Hive.Tracing;
 
 namespace HeuristicLab.Hive.Contracts {
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/HiveExperimentView.Designer.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/HiveExperimentView.Designer.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/HiveExperimentView.Designer.cs	(revision 4710)
@@ -405,6 +405,6 @@
     private System.Windows.Forms.Button disconnectButton;
     private System.Windows.Forms.Button reconnectButton;
-    protected System.Windows.Forms.Button openExperimentButton;
-    protected System.Windows.Forms.Button newExperimentButton;
+    private System.Windows.Forms.Button openExperimentButton;
+    private System.Windows.Forms.Button newExperimentButton;
     private System.Windows.Forms.TabPage jobsTabPage;
     private System.Windows.Forms.Button downloadExperimentButton;
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/Properties/Resources.Designer.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/Properties/Resources.Designer.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/Properties/Resources.Designer.cs	(revision 4710)
@@ -10,7 +10,8 @@
 
 namespace HeuristicLab.Hive.Experiment.Views.Properties {
-
-
-  /// <summary>
+    using System;
+    
+    
+    /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HeuristicLab.Hive.Experiment-3.3.csproj
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HeuristicLab.Hive.Experiment-3.3.csproj	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HeuristicLab.Hive.Experiment-3.3.csproj	(revision 4710)
@@ -104,7 +104,4 @@
       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     </Reference>
-    <Reference Include="HeuristicLab.Tracing-3.3">
-      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -168,4 +165,8 @@
       <Name>HeuristicLab.Hive.JobBase-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Hive.Tracing\3.3\HeuristicLab.Hive.Tracing-3.3.csproj">
+      <Project>{CDAD2510-299C-4FA2-B351-9D71A5AF20B7}</Project>
+      <Name>HeuristicLab.Hive.Tracing-3.3</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HeuristicLabHiveExperimentPlugin.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HeuristicLabHiveExperimentPlugin.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HeuristicLabHiveExperimentPlugin.cs	(revision 4710)
@@ -36,7 +36,7 @@
   [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")]
   [PluginDependency("HeuristicLab.Hive.JobBase", "3.3")]
+  [PluginDependency("HeuristicLab.Hive.Tracing", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
-  [PluginDependency("HeuristicLab.Tracing", "3.3")]
   public class HeuristicLabHiveExperimentPlugin : PluginBase {
 
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs	(revision 4710)
@@ -31,5 +31,5 @@
 using HeuristicLab.Hive.Contracts.ResponseObjects;
 using HeuristicLab.Hive.Experiment.Jobs;
-using HeuristicLab.Tracing;
+using HeuristicLab.Hive.Tracing;
 
 namespace HeuristicLab.Hive.Experiment {
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/app.config
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/app.config	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/app.config	(revision 4710)
@@ -2,6 +2,6 @@
 <configuration>
   <configSections>
-    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-      <section name="HeuristicLab.Hive.Experiment.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="HeuristicLab.Hive.Experiment.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
     </sectionGroup>
   </configSections>
@@ -29,36 +29,20 @@
     <bindings>
       <netTcpBinding>
-        <binding name="ClientTcpStreamedEndpoint" closeTimeout="00:01:00"
-            openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
-            transactionFlow="false" transferMode="Streamed" transactionProtocol="OleTransactions"
-            hostNameComparisonMode="StrongWildcard" listenBacklog="10"
-            maxBufferPoolSize="524288" maxBufferSize="65536" maxConnections="10"
-            maxReceivedMessageSize="104857600">
-          <readerQuotas maxDepth="32" maxStringContentLength="104857600" maxArrayLength="104857600"
-              maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-          <reliableSession ordered="true" inactivityTimeout="00:10:00"
-              enabled="false" />
+        <binding name="ClientTcpStreamedEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" transactionFlow="false" transferMode="Streamed" transactionProtocol="OleTransactions" hostNameComparisonMode="StrongWildcard" listenBacklog="10" maxBufferPoolSize="524288" maxBufferSize="65536" maxConnections="10" maxReceivedMessageSize="104857600">
+          <readerQuotas maxDepth="32" maxStringContentLength="104857600" maxArrayLength="104857600" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
+          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
           <security mode="TransportWithMessageCredential">
-            <transport clientCredentialType="Windows" protectionLevel="EncryptAndSign" />
-            <message clientCredentialType="UserName" algorithmSuite="Default" />
+            <transport clientCredentialType="Windows" protectionLevel="EncryptAndSign"/>
+            <message clientCredentialType="UserName" algorithmSuite="Default"/>
           </security>
         </binding>
       </netTcpBinding>
       <wsHttpBinding>
-        <binding name="ClientHttpEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00"
-            receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false"
-            transactionFlow="false" hostNameComparisonMode="StrongWildcard"
-            maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
-            messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true"
-            allowCookies="false">
-          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-              maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-          <reliableSession ordered="true" inactivityTimeout="00:10:00"
-              enabled="false" />
+        <binding name="ClientHttpEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
+          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
+          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
           <security mode="Message">
-            <transport clientCredentialType="Windows" proxyCredentialType="None"
-                realm="" />
-            <message clientCredentialType="UserName" negotiateServiceCredential="true"
-                algorithmSuite="Default" />
+            <transport clientCredentialType="Windows" proxyCredentialType="None" realm=""/>
+            <message clientCredentialType="UserName" negotiateServiceCredential="true" algorithmSuite="Default"/>
           </security>
         </binding>
@@ -66,16 +50,12 @@
     </bindings>
     <client>
-      <endpoint address="net.tcp://blade12.hpc.fh-hagenberg.at:9001/ClientServiceStreamed" behaviorConfiguration="ClientServiceBehaviour"
-          binding="netTcpBinding" bindingConfiguration="ClientTcpStreamedEndpoint"
-          contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" name="ClientTcpStreamedEndpoint">
+      <endpoint address="net.tcp://localhost:9001/Hive/ClientService.svc" behaviorConfiguration="ClientServiceBehaviour" binding="netTcpBinding" bindingConfiguration="ClientTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" name="ClientTcpStreamedEndpoint">
         <identity>
-          <dns value="blade12.hpc.fh-hagenberg.at" />
+          <dns value="localhost"/>
         </identity>
       </endpoint>
-      <endpoint address="http://blade12.hpc.fh-hagenberg.at:9000/ClientService" binding="wsHttpBinding" behaviorConfiguration="ClientServiceBehaviour"
-          bindingConfiguration="ClientHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade"
-          name="ClientHttpEndpoint">
+      <endpoint address="http://localhost:9000/Hive/ClientService.svc" binding="wsHttpBinding" behaviorConfiguration="ClientServiceBehaviour" bindingConfiguration="ClientHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" name="ClientHttpEndpoint">
         <identity>
-          <certificate encodedValue="AwAAAAEAAAAUAAAA0FkTGjOA2/0cZmFlIwFildV5a/ogAAAAAQAAACgCAAAwggIkMIIBkaADAgECAhCcCYkXdzUDsEzY5+POfdYRMAkGBSsOAwIdBQAwJjEkMCIGA1UEAxMbYmxhZGUxMi5ocGMuZmgtaGFnZW5iZXJnLmF0MB4XDTEwMDkxNTE0MjkyNFoXDTM5MTIzMTIzNTk1OVowJjEkMCIGA1UEAxMbYmxhZGUxMi5ocGMuZmgtaGFnZW5iZXJnLmF0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDN/VsuexELvneBS+KjIT4z1oj8VwitpZJDhCVxVM1hBVAXRJ9qE0zwFwen6KWRXKMx0wZvm47CdkENO0krsqfliQRKb0hcMin+37X8u1Xk51qebV3M0kUAEpsRT6RehQD41+iGe1GmIaLksCEYaH80wPWI7F3N/tN+5svizD0sfQIDAQABo1swWTBXBgNVHQEEUDBOgBBJWfbAcVJ+egMO9eh/uP3hoSgwJjEkMCIGA1UEAxMbYmxhZGUxMi5ocGMuZmgtaGFnZW5iZXJnLmF0ghCcCYkXdzUDsEzY5+POfdYRMAkGBSsOAwIdBQADgYEApOwttaruQRFtS8SWslEDt+aKzIUnfKrJ+7U7Fml5+QT7G4+5bXnfOs5gcWKDQyyap9y3AJpjPnGaLzwb/8LwlqKXePRQvOW44O5JLwOTo3TD4ZPKANuBblD7J7TYGyXKTUQcytfQl1uOxELWNBj4IpUEbR1C/S4RmupMivLNQoA=" />
+          <certificate encodedValue="AwAAAAEAAAAUAAAAfEKvcVixnJay+q4hCPFuO0JL5TQgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMTAxOTEwNTMxNVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXwC5TGcAffd/0oAWHtm0s6YXVXEgXgb1AYmBkkkhkKIFJG/e/Z0KSYbJepmSJD44W3oOAVm+x1DAsZxU79HahDYgWCuHLMm1TLpwSmYOQ0kV3pGHWHhiWV7h7oGLds/eqZ2EOpaNGryfEPnrA4VmxY91vV5/2BTeVSWG6F8lRKQIDAQABo0kwRzBFBgNVHQEEPjA8gBAR7kBnMRHO5gzThEqda0wWoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQADgYEAoPwEG4QTDXhlxERNDfsZmM2IhEpV42ppz1kEah2oYKDa/ElIMVtvqLv6flVtg18ENN/mEJWiHZ3NyP3qr2Pip+sh+/2WBiSbOaukES/CM7OJn9kJCImH7M/xqM8pxqY8IfgM6iBVrVj9uHqj3j2BBck+cYY8fKyh3CFifMIp6ac="/>
         </identity>
       </endpoint>
@@ -87,5 +67,5 @@
           <clientCredentials>
             <serviceCertificate>
-              <authentication certificateValidationMode="None" />
+              <authentication certificateValidationMode="None"/>
             </serviceCertificate>
           </clientCredentials>
@@ -95,3 +75,3 @@
 
   </system.serviceModel>
-</configuration>
+<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.JobBase/3.3/HeuristicLab.Hive.JobBase-3.3.csproj
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.JobBase/3.3/HeuristicLab.Hive.JobBase-3.3.csproj	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.JobBase/3.3/HeuristicLab.Hive.JobBase-3.3.csproj	(revision 4710)
@@ -34,4 +34,5 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HeuristicLab.Hive.Server.Console-3.3.csproj
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HeuristicLab.Hive.Server.Console-3.3.csproj	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HeuristicLab.Hive.Server.Console-3.3.csproj	(revision 4710)
@@ -21,4 +21,5 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -89,7 +90,4 @@
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
-    </Reference>
-    <Reference Include="HeuristicLab.Tracing-3.3">
-      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
     </Reference>
     <Reference Include="System" />
@@ -263,4 +261,8 @@
       <Name>HeuristicLab.Hive.JobBase-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Hive.Tracing\3.3\HeuristicLab.Hive.Tracing-3.3.csproj">
+      <Project>{CDAD2510-299C-4FA2-B351-9D71A5AF20B7}</Project>
+      <Name>HeuristicLab.Hive.Tracing-3.3</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HeuristicLabHiveClientConsolePlugin.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HeuristicLabHiveClientConsolePlugin.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HeuristicLabHiveClientConsolePlugin.cs	(revision 4710)
@@ -31,6 +31,6 @@
   [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")]
   [PluginDependency("HeuristicLab.Hive.JobBase", "3.3")]
+  [PluginDependency("HeuristicLab.Hive.Tracing", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
-  [PluginDependency("HeuristicLab.Tracing", "3.3")]
   public class HeuristicLabHiveSlaveConsolePlugin : PluginBase {
   }
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/Properties/Resources.Designer.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/Properties/Resources.Designer.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/Properties/Resources.Designer.cs	(revision 4710)
@@ -10,7 +10,8 @@
 
 namespace HeuristicLab.Hive.Server.ServerConsole.Properties {
-
-
-  /// <summary>
+    using System;
+    
+    
+    /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/app.config
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/app.config	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/app.config	(revision 4710)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
@@ -7,5 +7,5 @@
           <clientCredentials>
             <serviceCertificate>
-              <authentication certificateValidationMode="None" />
+              <authentication certificateValidationMode="None"/>
             </serviceCertificate>
           </clientCredentials>
@@ -15,19 +15,10 @@
     <bindings>
       <wsHttpBinding>
-        <binding name="ServerConsoleHttpEndpoint" closeTimeout="00:01:00"
-            openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
-            bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard"
-            maxBufferPoolSize="524288" maxReceivedMessageSize="104857600"
-            messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true"
-            allowCookies="false">
-          <readerQuotas maxDepth="32" maxStringContentLength="104857600" maxArrayLength="104857600"
-              maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-          <reliableSession ordered="true" inactivityTimeout="00:10:00"
-              enabled="false" />
+        <binding name="ServerConsoleHttpEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxReceivedMessageSize="104857600" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
+          <readerQuotas maxDepth="32" maxStringContentLength="104857600" maxArrayLength="104857600" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
+          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
           <security mode="Message">
-            <transport clientCredentialType="Windows" proxyCredentialType="None"
-                realm="" />
-            <message clientCredentialType="UserName" negotiateServiceCredential="true"
-                algorithmSuite="Default" />
+            <transport clientCredentialType="Windows" proxyCredentialType="None" realm=""/>
+            <message clientCredentialType="UserName" negotiateServiceCredential="true" algorithmSuite="Default"/>
           </security>
         </binding>
@@ -35,12 +26,10 @@
     </bindings>
     <client>
-      <endpoint address="http://blade12.hpc.fh-hagenberg.at:9000/ServerConsoleService" behaviorConfiguration="ServerConsoleBehaviour"
-          binding="wsHttpBinding" bindingConfiguration="ServerConsoleHttpEndpoint"
-          contract="HeuristicLab.Hive.Contracts.Interfaces.IServerConsoleFacade" name="ServerConsoleHttpEndpoint">
+      <endpoint address="http://localhost:9000/Hive/ServerConsoleService.svc" behaviorConfiguration="ServerConsoleBehaviour" binding="wsHttpBinding" bindingConfiguration="ServerConsoleHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IServerConsoleFacade" name="ServerConsoleHttpEndpoint">
         <identity>
-          <certificate encodedValue="AwAAAAEAAAAUAAAA0FkTGjOA2/0cZmFlIwFildV5a/ogAAAAAQAAACgCAAAwggIkMIIBkaADAgECAhCcCYkXdzUDsEzY5+POfdYRMAkGBSsOAwIdBQAwJjEkMCIGA1UEAxMbYmxhZGUxMi5ocGMuZmgtaGFnZW5iZXJnLmF0MB4XDTEwMDkxNTE0MjkyNFoXDTM5MTIzMTIzNTk1OVowJjEkMCIGA1UEAxMbYmxhZGUxMi5ocGMuZmgtaGFnZW5iZXJnLmF0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDN/VsuexELvneBS+KjIT4z1oj8VwitpZJDhCVxVM1hBVAXRJ9qE0zwFwen6KWRXKMx0wZvm47CdkENO0krsqfliQRKb0hcMin+37X8u1Xk51qebV3M0kUAEpsRT6RehQD41+iGe1GmIaLksCEYaH80wPWI7F3N/tN+5svizD0sfQIDAQABo1swWTBXBgNVHQEEUDBOgBBJWfbAcVJ+egMO9eh/uP3hoSgwJjEkMCIGA1UEAxMbYmxhZGUxMi5ocGMuZmgtaGFnZW5iZXJnLmF0ghCcCYkXdzUDsEzY5+POfdYRMAkGBSsOAwIdBQADgYEApOwttaruQRFtS8SWslEDt+aKzIUnfKrJ+7U7Fml5+QT7G4+5bXnfOs5gcWKDQyyap9y3AJpjPnGaLzwb/8LwlqKXePRQvOW44O5JLwOTo3TD4ZPKANuBblD7J7TYGyXKTUQcytfQl1uOxELWNBj4IpUEbR1C/S4RmupMivLNQoA=" />
+          <certificate encodedValue="AwAAAAEAAAAUAAAAfEKvcVixnJay+q4hCPFuO0JL5TQgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMTAxOTEwNTMxNVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXwC5TGcAffd/0oAWHtm0s6YXVXEgXgb1AYmBkkkhkKIFJG/e/Z0KSYbJepmSJD44W3oOAVm+x1DAsZxU79HahDYgWCuHLMm1TLpwSmYOQ0kV3pGHWHhiWV7h7oGLds/eqZ2EOpaNGryfEPnrA4VmxY91vV5/2BTeVSWG6F8lRKQIDAQABo0kwRzBFBgNVHQEEPjA8gBAR7kBnMRHO5gzThEqda0wWoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQADgYEAoPwEG4QTDXhlxERNDfsZmM2IhEpV42ppz1kEah2oYKDa/ElIMVtvqLv6flVtg18ENN/mEJWiHZ3NyP3qr2Pip+sh+/2WBiSbOaukES/CM7OJn9kJCImH7M/xqM8pxqY8IfgM6iBVrVj9uHqj3j2BBck+cYY8fKyh3CFifMIp6ac="/>
         </identity>
       </endpoint>
     </client>
   </system.serviceModel>
-</configuration>
+<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/HeuristicLab.Hive.Server.Core-3.3.csproj
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/HeuristicLab.Hive.Server.Core-3.3.csproj	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/HeuristicLab.Hive.Server.Core-3.3.csproj	(revision 4710)
@@ -20,4 +20,5 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -89,7 +90,4 @@
       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     </Reference>
-    <Reference Include="HeuristicLab.Tracing-3.3">
-      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -106,4 +104,5 @@
     <Reference Include="System.Transactions" />
     <Reference Include="System.Web" />
+    <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq">
@@ -164,4 +163,8 @@
       <Project>{A4499DDD-D1B8-414F-98F6-903C2C71BEB0}</Project>
       <Name>HeuristicLab.Hive.Server.LINQDataAccess-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Hive.Tracing\3.3\HeuristicLab.Hive.Tracing-3.3.csproj">
+      <Project>{CDAD2510-299C-4FA2-B351-9D71A5AF20B7}</Project>
+      <Name>HeuristicLab.Hive.Tracing-3.3</Name>
     </ProjectReference>
   </ItemGroup>
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/HeuristicLabHiveServerCorePlugin.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/HeuristicLabHiveServerCorePlugin.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/HeuristicLabHiveServerCorePlugin.cs	(revision 4710)
@@ -31,5 +31,5 @@
   [PluginDependency("HeuristicLab.Hive.Server.DataAccess", "3.3")]
   [PluginDependency("HeuristicLab.Hive.Server.LINQDataAccess", "3.3")]
-  [PluginDependency("HeuristicLab.Tracing", "3.3")]
+  [PluginDependency("HeuristicLab.Hive.Tracing", "3.3")]
   public class HeuristicLabHiveServerCorePlugin : PluginBase {
   }
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/JobManager.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/JobManager.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/JobManager.cs	(revision 4710)
@@ -32,5 +32,5 @@
 using HeuristicLab.Hive.Server.Core.InternalInterfaces;
 using HeuristicLab.Hive.Server.DataAccess;
-using HeuristicLab.Tracing;
+using HeuristicLab.Hive.Tracing;
 
 namespace HeuristicLab.Hive.Server.Core {
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/LifecycleManager.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/LifecycleManager.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/LifecycleManager.cs	(revision 4710)
@@ -23,5 +23,5 @@
 using System.Threading;
 using HeuristicLab.Hive.Contracts.Interfaces;
-using HeuristicLab.Tracing;
+using HeuristicLab.Hive.Tracing;
 
 namespace HeuristicLab.Hive.Server.Core {
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/ServiceLocator.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/ServiceLocator.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/ServiceLocator.cs	(revision 4710)
@@ -89,5 +89,6 @@
     public static ILifecycleManager GetLifecycleManager() {
       if (lifecycleManager == null) {
-        lifecycleManager = ApplicationManager.Manager.GetInstances<ILifecycleManager>().First();
+        //lifecycleManager = ApplicationManager.Manager.GetInstances<ILifecycleManager>().First();
+        lifecycleManager = new LifecycleManager();
       }
       return lifecycleManager;
@@ -101,5 +102,6 @@
     public static IScheduler GetScheduler() {
       if (scheduler == null) {
-        scheduler = ApplicationManager.Manager.GetInstances<IScheduler>().First();
+        //scheduler = ApplicationManager.Manager.GetInstances<IScheduler>().First();
+        scheduler = new DefaultScheduler();
       }
 
@@ -113,6 +115,8 @@
     [MethodImpl(MethodImplOptions.Synchronized)]
     public static IAuthorizationManager GetAuthorizationManager() {
-      if (authorizationManager == null)
-        authorizationManager = ApplicationManager.Manager.GetInstances<IAuthorizationManager>().First();
+      if (authorizationManager == null) {
+        //authorizationManager = ApplicationManager.Manager.GetInstances<IAuthorizationManager>().First();
+        authorizationManager = new Authorization.AuthorizationManager();
+      }
       return authorizationManager;
     }
@@ -124,6 +128,8 @@
     [MethodImpl(MethodImplOptions.Synchronized)]
     public static IContextFactory GetContextFactory() {
-      if (contextFactory == null)
-        contextFactory = ApplicationManager.Manager.GetInstances<IContextFactory>().First();
+      if (contextFactory == null) {
+        //contextFactory = ApplicationManager.Manager.GetInstances<IContextFactory>().First();
+        contextFactory = new HeuristicLab.Hive.Server.LINQDataAccess.ContextFactory();
+      }
       return contextFactory;
     }
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/SlaveCommunicator.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/SlaveCommunicator.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/SlaveCommunicator.cs	(revision 4710)
@@ -33,5 +33,6 @@
 using HeuristicLab.Hive.Server.Core.InternalInterfaces;
 using HeuristicLab.PluginInfrastructure;
-using HeuristicLab.Tracing;
+using System.Diagnostics;
+using HeuristicLab.Hive.Tracing;
 
 namespace HeuristicLab.Hive.Server.Core {
@@ -90,5 +91,4 @@
         Logger.Debug("Server Heartbeat ticked");
         List<Guid> slaveIds = DaoLocator.SlaveDao.FindAll().Select(s => s.Id).ToList();
-
         foreach (Guid slaveId in slaveIds) {
           using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required, new TransactionOptions { IsolationLevel = ApplicationConstants.ISOLATION_LEVEL_SCOPE })) {
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/app.config
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/app.config	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/app.config	(revision 4710)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0"?>
 <configuration>
   <system.diagnostics>
@@ -6,19 +6,18 @@
         <listeners>
           <add type="System.Diagnostics.DefaultTraceListener" name="Default">
-            <filter type="" />
+            <filter type=""/>
           </add>
           <add name="ServiceModelMessageLoggingListener">
-            <filter type="" />
+            <filter type=""/>
           </add>
         </listeners>
       </source>
-      <source name="System.ServiceModel" switchValue="Warning, ActivityTracing"
-        propagateActivity="true">
+      <source name="System.ServiceModel" switchValue="Warning, ActivityTracing" propagateActivity="true">
         <listeners>
           <add type="System.Diagnostics.DefaultTraceListener" name="Default">
-            <filter type="" />
+            <filter type=""/>
           </add>
           <add name="ServiceModelTraceListener">
-            <filter type="" />
+            <filter type=""/>
           </add>
         </listeners>
@@ -26,19 +25,14 @@
     </sources>
     <sharedListeners>
-      <add initializeData="c:\ch\svn\branches\3.3-hive\sources\heuristiclab.hive\heuristiclab.hive.server.core\3.3\app_messages.svclog"
-        type="System.Diagnostics.XmlWriterTraceListener, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
-        name="ServiceModelMessageLoggingListener" traceOutputOptions="Timestamp">
-        <filter type="" />
+      <add initializeData="c:\ch\svn\branches\3.3-hive\sources\heuristiclab.hive\heuristiclab.hive.server.core\3.3\app_messages.svclog" type="System.Diagnostics.XmlWriterTraceListener, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="ServiceModelMessageLoggingListener" traceOutputOptions="Timestamp">
+        <filter type=""/>
       </add>
-      <add initializeData="c:\ch\svn\branches\3.3-hive\sources\heuristiclab.hive\heuristiclab.hive.server.core\3.3\app_tracelog.svclog"
-        type="System.Diagnostics.XmlWriterTraceListener, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
-        name="ServiceModelTraceListener" traceOutputOptions="Timestamp">
-        <filter type="" />
+      <add initializeData="c:\ch\svn\branches\3.3-hive\sources\heuristiclab.hive\heuristiclab.hive.server.core\3.3\app_tracelog.svclog" type="System.Diagnostics.XmlWriterTraceListener, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="ServiceModelTraceListener" traceOutputOptions="Timestamp">
+        <filter type=""/>
       </add>
     </sharedListeners>
   </system.diagnostics>
   <connectionStrings>
-    <add name="HeuristicLab.Authentication"
-         connectionString="data source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
+    <add name="HeuristicLab.Authentication" connectionString="data source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
   </connectionStrings>
 
@@ -47,8 +41,5 @@
       <providers>
         <clear/>
-        <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="HeuristicLab.Authentication"
-             enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false"
-             maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10"
-             applicationName="HeuristicLab.Authentication" />
+        <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="HeuristicLab.Authentication" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="HeuristicLab.Authentication"/>
       </providers>
     </membership>
@@ -57,5 +48,5 @@
       <providers>
         <clear/>
-        <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="HeuristicLab.Authentication" applicationName="HeuristicLab.Authentication" />
+        <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="HeuristicLab.Authentication" applicationName="HeuristicLab.Authentication"/>
       </providers>
     </roleManager>
@@ -64,17 +55,13 @@
   <system.serviceModel>
     <diagnostics>
-      <messageLogging logEntireMessage="true" logMalformedMessages="true"
-        logMessagesAtServiceLevel="true" logMessagesAtTransportLevel="true"
-        maxMessagesToLog="3000" />
+      <messageLogging logEntireMessage="true" logMalformedMessages="true" logMessagesAtServiceLevel="true" logMessagesAtTransportLevel="true" maxMessagesToLog="3000"/>
     </diagnostics>
     <bindings>
       <netTcpBinding>
-        <binding name="TcpStreamedBinding" sendTimeout="00:10:00" transferMode="Streamed"
-          maxBufferPoolSize="104857600" maxBufferSize="104857600"
-          maxReceivedMessageSize="104857600" maxConnections="50">
-          <readerQuotas maxStringContentLength="104857600" maxArrayLength="104857600" />
+        <binding name="TcpStreamedBinding" sendTimeout="00:10:00" transferMode="Streamed" maxBufferPoolSize="104857600" maxBufferSize="104857600" maxReceivedMessageSize="104857600" maxConnections="50">
+          <readerQuotas maxStringContentLength="104857600" maxArrayLength="104857600"/>
           <security mode="TransportWithMessageCredential">
             <transport clientCredentialType="Certificate"/>
-            <message clientCredentialType="UserName" />
+            <message clientCredentialType="UserName"/>
           </security>
         </binding>
@@ -84,5 +71,5 @@
           <security mode="Message">
             <transport/>
-            <message clientCredentialType="UserName" />
+            <message clientCredentialType="UserName"/>
           </security>
         </binding>
@@ -92,15 +79,12 @@
       <serviceBehaviors>
         <behavior name="ServiceBehaviour">
-          <serviceMetadata httpGetEnabled="true" httpsGetEnabled="false" />
-          <serviceDebug includeExceptionDetailInFaults="true" />
-          <serviceAuthorization principalPermissionMode="UseAspNetRoles"
-            roleProviderName="AspNetSqlRoleProvider" />
+          <serviceMetadata httpGetEnabled="true" httpsGetEnabled="false"/>
+          <serviceDebug includeExceptionDetailInFaults="true"/>
+          <serviceAuthorization principalPermissionMode="UseAspNetRoles" roleProviderName="AspNetSqlRoleProvider"/>
           <serviceCredentials>
-            <serviceCertificate findValue="blade12.hpc.fh-hagenberg.at" x509FindType="FindBySubjectName" />
-            <userNameAuthentication userNamePasswordValidationMode="MembershipProvider"
-              membershipProviderName="AspNetSqlMembershipProvider" />
+            <serviceCertificate findValue="blade12.hpc.fh-hagenberg.at" x509FindType="FindBySubjectName"/>
+            <userNameAuthentication userNamePasswordValidationMode="MembershipProvider" membershipProviderName="AspNetSqlMembershipProvider"/>
           </serviceCredentials>
-          <serviceSecurityAudit auditLogLocation="Application" suppressAuditFailure="false"
-            messageAuthenticationAuditLevel="SuccessOrFailure" />
+          <serviceSecurityAudit auditLogLocation="Application" suppressAuditFailure="false" messageAuthenticationAuditLevel="SuccessOrFailure"/>
           <serviceThrottling maxConcurrentCalls="100"/>
         </behavior>
@@ -109,31 +93,31 @@
     <services>
       <service behaviorConfiguration="ServiceBehaviour" name="HeuristicLab.Hive.Server.Core.SlaveFacade">
-        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="SlaveHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.ISlaveFacade" />
-        <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="" name="SlaveMexEndpoint" contract="IMetadataExchange" />
-        <endpoint binding="netTcpBinding" bindingConfiguration="TcpStreamedBinding" name="SlaveTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.ISlaveFacade" />
+        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="SlaveHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.ISlaveFacade"/>
+        <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="" name="SlaveMexEndpoint" contract="IMetadataExchange"/>
+        <endpoint binding="netTcpBinding" bindingConfiguration="TcpStreamedBinding" name="SlaveTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.ISlaveFacade"/>
         <host>
           <baseAddresses>
-            <add baseAddress="http://blade12.hpc.fh-hagenberg.at:9000/SlaveService" />
-            <add baseAddress="net.tcp://blade12.hpc.fh-hagenberg.at:9001/SlaveServiceStreamed" />
+            <add baseAddress="http://blade12.hpc.fh-hagenberg.at:9000/SlaveService"/>
+            <add baseAddress="net.tcp://blade12.hpc.fh-hagenberg.at:9001/SlaveServiceStreamed"/>
           </baseAddresses>
         </host>
       </service>
       <service behaviorConfiguration="ServiceBehaviour" name="HeuristicLab.Hive.Server.Core.ServerConsoleFacade">
-        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="ServerConsoleHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IServerConsoleFacade" />
-        <endpoint address="mex" binding="mexHttpBinding" name="ServerConsoleMexEndpoint" contract="IMetadataExchange" />
+        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="ServerConsoleHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IServerConsoleFacade"/>
+        <endpoint address="mex" binding="mexHttpBinding" name="ServerConsoleMexEndpoint" contract="IMetadataExchange"/>
         <host>
           <baseAddresses>
-            <add baseAddress="http://blade12.hpc.fh-hagenberg.at:9000/ServerConsoleService" />
+            <add baseAddress="http://blade12.hpc.fh-hagenberg.at:9000/ServerConsoleService"/>
           </baseAddresses>
         </host>
       </service>
       <service behaviorConfiguration="ServiceBehaviour" name="HeuristicLab.Hive.Server.Core.ClientFacade">
-        <endpoint address="" binding="netTcpBinding" bindingConfiguration="TcpStreamedBinding" name="ClientTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" />
-        <endpoint binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="ClientHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" />
-        <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="" name="ClientHttpMexEndpoint" contract="IMetadataExchange" />
+        <endpoint address="" binding="netTcpBinding" bindingConfiguration="TcpStreamedBinding" name="ClientTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade"/>
+        <endpoint binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="ClientHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade"/>
+        <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="" name="ClientHttpMexEndpoint" contract="IMetadataExchange"/>
         <host>
           <baseAddresses>
-            <add baseAddress="net.tcp://blade12.hpc.fh-hagenberg.at:9001/ClientServiceStreamed" />
-            <add baseAddress="http://blade12.hpc.fh-hagenberg.at:9000/ClientService" />
+            <add baseAddress="net.tcp://blade12.hpc.fh-hagenberg.at:9001/ClientServiceStreamed"/>
+            <add baseAddress="http://blade12.hpc.fh-hagenberg.at:9000/ClientService"/>
           </baseAddresses>
         </host>
@@ -142,3 +126,3 @@
   </system.serviceModel>
 
-</configuration>
+<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.DataAccess/3.3/HeuristicLab.Hive.Server.DataAccess-3.3.csproj
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.DataAccess/3.3/HeuristicLab.Hive.Server.DataAccess-3.3.csproj	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.DataAccess/3.3/HeuristicLab.Hive.Server.DataAccess-3.3.csproj	(revision 4710)
@@ -21,4 +21,5 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/BaseDao.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/BaseDao.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/BaseDao.cs	(revision 4710)
@@ -21,5 +21,5 @@
 
 using System.Data.Linq;
-using HeuristicLab.Tracing;
+using HeuristicLab.Hive.Tracing;
 
 namespace HeuristicLab.Hive.Server.LINQDataAccess {
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/ContextFactory.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/ContextFactory.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/ContextFactory.cs	(revision 4710)
@@ -28,5 +28,5 @@
 using HeuristicLab.Hive.Server.DataAccess;
 using HeuristicLab.Hive.Server.LINQDataAccess.Properties;
-using HeuristicLab.Tracing;
+using HeuristicLab.Hive.Tracing;
 
 
@@ -40,5 +40,5 @@
   /// it has to be disposed in order to finish the corresponding transaction.
   /// </summary>
-  class ContextFactory : IContextFactory {
+  public class ContextFactory : IContextFactory {
     private static object locker = new object();
     private static IDictionary<int, HiveDataContext> contexts = new Dictionary<int, HiveDataContext>();
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/HeuristicLab.Hive.Server.LINQDataAccess-3.3.csproj
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/HeuristicLab.Hive.Server.LINQDataAccess-3.3.csproj	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/HeuristicLab.Hive.Server.LINQDataAccess-3.3.csproj	(revision 4710)
@@ -19,4 +19,5 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -83,7 +84,4 @@
       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     </Reference>
-    <Reference Include="HeuristicLab.Tracing-3.3">
-      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -144,4 +142,8 @@
       <Name>HeuristicLab.Hive.Server.DataAccess-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Hive.Tracing\3.3\HeuristicLab.Hive.Tracing-3.3.csproj">
+      <Project>{CDAD2510-299C-4FA2-B351-9D71A5AF20B7}</Project>
+      <Name>HeuristicLab.Hive.Tracing-3.3</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/HeuristicLabHiveServerLINQDataAccessPlugin.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/HeuristicLabHiveServerLINQDataAccessPlugin.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/HeuristicLabHiveServerLINQDataAccessPlugin.cs	(revision 4710)
@@ -29,5 +29,5 @@
   [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")]
   [PluginDependency("HeuristicLab.Hive.Server.DataAccess", "3.3")]
-  [PluginDependency("HeuristicLab.Tracing", "3.3")]
+  [PluginDependency("HeuristicLab.Hive.Tracing", "3.3")]
   public class HeuristicLabHiveServerLINQDataAccessPlugin: PluginBase {
   }
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/VarBinaryStream.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/VarBinaryStream.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/VarBinaryStream.cs	(revision 4710)
@@ -7,5 +7,5 @@
 using System.Data.SqlClient;
 using System.IO;
-using HeuristicLab.Tracing;
+using HeuristicLab.Hive.Tracing;
 
 namespace HeuristicLab.Hive.Server.LINQDataAccess {
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/app.config
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/app.config	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/app.config	(revision 4710)
@@ -1,10 +1,8 @@
-﻿<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0"?>
 <configuration>
     <configSections>
     </configSections>
     <connectionStrings>
-        <add name="HeuristicLab.Hive.Server.LINQDataAccess.Properties.Settings.HeuristicLab_Hive_LinqConnectionString"
-            connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive;Integrated Security=True;"
-            providerName="System.Data.SqlClient" />
+        <add name="HeuristicLab.Hive.Server.LINQDataAccess.Properties.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive;Integrated Security=True;" providerName="System.Data.SqlClient"/>
     </connectionStrings>
-</configuration>
+<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3/HeuristicLab.Hive.Server-3.3.csproj
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3/HeuristicLab.Hive.Server-3.3.csproj	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3/HeuristicLab.Hive.Server-3.3.csproj	(revision 4710)
@@ -21,4 +21,5 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -84,7 +85,4 @@
       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     </Reference>
-    <Reference Include="HeuristicLab.Tracing-3.3">
-      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -140,4 +138,8 @@
       <Name>HeuristicLab.Hive.Server.Core-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Hive.Tracing\3.3\HeuristicLab.Hive.Tracing-3.3.csproj">
+      <Project>{CDAD2510-299C-4FA2-B351-9D71A5AF20B7}</Project>
+      <Name>HeuristicLab.Hive.Tracing-3.3</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3/HeuristicLabHiveServerPlugin.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3/HeuristicLabHiveServerPlugin.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3/HeuristicLabHiveServerPlugin.cs	(revision 4710)
@@ -28,5 +28,5 @@
   [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")]
   [PluginDependency("HeuristicLab.Hive.Server.Core", "3.3")]
-  [PluginDependency("HeuristicLab.Tracing", "3.3")]
+  [PluginDependency("HeuristicLab.Hive.Tracing", "3.3")]
   public class HeuristicLabHiveServerPlugin : PluginBase {
   }
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Common/3.3/HeuristicLab.Hive.Slave.Common-3.3.csproj
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Common/3.3/HeuristicLab.Hive.Slave.Common-3.3.csproj	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Common/3.3/HeuristicLab.Hive.Slave.Common-3.3.csproj	(revision 4710)
@@ -35,4 +35,5 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/HeuristicLab.Hive.Slave.Communication-3.3.csproj
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/HeuristicLab.Hive.Slave.Communication-3.3.csproj	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/HeuristicLab.Hive.Slave.Communication-3.3.csproj	(revision 4710)
@@ -19,4 +19,5 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -86,7 +87,4 @@
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
-    </Reference>
-    <Reference Include="HeuristicLab.Tracing-3.3">
-      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
     </Reference>
     <Reference Include="System" />
@@ -187,4 +185,8 @@
       <Name>HeuristicLab.Hive.Slave.Common-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Hive.Tracing\3.3\HeuristicLab.Hive.Tracing-3.3.csproj">
+      <Project>{CDAD2510-299C-4FA2-B351-9D71A5AF20B7}</Project>
+      <Name>HeuristicLab.Hive.Tracing-3.3</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -204,4 +206,5 @@
       <Generator>WCF Proxy Generator</Generator>
       <LastGenOutput>Reference.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </None>
   </ItemGroup>
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/HeuristicLabHiveSlaveCommunicationPlugin.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/HeuristicLabHiveSlaveCommunicationPlugin.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/HeuristicLabHiveSlaveCommunicationPlugin.cs	(revision 4710)
@@ -32,5 +32,5 @@
   [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")]
   [PluginDependency("HeuristicLab.Hive.JobBase", "3.3")]
-  [PluginDependency("HeuristicLab.Tracing", "3.3")]
+  [PluginDependency("HeuristicLab.Hive.Tracing", "3.3")]
   public class HeuristicLabHiveSlaveCommunicationPlugin : PluginBase {
   }
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/WcfService.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/WcfService.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/WcfService.cs	(revision 4710)
@@ -32,5 +32,5 @@
 using HeuristicLab.Hive.Slave.Communication.SlaveFacade;
 using HeuristicLab.PluginInfrastructure;
-using HeuristicLab.Tracing;
+using HeuristicLab.Hive.Tracing;
 
 namespace HeuristicLab.Hive.Slave.Communication {
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/app.config
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/app.config	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/app.config	(revision 4710)
@@ -1,7 +1,7 @@
-﻿<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0"?>
 <configuration>
   <configSections>
-    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-      <section name="HeuristicLab.Hive.Slave.Communication.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="HeuristicLab.Hive.Slave.Communication.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
     </sectionGroup>
   </configSections>
@@ -9,34 +9,20 @@
     <bindings>
       <netTcpBinding>
-        <binding name="SlaveTcpStreamedEndpoint" closeTimeout="00:01:00"
-          openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
-          transactionFlow="false" transferMode="Streamed" transactionProtocol="OleTransactions"
-          hostNameComparisonMode="StrongWildcard" listenBacklog="10" maxBufferPoolSize="524288"
-          maxBufferSize="65536" maxConnections="10" maxReceivedMessageSize="104857600">
-          <readerQuotas maxDepth="32" maxStringContentLength="104857600"
-            maxArrayLength="104857600" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-          <reliableSession ordered="true" inactivityTimeout="00:10:00"
-            enabled="false" />
+        <binding name="SlaveTcpStreamedEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" transactionFlow="false" transferMode="Streamed" transactionProtocol="OleTransactions" hostNameComparisonMode="StrongWildcard" listenBacklog="10" maxBufferPoolSize="524288" maxBufferSize="65536" maxConnections="10" maxReceivedMessageSize="104857600">
+          <readerQuotas maxDepth="32" maxStringContentLength="104857600" maxArrayLength="104857600" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
+          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
           <security mode="TransportWithMessageCredential">
-            <transport clientCredentialType="Windows" protectionLevel="EncryptAndSign" />
-            <message clientCredentialType="UserName" algorithmSuite="Default" />
+            <transport clientCredentialType="Windows" protectionLevel="EncryptAndSign"/>
+            <message clientCredentialType="UserName" algorithmSuite="Default"/>
           </security>
         </binding>
       </netTcpBinding>
       <wsHttpBinding>
-        <binding name="SlaveHttpEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00"
-          receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false"
-          transactionFlow="false" hostNameComparisonMode="StrongWildcard"
-          maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text"
-          textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
-          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-            maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-          <reliableSession ordered="true" inactivityTimeout="00:10:00"
-            enabled="false" />
+        <binding name="SlaveHttpEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
+          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
+          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
           <security mode="Message">
-            <transport clientCredentialType="Windows" proxyCredentialType="None"
-              realm="" />
-            <message clientCredentialType="UserName" negotiateServiceCredential="true"
-              algorithmSuite="Default" />
+            <transport clientCredentialType="Windows" proxyCredentialType="None" realm=""/>
+            <message clientCredentialType="UserName" negotiateServiceCredential="true" algorithmSuite="Default"/>
           </security>
         </binding>
@@ -44,16 +30,12 @@
     </bindings>
     <client>
-      <endpoint address="http://blade12.hpc.fh-hagenberg.at:9000/SlaveService" binding="wsHttpBinding" behaviorConfiguration="SlaveServiceBehaviour"
-        bindingConfiguration="SlaveHttpEndpoint" contract="SlaveFacade.ISlaveFacade"
-        name="SlaveHttpEndpoint">
+      <endpoint address="http://localhost:9000/Hive/SlaveService.svc" binding="wsHttpBinding" behaviorConfiguration="SlaveServiceBehaviour" bindingConfiguration="SlaveHttpEndpoint" contract="SlaveFacade.ISlaveFacade" name="SlaveHttpEndpoint">
         <identity>
-          <certificate encodedValue="AwAAAAEAAAAUAAAA0FkTGjOA2/0cZmFlIwFildV5a/ogAAAAAQAAACgCAAAwggIkMIIBkaADAgECAhCcCYkXdzUDsEzY5+POfdYRMAkGBSsOAwIdBQAwJjEkMCIGA1UEAxMbYmxhZGUxMi5ocGMuZmgtaGFnZW5iZXJnLmF0MB4XDTEwMDkxNTE0MjkyNFoXDTM5MTIzMTIzNTk1OVowJjEkMCIGA1UEAxMbYmxhZGUxMi5ocGMuZmgtaGFnZW5iZXJnLmF0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDN/VsuexELvneBS+KjIT4z1oj8VwitpZJDhCVxVM1hBVAXRJ9qE0zwFwen6KWRXKMx0wZvm47CdkENO0krsqfliQRKb0hcMin+37X8u1Xk51qebV3M0kUAEpsRT6RehQD41+iGe1GmIaLksCEYaH80wPWI7F3N/tN+5svizD0sfQIDAQABo1swWTBXBgNVHQEEUDBOgBBJWfbAcVJ+egMO9eh/uP3hoSgwJjEkMCIGA1UEAxMbYmxhZGUxMi5ocGMuZmgtaGFnZW5iZXJnLmF0ghCcCYkXdzUDsEzY5+POfdYRMAkGBSsOAwIdBQADgYEApOwttaruQRFtS8SWslEDt+aKzIUnfKrJ+7U7Fml5+QT7G4+5bXnfOs5gcWKDQyyap9y3AJpjPnGaLzwb/8LwlqKXePRQvOW44O5JLwOTo3TD4ZPKANuBblD7J7TYGyXKTUQcytfQl1uOxELWNBj4IpUEbR1C/S4RmupMivLNQoA=" />
+          <certificate encodedValue="AwAAAAEAAAAUAAAAfEKvcVixnJay+q4hCPFuO0JL5TQgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMTAxOTEwNTMxNVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXwC5TGcAffd/0oAWHtm0s6YXVXEgXgb1AYmBkkkhkKIFJG/e/Z0KSYbJepmSJD44W3oOAVm+x1DAsZxU79HahDYgWCuHLMm1TLpwSmYOQ0kV3pGHWHhiWV7h7oGLds/eqZ2EOpaNGryfEPnrA4VmxY91vV5/2BTeVSWG6F8lRKQIDAQABo0kwRzBFBgNVHQEEPjA8gBAR7kBnMRHO5gzThEqda0wWoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQADgYEAoPwEG4QTDXhlxERNDfsZmM2IhEpV42ppz1kEah2oYKDa/ElIMVtvqLv6flVtg18ENN/mEJWiHZ3NyP3qr2Pip+sh+/2WBiSbOaukES/CM7OJn9kJCImH7M/xqM8pxqY8IfgM6iBVrVj9uHqj3j2BBck+cYY8fKyh3CFifMIp6ac="/>
         </identity>
       </endpoint>
-      <endpoint address="net.tcp://blade12.hpc.fh-hagenberg.at:9001/SlaveServiceStreamed" behaviorConfiguration="SlaveServiceBehaviour"
-        binding="netTcpBinding" bindingConfiguration="SlaveTcpStreamedEndpoint"
-        contract="SlaveFacade.ISlaveFacade" name="SlaveTcpStreamedEndpoint">
+      <endpoint address="net.tcp://localhost:9001/Hive/SlaveService.svc" behaviorConfiguration="SlaveServiceBehaviour" binding="netTcpBinding" bindingConfiguration="SlaveTcpStreamedEndpoint" contract="SlaveFacade.ISlaveFacade" name="SlaveTcpStreamedEndpoint">
         <identity>
-          <dns value="blade12.hpc.fh-hagenberg.at" />
+          <dns value="localhost"/>
         </identity>
       </endpoint>
@@ -64,5 +46,5 @@
           <clientCredentials>
             <serviceCertificate>
-              <authentication certificateValidationMode="None" />
+              <authentication certificateValidationMode="None"/>
             </serviceCertificate>
           </clientCredentials>
@@ -82,3 +64,3 @@
     </HeuristicLab.Hive.Slave.Communication.Properties.Settings>
   </userSettings>
-</configuration>
+<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/HeuristicLab.Hive.Slave.Console-3.3.csproj
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/HeuristicLab.Hive.Slave.Console-3.3.csproj	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/HeuristicLab.Hive.Slave.Console-3.3.csproj	(revision 4710)
@@ -21,4 +21,5 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/Properties/Resources.Designer.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/Properties/Resources.Designer.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/Properties/Resources.Designer.cs	(revision 4710)
@@ -10,7 +10,8 @@
 
 namespace HeuristicLab.Hive.Slave.Console.Properties {
-
-
-  /// <summary>
+    using System;
+    
+    
+    /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/Service References/SlaveConsoleService/Reference.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/Service References/SlaveConsoleService/Reference.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/Service References/SlaveConsoleService/Reference.cs	(revision 4710)
@@ -10,7 +10,9 @@
 
 namespace HeuristicLab.Hive.Slave.Console.SlaveConsoleService {
-
-
-  [System.Diagnostics.DebuggerStepThroughAttribute()]
+    using System.Runtime.Serialization;
+    using System;
+    
+    
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     [System.Runtime.Serialization.DataContractAttribute(Name="StatusCommons", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Slave.Core.SlaveConsole" +
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/app.config
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/app.config	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/app.config	(revision 4710)
@@ -1,7 +1,7 @@
-﻿<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0"?>
 <configuration>
   <configSections>
-    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-      <section name="HeuristicLab.Hive.Slave.Console.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="HeuristicLab.Hive.Slave.Console.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
     </sectionGroup>
   </configSections>
@@ -16,16 +16,10 @@
     <bindings>
       <netTcpBinding>
-        <binding name="SlaveConsoleTcpEndpoint" closeTimeout="00:01:00"
-          openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
-          transactionFlow="false" transferMode="Buffered" transactionProtocol="OleTransactions"
-          hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288"
-          maxBufferSize="65536" maxReceivedMessageSize="65536">
-          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-            maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-          <reliableSession ordered="true" inactivityTimeout="00:10:00"
-            enabled="false" />
+        <binding name="SlaveConsoleTcpEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" transactionFlow="false" transferMode="Buffered" transactionProtocol="OleTransactions" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxBufferSize="65536" maxReceivedMessageSize="65536">
+          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
+          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
           <security mode="None">
-            <transport clientCredentialType="Windows" protectionLevel="EncryptAndSign" />
-            <message clientCredentialType="Windows" />
+            <transport clientCredentialType="Windows" protectionLevel="EncryptAndSign"/>
+            <message clientCredentialType="Windows"/>
           </security>
         </binding>
@@ -33,8 +27,6 @@
     </bindings>
     <client>
-      <endpoint address="net.tcp://localhost:8000/SlaveConsoleService"
-        binding="netTcpBinding" bindingConfiguration="SlaveConsoleTcpEndpoint"
-        contract="SlaveConsoleService.ISlaveConsoleCommunicator" name="SlaveConsoleTcpEndpoint" />
+      <endpoint address="net.tcp://localhost:8000/SlaveConsoleService" binding="netTcpBinding" bindingConfiguration="SlaveConsoleTcpEndpoint" contract="SlaveConsoleService.ISlaveConsoleCommunicator" name="SlaveConsoleTcpEndpoint"/>
     </client>
   </system.serviceModel>
-</configuration>
+<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/ConfigurationManager/UptimeManager.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/ConfigurationManager/UptimeManager.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/ConfigurationManager/UptimeManager.cs	(revision 4710)
@@ -28,5 +28,5 @@
 using HeuristicLab.Hive.Contracts.BusinessObjects;
 using HeuristicLab.Hive.Contracts.ResponseObjects;
-using HeuristicLab.Tracing;
+using HeuristicLab.Hive.Tracing;
 
 namespace HeuristicLab.Hive.Slave.Core.ConfigurationManager {
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Core.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Core.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Core.cs	(revision 4710)
@@ -36,5 +36,5 @@
 using HeuristicLab.Hive.Slave.Core.SlaveConsoleService;
 using HeuristicLab.Hive.Slave.ExecutionEngine;
-using HeuristicLab.Tracing;
+using HeuristicLab.Hive.Tracing;
 
 namespace HeuristicLab.Hive.Slave.Core {
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/HeartbeatManager.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/HeartbeatManager.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/HeartbeatManager.cs	(revision 4710)
@@ -30,5 +30,5 @@
 using HeuristicLab.Hive.Slave.Communication.SlaveFacade;
 using HeuristicLab.Hive.Slave.Core.ConfigurationManager;
-using HeuristicLab.Tracing;
+using HeuristicLab.Hive.Tracing;
 
 namespace HeuristicLab.Hive.Slave.Core {
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/HeuristicLab.Hive.Slave.Core-3.3.csproj
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/HeuristicLab.Hive.Slave.Core-3.3.csproj	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/HeuristicLab.Hive.Slave.Core-3.3.csproj	(revision 4710)
@@ -20,4 +20,5 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -86,7 +87,4 @@
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
-    </Reference>
-    <Reference Include="HeuristicLab.Tracing-3.3">
-      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
     </Reference>
     <Reference Include="System" />
@@ -176,4 +174,8 @@
       <Name>HeuristicLab.Hive.Slave.ExecutionEngine-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Hive.Tracing\3.3\HeuristicLab.Hive.Tracing-3.3.csproj">
+      <Project>{CDAD2510-299C-4FA2-B351-9D71A5AF20B7}</Project>
+      <Name>HeuristicLab.Hive.Tracing-3.3</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/HeuristicLabHiveSlaveCorePlugin.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/HeuristicLabHiveSlaveCorePlugin.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/HeuristicLabHiveSlaveCorePlugin.cs	(revision 4710)
@@ -33,5 +33,5 @@
   [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")]
   [PluginDependency("HeuristicLab.Hive.JobBase", "3.3")]
-  [PluginDependency("HeuristicLab.Tracing", "3.3")]
+  [PluginDependency("HeuristicLab.Hive.Tracing", "3.3")]
   public class HeuristicLabHiveSlaveCorePlugin: PluginBase {
   }
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/JobStorage/JobStorageManager.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/JobStorage/JobStorageManager.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/JobStorage/JobStorageManager.cs	(revision 4710)
@@ -29,5 +29,5 @@
 using HeuristicLab.Hive.Slave.Communication;
 using HeuristicLab.Hive.Slave.Core.ConfigurationManager;
-using HeuristicLab.Tracing;
+using HeuristicLab.Hive.Tracing;
 
 namespace HeuristicLab.Hive.Slave.Core.JobStorage {
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/PluginCache.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/PluginCache.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/PluginCache.cs	(revision 4710)
@@ -29,5 +29,5 @@
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.PluginInfrastructure.Manager;
-using HeuristicLab.Tracing;
+using HeuristicLab.Hive.Tracing;
 
 namespace HeuristicLab.Hive.Slave.Core {
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/app.config
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/app.config	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/app.config	(revision 4710)
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0"?>
 <configuration>
   <configSections>
-    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-      <section name="HeuristicLab.Hive.Slave.Core.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="HeuristicLab.Hive.Slave.Core.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
     </sectionGroup>
   </configSections>
@@ -9,5 +9,5 @@
     <HeuristicLab.Hive.Slave.Core.Properties.Settings>
       <setting name="ServerIP" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="Guid" serializeAs="String">
@@ -20,5 +20,5 @@
       <serviceBehaviors>
         <behavior name="SlaveConsoleServiceBehaviour">
-          <serviceMetadata />
+          <serviceMetadata/>
         </behavior>
       </serviceBehaviors>
@@ -34,13 +34,10 @@
     </bindings>
     <services>
-      <service behaviorConfiguration="SlaveConsoleServiceBehaviour"
-        name="HeuristicLab.Hive.Slave.Core.SlaveConsoleService.SlaveConsoleCommunicator">
-        <endpoint binding="netTcpBinding" bindingConfiguration="SlaveConsoleTcpBinding"
-          name="SlaveConsoleTcpEndpoint" contract="HeuristicLab.Hive.Slave.Core.SlaveConsoleService.Interfaces.ISlaveConsoleCommunicator" />
-        <endpoint address="mex" binding="mexTcpBinding" bindingConfiguration=""
-          name="SlaveConsoleTcpMexEndpoint" contract="IMetadataExchange" />
+      <service behaviorConfiguration="SlaveConsoleServiceBehaviour" name="HeuristicLab.Hive.Slave.Core.SlaveConsoleService.SlaveConsoleCommunicator">
+        <endpoint binding="netTcpBinding" bindingConfiguration="SlaveConsoleTcpBinding" name="SlaveConsoleTcpEndpoint" contract="HeuristicLab.Hive.Slave.Core.SlaveConsoleService.Interfaces.ISlaveConsoleCommunicator"/>
+        <endpoint address="mex" binding="mexTcpBinding" bindingConfiguration="" name="SlaveConsoleTcpMexEndpoint" contract="IMetadataExchange"/>
         <host>
           <baseAddresses>
-            <add baseAddress="net.tcp://localhost:8000/SlaveConsoleService" />
+            <add baseAddress="net.tcp://localhost:8000/SlaveConsoleService"/>
           </baseAddresses>
         </host>
@@ -48,3 +45,3 @@
     </services>
   </system.serviceModel>
-</configuration>
+<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.ExecutionEngine/3.3/HeuristicLab.Hive.Slave.ExecutionEngine-3.3.csproj
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.ExecutionEngine/3.3/HeuristicLab.Hive.Slave.ExecutionEngine-3.3.csproj	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.ExecutionEngine/3.3/HeuristicLab.Hive.Slave.ExecutionEngine-3.3.csproj	(revision 4710)
@@ -19,4 +19,5 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Tracing/3.3/HeuristicLab.Hive.Tracing-3.3.csproj
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Tracing/3.3/HeuristicLab.Hive.Tracing-3.3.csproj	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Tracing/3.3/HeuristicLab.Hive.Tracing-3.3.csproj	(revision 4710)
@@ -96,16 +96,17 @@
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     </Reference>
-    <Reference Include="HeuristicLab.Tracing-3.3">
-      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net">
-      <HintPath>C:\Program Files\HeuristicLab 3.3\log4net.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -115,16 +116,13 @@
   <ItemGroup>
     <Compile Include="HeuristicLabHiveTracingPlugin.cs" />
-    <Compile Include="MethodCallPatternConverter.cs" />
-    <Compile Include="MethodCallPatternLayout.cs" />
+    <Compile Include="Logger.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="HeuristicLab.Hive.log4net.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    <None Include="HeuristicLab.snk" />
+    <None Include="Properties\AssemblyInfo.frame" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
-    <None Include="Properties\AssemblyInfo.frame" />
+    <WCFMetadata Include="Service References\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Index: anches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Tracing/3.3/HeuristicLab.Hive.log4net.xml
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Tracing/3.3/HeuristicLab.Hive.log4net.xml	(revision 4709)
+++ 	(revision )
@@ -1,92 +1,0 @@
-﻿<log4net>
-  <appender name="RollingFileAppender" type="log4net.Appender.RollingFileAppender">
-    <file value="Hive.log" />
-    <appendToFile value="true" />
-    <rollingStyle value="Size" />
-    <maxSizeRollBackups value="10" />
-    <maximumFileSize value="100MB" />
-    <staticLogFileName value="true" />
-    <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-    <layout type="HeuristicLab.Hive.Tracing.MethodCallPatternLayout, HeuristicLab.Hive.Tracing-3.3">
-      <conversionPattern value="%date{yyyy-MM-dd HH:mm:ss.ffff} %-4timestamp %-5level %-5thread %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="100MB" />
-    <staticLogFileName value="true" />
-    <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-    <layout type="HeuristicLab.Hive.Tracing.MethodCallPatternLayout, HeuristicLab.Hive.Tracing-3.3">
-      <conversionPattern value="%date{yyyy-MM-dd HH:mm:ss.ffff} %-4timestamp %-5level %-5thread %logger.%RM - %message%newline%exception" />
-    </layout>
-  </appender>
-
-  <appender name="ClientRollingFileAppender" type="log4net.Appender.RollingFileAppender">
-    <file value="Hive.Slave.log" />
-    <appendToFile value="true" />
-    <rollingStyle value="Size" />
-    <maxSizeRollBackups value="10" />
-    <maximumFileSize value="100MB" />
-    <staticLogFileName value="true" />
-    <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-    <layout type="HeuristicLab.Hive.Tracing.MethodCallPatternLayout, HeuristicLab.Hive.Tracing-3.3">
-      <conversionPattern value="%date{yyyy-MM-dd HH:mm:ss.ffff} %-4timestamp %-5level %-5thread %logger.%RM - %message%newline%exception" />
-    </layout>
-  </appender>
-  
-  <appender name="BufferingForwardingAppender" type="log4net.Appender.BufferingForwardingAppender" >
-    <bufferSize value="128" />
-    <lossy value="true" />
-    <evaluator type="log4net.Core.LevelEvaluator">
-        <threshold value="DEBUG"/>
-    </evaluator>
-    <appender-ref ref="RollingFileAppender" />
-  </appender>
-
-  <appender name="ClientBufferingForwardingAppender" type="log4net.Appender.BufferingForwardingAppender" >
-    <bufferSize value="128" />
-    <lossy value="true" />
-    <evaluator type="log4net.Core.LevelEvaluator">
-      <threshold value="DEBUG"/>
-    </evaluator>
-    <appender-ref ref="ClientRollingFileAppender" />
-  </appender>
-
-  <appender name="ServerBufferingForwardingAppender" type="log4net.Appender.BufferingForwardingAppender" >
-    <bufferSize value="128" />
-    <lossy value="true" />
-    <evaluator type="log4net.Core.LevelEvaluator">
-      <threshold value="DEBUG"/>
-    </evaluator>
-    <appender-ref ref="ServerRollingFileAppender" />
-  </appender>
-  
-  <appender name="BufferingForwardingAppender" type="log4net.Appender.BufferingForwardingAppender" >
-    <bufferSize value="128" />
-    <lossy value="true" />
-    <evaluator type="log4net.Core.LevelEvaluator">
-      <threshold value="DEBUG"/>
-    </evaluator>
-    <appender-ref ref="RollingFileAppender" />
-  </appender>
-  
-  <root>
-    <level value="DEBUG" />
-    <appender-ref ref="BufferingForwardingAppender" />
-  </root>
-
-  <logger name="HeuristicLab.Hive.Server">
-    <level value="DEBUG" />
-    <appender-ref ref="ServerBufferingForwardingAppender" />    
-  </logger>
-
-  <logger name="HeuristicLab.Hive.Slave">
-    <level value="DEBUG" />
-    <appender-ref ref="ClientBufferingForwardingAppender" />  
-  </logger>
-  
-</log4net>
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Tracing/3.3/HeuristicLabHiveTracingPlugin.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Tracing/3.3/HeuristicLabHiveTracingPlugin.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Tracing/3.3/HeuristicLabHiveTracingPlugin.cs	(revision 4710)
@@ -25,7 +25,4 @@
   [Plugin("HeuristicLab.Hive.Tracing", "3.3")]
   [PluginFile("HeuristicLab.Hive.Tracing-3.3.dll", PluginFileType.Assembly)]
-  [PluginFile("HeuristicLab.Hive.log4net.xml", PluginFileType.Data)]
-  [PluginDependency("HeuristicLab.Tracing", "3.3")]
-  [PluginDependency("HeuristicLab.log4net", "1.2.10.0")]
   public class HeuristicLabHiveTracingPlugin : PluginBase {
   }
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Tracing/3.3/Logger.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Tracing/3.3/Logger.cs	(revision 4710)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Tracing/3.3/Logger.cs	(revision 4710)
@@ -0,0 +1,40 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Diagnostics;
+
+namespace HeuristicLab.Hive.Tracing {
+  public static class Logger {
+    private static string source = "System.ServiceModel";
+
+    public static void Debug(object message) {
+      //TraceSource ts = new TraceSource(source);
+      //ts.TraceInformation(message.ToString());
+      //ts.Close();
+    }
+
+    public static void Info(object message) {
+      //TraceSource ts = new TraceSource(source);
+      //ts.TraceInformation(message.ToString());
+      //ts.Close();
+    }
+
+    public static void Warn(object message) {
+      //TraceSource ts = new TraceSource(source);
+      //ts.TraceInformation(message.ToString());
+      //ts.Close();
+    }
+
+    public static void Error(object message) {
+      TraceSource ts = new TraceSource(source);
+      ts.TraceInformation(message.ToString());
+      ts.Close();
+    }
+    public static void Error(object message, Exception e) {
+      TraceSource ts = new TraceSource(source);
+      ts.TraceInformation(message.ToString());
+      ts.Close();
+    }
+  }
+}
Index: anches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Tracing/3.3/MethodCallPatternConverter.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Tracing/3.3/MethodCallPatternConverter.cs	(revision 4709)
+++ 	(revision )
@@ -1,40 +1,0 @@
-﻿#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System.Diagnostics;
-using log4net.Util;
-
-namespace HeuristicLab.Hive.Tracing {
-  class MethodCallPatternConverter: PatternConverter {
-    protected override void Convert(System.IO.TextWriter writer, object state) {
-      StackTrace callStack = new StackTrace();
-      int i = 1;
-      while (i < callStack.FrameCount && !callStack.GetFrame(i).GetMethod().DeclaringType.FullName.StartsWith("HeuristicLab.Hive")) {
-        i++; 
-      }
-      StackFrame stack = new StackFrame(i);
-      var method = stack.GetMethod();
-      if (method != null) {
-        writer.Write(stack.GetMethod().Name);
-      }
-    }
-  }
-}
Index: anches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Tracing/3.3/MethodCallPatternLayout.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Tracing/3.3/MethodCallPatternLayout.cs	(revision 4709)
+++ 	(revision )
@@ -1,34 +1,0 @@
-﻿#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using log4net.Layout;
-using log4net.Util;
-
-namespace HeuristicLab.Hive.Tracing {
-  class MethodCallPatternLayout: PatternLayout {
-    protected override PatternParser CreatePatternParser(string pattern) {
-       PatternParser pp = base.CreatePatternParser(pattern);
-      pp.PatternConverters["RM"] = typeof (MethodCallPatternConverter);
-      return pp;
-      
-    }
-  }
-}
Index: anches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Tracing/3.3/app.config
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Tracing/3.3/app.config	(revision 4709)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="HeuristicLab.Tracing.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-    </sectionGroup>
-  </configSections>
-  <connectionStrings>
-  </connectionStrings>
-  <system.serviceModel>
-  </system.serviceModel>
-  <runtime>
-    <gcServer enabled="true"/>
-  </runtime>
-  
-  <userSettings>
-    <HeuristicLab.Tracing.Properties.Settings>
-      <setting name="TracingLog4netConfigFile" serializeAs="String">
-        <value>HeuristicLab.Hive.log4net.xml</value>
-      </setting>
-    </HeuristicLab.Tracing.Properties.Settings>
-  </userSettings>
-</configuration>
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/Files.txt
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/Files.txt	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/Files.txt	(revision 4710)
@@ -23,6 +23,4 @@
 HeuristicLab.Hive.Server.DataAccess\3.3:HeuristicLab.Hive.Server.DataAccess-3.3.dll
 HeuristicLab.Hive.Server.LINQDataAccess\3.3:HeuristicLab.Hive.Server.LINQDataAccess-3.3.dll
-HeuristicLab.Hive.Server.Scheduler\3.3:HeuristicLab.Hive.Server.Scheduler-3.3.dll
 
 HeuristicLab.Hive.Tracing\3.3:HeuristicLab.Hive.Tracing-3.3.dll
-HeuristicLab.Hive.Tracing\3.3:HeuristicLab.Hive.log4net.xml
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/MergeConfigs.cmd
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/MergeConfigs.cmd	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/MergeConfigs.cmd	(revision 4710)
@@ -8,5 +8,4 @@
 ConfigMerger "%SolutionDir%HeuristicLab.Hive.Slave.Communication\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
 ConfigMerger "%SolutionDir%HeuristicLab.Hive.Slave.Console\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
-ConfigMerger "%SolutionDir%HeuristicLab.Hive.Tracing\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
 
 ConfigMerger "HeuristicLab.Hive-3.3.dll.config" "HeuristicLab 3.3.exe.config"
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HiveWeb/App_Code/HiveServerModule.cs
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HiveWeb/App_Code/HiveServerModule.cs	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HiveWeb/App_Code/HiveServerModule.cs	(revision 4710)
@@ -7,35 +7,24 @@
 using HeuristicLab.Tracing;
 using System.IO;
+using HeuristicLab.Hive.Contracts.Interfaces;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Hive.Server.Core.IISModules {
   public class HiveServerModule : IHttpModule {
-    Thread t;
-
-    #region IHttpModule Members
-
-    public void Dispose() {
-      if (t != null && t.ThreadState == ThreadState.Running) {
-        t.Abort();
-      }
-      File.Create(@"C:\ch\stuff\Log\Dispose" + Thread.CurrentThread.ManagedThreadId).Dispose();
-    }
-
+    private static object locker = new object();
+    private static ILifecycleManager lifecycleManager;
+    
     public void Init(HttpApplication context) {
-
-      File.Create(@"C:\ch\stuff\Log\Init." + Thread.CurrentThread.ManagedThreadId).Dispose();
-      t = new Thread(DoSomething);
-      t.Start();
-    }
-
-    private void DoSomething() {
-      int i = 0;
-      while (true) {
-        Thread.Sleep(1000);
-        File.Create(@"C:\ch\stuff\Log\file" + Thread.CurrentThread.ManagedThreadId + "." + i).Dispose();
-        i++;
+      lock (locker) {
+        lifecycleManager = ServiceLocator.GetLifecycleManager();
+        lifecycleManager.Start();
       }
     }
 
-    #endregion
+    public void Dispose() {
+      lock (locker) {
+        lifecycleManager.Stop();
+      }
+    }
   }
 }
Index: anches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HiveWeb/HeuristicLab.log4net.xml
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HiveWeb/HeuristicLab.log4net.xml	(revision 4709)
+++ 	(revision )
@@ -1,30 +1,0 @@
-﻿<log4net>
-  
-  <appender name="RollingFileAppender" type="log4net.Appender.RollingFileAppender">
-    <file value="HeuristicLab.log" />
-    <appendToFile value="true" />
-    <rollingStyle value="Size" />
-    <maxSizeRollBackups value="10" />
-    <maximumFileSize value="100KB" />
-    <staticLogFileName value="true" />
-    <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-    <layout type="log4net.Layout.PatternLayout">
-      <conversionPattern value="%-4timestamp [%appdomain/%thread] %-5level %logger %ndc - %message%newline%exception" />
-    </layout>
-  </appender>
-  
-  <appender name="BufferingForwardingAppender" type="log4net.Appender.BufferingForwardingAppender" >
-    <bufferSize value="128" />
-    <lossy value="true" />
-    <evaluator type="log4net.Core.LevelEvaluator">
-        <threshold value="INFO"/>
-    </evaluator>
-    <appender-ref ref="RollingFileAppender" />
-  </appender>
-  
-  <root>
-    <level value="INFO" />
-    <appender-ref ref="BufferingForwardingAppender" />
-  </root>
-  
-</log4net>
Index: /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HiveWeb/Web.config
===================================================================
--- /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HiveWeb/Web.config	(revision 4709)
+++ /branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HiveWeb/Web.config	(revision 4710)
@@ -1,15 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <configuration>
-
   <configSections>
-    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-      <section name="HeuristicLab.Tracing.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="HeuristicLab.Tracing.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
     </sectionGroup>
   </configSections>
-
+  
+  <!--
+  <system.diagnostics>
+    <sources>
+      <source name="System.ServiceModel.MessageLogging" switchValue="Warning, ActivityTracing">
+        <listeners>
+          <add type="System.Diagnostics.DefaultTraceListener" name="Default">
+            <filter type="" />
+          </add>
+          <add name="ServiceModelMessageLoggingListener">
+            <filter type="" />
+          </add>
+        </listeners>
+      </source>
+      <source name="System.ServiceModel" switchValue="Information,ActivityTracing">
+        <listeners>
+          <add type="System.Diagnostics.DefaultTraceListener" name="Default">
+            <filter type="" />
+          </add>
+          <add name="ServiceModelTraceListener">
+            <filter type="" />
+          </add>
+        </listeners>
+      </source>
+    </sources>
+    <sharedListeners>
+      <add initializeData="c:\ch\svn\branches\heuristiclab.hive\sources\heuristiclab.hive\hiveweb\web_messages.svclog"
+        type="System.Diagnostics.XmlWriterTraceListener, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
+        name="ServiceModelMessageLoggingListener" traceOutputOptions="DateTime, Timestamp">
+        <filter type="" />
+      </add>
+      <add initializeData="c:\ch\svn\branches\heuristiclab.hive\sources\heuristiclab.hive\hiveweb\web_tracelog.svclog"
+        type="System.Diagnostics.XmlWriterTraceListener, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
+        name="ServiceModelTraceListener" traceOutputOptions="DateTime, Timestamp">
+        <filter type="" />
+      </add>
+    </sharedListeners>
+  </system.diagnostics>
+  -->
+  
   <applicationSettings>
     <HeuristicLab.Tracing.Properties.Settings>
       <setting name="TracingLog4netConfigFile" serializeAs="String">
-        <value />
+        <value/>
       </setting>
     </HeuristicLab.Tracing.Properties.Settings>
@@ -17,47 +55,37 @@
   
   <connectionStrings>
-    <add name="HeuristicLab.Authentication"
-         connectionString="data source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
+    <add name="HeuristicLab.Authentication" connectionString="data source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
   </connectionStrings>
-
+  
   <system.web>
-
-    <compilation debug="true" targetFramework="4.0" />
-
+    <compilation debug="true" targetFramework="4.0">
+    </compilation>
     <membership>
       <providers>
         <clear/>
-        <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="HeuristicLab.Authentication"
-             enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false"
-             maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10"
-             applicationName="HeuristicLab.Authentication" />
+        <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="HeuristicLab.Authentication" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="HeuristicLab.Authentication"/>
       </providers>
     </membership>
-
     <roleManager enabled="true">
       <providers>
         <clear/>
-        <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="HeuristicLab.Authentication" applicationName="HeuristicLab.Authentication" />
+        <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="HeuristicLab.Authentication" applicationName="HeuristicLab.Authentication"/>
       </providers>
     </roleManager>
+    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"/>
   </system.web>
-
-
-
+  
   <system.serviceModel>
     <diagnostics>
-      <messageLogging logEntireMessage="true" logMalformedMessages="true"
-        logMessagesAtServiceLevel="true" logMessagesAtTransportLevel="true"
-        maxMessagesToLog="3000" />
+      <messageLogging logEntireMessage="true" logMalformedMessages="true" logMessagesAtServiceLevel="true" logMessagesAtTransportLevel="true" maxMessagesToLog="3000"/>
     </diagnostics>
+    
     <bindings>
       <netTcpBinding>
-        <binding name="TcpStreamedBinding" sendTimeout="00:10:00" transferMode="Streamed"
-          maxBufferPoolSize="104857600" maxBufferSize="104857600"
-          maxReceivedMessageSize="104857600" maxConnections="50">
-          <readerQuotas maxStringContentLength="104857600" maxArrayLength="104857600" />
+        <binding name="TcpStreamedBinding" sendTimeout="00:10:00" transferMode="Streamed" maxBufferPoolSize="104857600" maxBufferSize="104857600" maxReceivedMessageSize="104857600">
+          <readerQuotas maxStringContentLength="104857600" maxArrayLength="104857600"/>
           <security mode="TransportWithMessageCredential">
             <transport clientCredentialType="Certificate"/>
-            <message clientCredentialType="UserName" />
+            <message clientCredentialType="UserName"/>
           </security>
         </binding>
@@ -67,69 +95,53 @@
           <security mode="Message">
             <transport/>
-            <message clientCredentialType="UserName" />
+            <message clientCredentialType="UserName"/>
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
+    
     <behaviors>
       <serviceBehaviors>
         <behavior name="ServiceBehaviour">
-          <serviceMetadata httpGetEnabled="true" httpsGetEnabled="false" />
-          <serviceDebug includeExceptionDetailInFaults="true" />
-          <serviceAuthorization principalPermissionMode="UseAspNetRoles"
-            roleProviderName="AspNetSqlRoleProvider" />
+          <serviceMetadata httpGetEnabled="false" httpsGetEnabled="false"/>
+          <serviceDebug includeExceptionDetailInFaults="true"/>
+          <serviceAuthorization principalPermissionMode="UseAspNetRoles" roleProviderName="AspNetSqlRoleProvider"/>
           <serviceCredentials>
-            <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName" />
-            <userNameAuthentication userNamePasswordValidationMode="MembershipProvider"
-              membershipProviderName="AspNetSqlMembershipProvider" />
+            <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName"/>
+            <userNameAuthentication userNamePasswordValidationMode="MembershipProvider" membershipProviderName="AspNetSqlMembershipProvider"/>
           </serviceCredentials>
-          <serviceSecurityAudit auditLogLocation="Application" suppressAuditFailure="false"
-            messageAuthenticationAuditLevel="SuccessOrFailure" />
+          <serviceSecurityAudit auditLogLocation="Application" suppressAuditFailure="false" messageAuthenticationAuditLevel="SuccessOrFailure"/>
           <serviceThrottling maxConcurrentCalls="100"/>
         </behavior>
       </serviceBehaviors>
     </behaviors>
+    
     <services>
       <service behaviorConfiguration="ServiceBehaviour" name="HeuristicLab.Hive.Server.Core.SlaveFacade">
-        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="SlaveHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.ISlaveFacade" />
-        <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="" name="SlaveMexEndpoint" contract="IMetadataExchange" />
-        <!--<endpoint binding="netTcpBinding" bindingConfiguration="TcpStreamedBinding" name="SlaveTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.ISlaveFacade" />-->
-        <host>
-          <baseAddresses>
-            <add baseAddress="http://localhost:9000/SlaveService" />
-            <!--<add baseAddress="net.tcp://localhost:9001/SlaveServiceStreamed" />-->
-          </baseAddresses>
-        </host>
+        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="SlaveHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.ISlaveFacade"/>
+        <endpoint address="mex" binding="mexHttpBinding" name="SlaveMexEndpoint" contract="IMetadataExchange"/>
+        <endpoint address="" binding="netTcpBinding" bindingConfiguration="TcpStreamedBinding" name="SlaveTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.ISlaveFacade" />
+        <endpoint address="mex" binding="mexTcpBinding" name="ClientNetTcpMexEndpoint" contract="IMetadataExchange"/>
       </service>
       <service behaviorConfiguration="ServiceBehaviour" name="HeuristicLab.Hive.Server.Core.ServerConsoleFacade">
-        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="ServerConsoleHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IServerConsoleFacade" />
-        <endpoint address="mex" binding="mexHttpBinding" name="ServerConsoleMexEndpoint" contract="IMetadataExchange" />
-        <host>
-          <baseAddresses>
-            <add baseAddress="http://localhost:9000/ServerConsoleService" />
-          </baseAddresses>
-        </host>
+        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="ServerConsoleHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IServerConsoleFacade"/>
+        <endpoint address="mex" binding="mexHttpBinding" name="ServerConsoleMexEndpoint" contract="IMetadataExchange"/>
       </service>
       <service behaviorConfiguration="ServiceBehaviour" name="HeuristicLab.Hive.Server.Core.ClientFacade">
-        <!--<endpoint address="" binding="netTcpBinding" bindingConfiguration="TcpStreamedBinding" name="ClientTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" />-->
-        <endpoint binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="ClientHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" />
-        <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="" name="ClientHttpMexEndpoint" contract="IMetadataExchange" />
-        <host>
-          <baseAddresses>
-            <!--<add baseAddress="net.tcp://localhost:9001/ClientServiceStreamed" />-->
-            <add baseAddress="http://localhost:9000/ClientService" />
-          </baseAddresses>
-        </host>
+        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="ClientHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade"/>
+        <endpoint address="mex" binding="mexHttpBinding" name="ClientHttpMexEndpoint" contract="IMetadataExchange"/>
+        <endpoint address="" binding="netTcpBinding" bindingConfiguration="TcpStreamedBinding" name="ClientTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" />
+        <endpoint address="mex" binding="mexTcpBinding" name="ClientNetTcpMexEndpoint" contract="IMetadataExchange"/>
       </service>
     </services>
+    
   </system.serviceModel>
-
-
+  
   <system.webServer>
     <modules runAllManagedModulesForAllRequests="true">
-      <add name="HiveServerModule" type="HeuristicLab.Hive.Server.Core.IISModules.HiveServerModule" />
+      <add name="HiveServerModule" type="HeuristicLab.Hive.Server.Core.IISModules.HiveServerModule"/>
     </modules>
-    <directoryBrowse enabled="true" />
+    <directoryBrowse enabled="true"/>
   </system.webServer>
-
+  
 </configuration>
