Changeset 4296 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3

Timestamp:

08/23/10 17:49:43 (14 years ago)

Author:

cneumuel

Message:

corrected assembly reference paths, added some missing files

Location:

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3

Files:

• Facades/ServerConsoleFacade.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core-3.3.csproj (modified) (6 diffs)
• HeuristicLabHiveServerCorePlugin.cs (modified) (1 diff)
• ServiceLocator.cs (modified) (3 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/ServerConsoleFacade.cs

@@ -27 +27 @@
 using HeuristicLab.Hive.Contracts.BusinessObjects;
 using HeuristicLab.Hive.Contracts;
-using HeuristicLab.Security.Contracts.Interfaces;
 using HeuristicLab.Hive.Server.Core.InternalInterfaces;
 using System.ServiceModel;

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/HeuristicLab.Hive.Server.Core-3.3.csproj

@@ -78 +78 @@
   <ItemGroup>
     <Reference Include="HeuristicLab.Collections-3.3">
-      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
+      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
     </Reference>
     <Reference Include="HeuristicLab.Common-3.3">
-      <HintPath>..\..\HeuristicLab.Hive.JobBase\3.3\bin\Debug\HeuristicLab.Common-3.3.dll</HintPath>
+      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     </Reference>
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
-      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
+      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     </Reference>
     <Reference Include="HeuristicLab.Tracing-3.3">
-      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
+      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
     </Reference>
     <Reference Include="System" />
@@ -114 +114 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Authorization\HivePermissions.cs" />
-    <Compile Include="Authorization\PermissionCollection.cs" />
-    <Compile Include="Authorization\PermissionContext.cs" />
-    <Compile Include="Authorization\PermissionException.cs" />
-    <Compile Include="Authorization\Policy.cs" />
-    <Compile Include="Authorization\PolicyCollection.cs" />
     <Compile Include="CreateHiveDatabaseApplication.cs" />
     <Compile Include="SlaveCommunicator.cs" />
@@ -127 +121 @@
     <Compile Include="DefaultScheduler.cs" />
     <Compile Include="Facades\ExecutionEngineFacade.cs" />
-    <Compile Include="Authorization\HivePermissionManager.cs" />
     <Compile Include="HeuristicLabHiveServerCorePlugin.cs" />
     <Compile Include="InternalInterfaces\IHivePermissionManager.cs" />
@@ -150 +143 @@
     </None>
     <None Include="HeuristicLab.snk" />
-    <EmbeddedResource Include="Authorization\HivePermissionSet.xsd">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
     <None Include="Properties\AssemblyInfo.frame" />
     <None Include="Properties\Settings.settings">
@@ -158 +148 @@
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Authorization\HivePermissionSet.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Authorization\HivePermissionPolicy.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
@@ -186 +166 @@
       <Name>HeuristicLab.Hive.Server.LINQDataAccess-3.3</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Security.Contracts\3.3\HeuristicLab.Security.Contracts-3.3.csproj">
-      <Project>{D59E852C-F205-4647-8C05-EB9ED1CF44E9}</Project>
-      <Name>HeuristicLab.Security.Contracts-3.3</Name>
-    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Authorization\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/HeuristicLabHiveServerCorePlugin.cs

@@ -34 +34 @@
   [PluginDependency("HeuristicLab.Hive.Server.DataAccess", "3.3")]
   [PluginDependency("HeuristicLab.Hive.Server.LINQDataAccess", "3.3")]
-  [PluginDependency("HeuristicLab.Security.Contracts", "3.3")]
   [PluginDependency("HeuristicLab.Tracing", "3.3")]
   public class HeuristicLabHiveServerCorePlugin : PluginBase {

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/ServiceLocator.cs

@@ -29 +29 @@
 using HeuristicLab.DataAccess.Interfaces;
 using System.Data.SqlClient;
-using HeuristicLab.Security.Contracts.Interfaces;
 
 namespace HeuristicLab.Hive.Server.Core {
@@ -48 +47 @@
     private static IScheduler scheduler = null;
 
-    private static IPermissionManager permManager = null;
+    //private static IPermissionManager permManager = null;
 
     private static IHivePermissionManager hivePermManager = null;
@@ -134 +133 @@
     /// </summary>
     /// <returns></returns>
-    [MethodImpl(MethodImplOptions.Synchronized)]
-    public static IPermissionManager GetPermissionManager() {
-      if (permManager == null)
-        permManager = ApplicationManager.Manager.GetInstances<IPermissionManager>().First();
-      return permManager;
+    //[MethodImpl(MethodImplOptions.Synchronized)]
+    //public static IPermissionManager GetPermissionManager() {
+    //  if (permManager == null)
+    //    permManager = ApplicationManager.Manager.GetInstances<IPermissionManager>().First();
+    //  return permManager;
 
-    }
+    //}
 
     /// <summary>