Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/20/09 13:37:39 (15 years ago)
Author:
svonolfe
Message:

Created Heuristiclab DB Core (refactoring) #527

Location:
trunk/sources/HeuristicLab.Hive.Server.Core
Files:
8 edited

Legend:

Unmodified
Added
Removed

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

    r1374 r1377  
    2828using HeuristicLab.Hive.Contracts;
    2929using HeuristicLab.Core;
    30 using HeuristicLab.Hive.Server.Core.InternalInterfaces.DataAccess;
     30using HeuristicLab.Hive.Server.DataAccess;
    3131using System.Resources;
    3232using System.Reflection;

  • trunk/sources/HeuristicLab.Hive.Server.Core/ClientManager.cs

    r1121 r1377  
    2727using HeuristicLab.Hive.Contracts.BusinessObjects;
    2828using HeuristicLab.Hive.Contracts;
    29 using HeuristicLab.Hive.Server.Core.InternalInterfaces.DataAccess;
     29using HeuristicLab.Hive.Server.DataAccess;
    3030
    3131namespace HeuristicLab.Hive.Server.Core {

  • trunk/sources/HeuristicLab.Hive.Server.Core/DbTestApp.cs

    r1025 r1377  
    2727using HeuristicLab.Hive.Contracts;
    2828using HeuristicLab.Hive.Contracts.Interfaces;
    29 using HeuristicLab.Hive.Server.Core.InternalInterfaces.DataAccess;
     29using HeuristicLab.Hive.Server.DataAccess;
    3030using HeuristicLab.Hive.Contracts.BusinessObjects;
    3131using System.Diagnostics;
     32using HeuristicLab.DataAccess.Interfaces;
    3233
    3334namespace HeuristicLab.Hive.Server {
    … …  
    7071    }
    7172
    72     private void TestUserAdapter() {
    73       IUserAdapter userAdapter =
    74         ServiceLocator.GetUserAdapter();
    75 
    76       User user = new User();
    77       user.Name = "TestDummy";
    78 
    79       userAdapter.Update(user);
    80 
    81       User userRead =
    82         userAdapter.GetById(user.Id);
    83       Debug.Assert(
    84         userRead != null &&
    85         user.Id == userRead.Id);
    86 
    87       user.Password = "passme";
    88       userAdapter.Update(user);
    89       userRead =
    90         userAdapter.GetByName(user.Name);
    91       Debug.Assert(
    92        userRead != null &&
    93        userRead.Name == user.Name &&
    94        userRead.Password == user.Password);
    95 
    96       ICollection<User> users =
    97        userAdapter.GetAll();
    98       int count = users.Count;
    99 
    100       userAdapter.Delete(user);
    101 
    102       users = userAdapter.GetAll();
    103       Debug.Assert(count - 1 == users.Count);
    104     }
    105 
    106     private void TestUserGroupAdapter() {
    107       IUserGroupAdapter userGroupAdapter =
    108        ServiceLocator.GetUserGroupAdapter();
    109 
    110       User user =
    111         new User();
    112       user.Name = "Stefan";
    113 
    114       User user2 =
    115         new User();
    116       user2.Name = "Martin";
    117 
    118       User user3 =
    119         new User();
    120       user3.Name = "Heinz";
    121 
    122       UserGroup group =
    123         new UserGroup();
    124 
    125       UserGroup subGroup =
    126         new UserGroup();
    127       subGroup.Members.Add(user);
    128 
    129       group.Members.Add(user3);
    130       group.Members.Add(user2);
    131       group.Members.Add(subGroup);
    132 
    133       userGroupAdapter.Update(group);
    134 
    135       UserGroup read =
    136         userGroupAdapter.GetById(group.Id);
    137 
    138       ICollection<UserGroup> userGroups =
    139         userGroupAdapter.GetAll();
    140 
    141       IUserAdapter userAdapter =
    142         ServiceLocator.GetUserAdapter();
    143 
    144       userAdapter.Delete(user3);
    145      
    146       read =
    147          userGroupAdapter.GetById(group.Id);
    148 
    149       userGroupAdapter.Delete(subGroup);
    150 
    151       read =
    152          userGroupAdapter.GetById(group.Id);
    153 
    154       userGroups =
    155         userGroupAdapter.GetAll();
    156 
    157       userGroupAdapter.Delete(group);
    158 
    159       userGroups =
    160         userGroupAdapter.GetAll();
    161 
    162       userAdapter.Delete(user);
    163       userAdapter.Delete(user2);
    164     }
    165 
    16673    private void TestClientGroupAdapter() {
    16774      IClientGroupAdapter clientGroupAdapter =
    … …  
    301208
    302209    public override void Run() {
    303       ITransactionManager transactionManager =
    304         ServiceLocator.GetTransactionManager();
     210      IDBSynchronizer transactionManager =
     211        ServiceLocator.GetDBSynchronizer();
    305212     
    306213      TestClientAdapter();
    307214      transactionManager.UpdateDB();
    308215
    309       TestUserAdapter();
    310       transactionManager.UpdateDB();
    311 
    312       TestUserGroupAdapter();
    313       transactionManager.UpdateDB();
    314 
    315216      TestClientGroupAdapter();
    316217      transactionManager.UpdateDB();   

  • trunk/sources/HeuristicLab.Hive.Server.Core/HeuristicLab.Hive.Server.Core.csproj

    r1272 r1377  
    7373    <Compile Include="HiveServerCorePlugin.cs" />
    7474    <Compile Include="HiveServerMessages.Designer.cs" />
    75     <Compile Include="InternalInterfaces\DataAccess\IClientAdapter.cs" />
    76     <Compile Include="InternalInterfaces\DataAccess\IClientGroupAdapter.cs" />
    77     <Compile Include="InternalInterfaces\DataAccess\IDataAdapter.cs" />
    78     <Compile Include="InternalInterfaces\DataAccess\IJobAdapter.cs" />
    79     <Compile Include="InternalInterfaces\DataAccess\IJobResultsAdapter.cs" />
    80     <Compile Include="InternalInterfaces\DataAccess\IPermissionOwnerAdapter.cs" />
    81     <Compile Include="InternalInterfaces\DataAccess\IResourceAdapter.cs" />
    82     <Compile Include="InternalInterfaces\DataAccess\IUserAdapter.cs" />
    83     <Compile Include="InternalInterfaces\DataAccess\IUserGroupAdapter.cs" />
    8475    <Compile Include="InternalInterfaces\IInternalJobManager.cs" />
    8576    <Compile Include="InternalInterfaces\IScheduler.cs" />
    … …  
    8980    <Compile Include="ServerConsoleFacade.cs" />
    9081    <Compile Include="ServiceLocator.cs" />
    91     <Compile Include="UserRoleManager.cs" />
    9282  </ItemGroup>
    9383  <ItemGroup>
    … …  
    10090      <Name>HeuristicLab.Core</Name>
    10191    </ProjectReference>
     92    <ProjectReference Include="..\HeuristicLab.DataAccess\HeuristicLab.DataAccess.csproj">
     93      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
     94      <Name>HeuristicLab.DataAccess</Name>
     95    </ProjectReference>
    10296    <ProjectReference Include="..\HeuristicLab.Hive.Contracts\HeuristicLab.Hive.Contracts.csproj">
    10397      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
    … …  
    107101      <Project>{21187322-52DD-4243-80A4-A85F0263E63B}</Project>
    108102      <Name>HeuristicLab.Hive.JobBase</Name>
     103    </ProjectReference>
     104    <ProjectReference Include="..\HeuristicLab.Hive.Server.DataAccess\HeuristicLab.Hive.Server.DataAccess.csproj">
     105      <Project>{4D5A2A16-66C2-431D-9AA3-BD3041E64B84}</Project>
     106      <Name>HeuristicLab.Hive.Server.DataAccess</Name>
    109107    </ProjectReference>
    110108    <ProjectReference Include="..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">

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

    r1172 r1377  
    2727using HeuristicLab.Hive.Contracts.BusinessObjects;
    2828using HeuristicLab.Hive.Contracts;
    29 using HeuristicLab.Hive.Server.Core.InternalInterfaces.DataAccess;
     29using HeuristicLab.Hive.Server.DataAccess;
    3030using HeuristicLab.Hive.Server.Core.InternalInterfaces;
    3131

  • trunk/sources/HeuristicLab.Hive.Server.Core/LifecycleManager.cs

    r1133 r1377  
    2525using System.Text;
    2626using HeuristicLab.Hive.Contracts.Interfaces;
    27 using HeuristicLab.Hive.Server.Core.InternalInterfaces.DataAccess;
     27using HeuristicLab.Hive.Server.DataAccess;
    2828using System.Timers;
     29using HeuristicLab.DataAccess.Interfaces;
    2930
    3031namespace HeuristicLab.Hive.Server.Core {
    … …  
    6465    }
    6566
    66     public ITransactionManager GetTransactionManager() {
    67       return ServiceLocator.GetTransactionManager();
     67    public IDBSynchronizer GetDBSynchronizer() {
     68      return ServiceLocator.GetDBSynchronizer();
    6869    }
    6970
    7071    public void Shutdown() {
    71       ServiceLocator.GetTransactionManager().UpdateDB();
     72      ServiceLocator.GetDBSynchronizer().UpdateDB();
    7273
    7374      if (OnShutdown != null)

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

    r1172 r1377  
    3535    private IJobManager jobManager =
    3636      ServiceLocator.GetJobManager();
    37 
    38     private IUserRoleManager userRoleManager =
    39       ServiceLocator.GetUserRoleManager();
    4037
    4138    private String loginName = null;
    … …  
    103100
    104101    #endregion
    105 
    106     #region IUserRoleManager Members
    107 
    108     public ResponseList<HeuristicLab.Hive.Contracts.BusinessObjects.User> GetAllUsers() {
    109       return userRoleManager.GetAllUsers();
    110     }
    111 
    112     public ResponseObject<User> AddNewUser(User user) {
    113       return userRoleManager.AddNewUser(user);
    114     }
    115 
    116     public ResponseList<UserGroup> GetAllUserGroups() {
    117       return userRoleManager.GetAllUserGroups();
    118     }
    119 
    120     public Response RemoveUser(long userId) {
    121       return userRoleManager.RemoveUser(userId);
    122     }
    123 
    124     public ResponseObject<UserGroup> AddNewUserGroup(UserGroup userGroup) {
    125       return userRoleManager.AddNewUserGroup(userGroup);
    126     }
    127 
    128     public Response RemoveUserGroup(long groupId) {
    129       return userRoleManager.RemoveUserGroup(groupId);
    130     }
    131 
    132     public Response AddUserToGroup(long groupId, long userId) {
    133       return userRoleManager.AddUserToGroup(groupId, userId);
    134     }
    135 
    136     public Response AddUserGroupToGroup(long groupId, long groupToAddId) {
    137       return userRoleManager.AddUserGroupToGroup(groupId, groupToAddId);
    138     }
    139 
    140     public Response RemovePermissionOwnerFromGroup(long groupId, long userId) {
    141       return userRoleManager.RemovePermissionOwnerFromGroup(groupId, userId);
    142     }
    143 
    144     #endregion
    145 
    146102  }
    147103}

  • trunk/sources/HeuristicLab.Hive.Server.Core/ServiceLocator.cs

    r1272 r1377  
    2020#endregion
    2121
    22 using HeuristicLab.Hive.Server.Core.InternalInterfaces.DataAccess;
     22using HeuristicLab.Hive.Server.DataAccess;
    2323using HeuristicLab.PluginInfrastructure;
    2424using System.Runtime.CompilerServices;
    … …  
    2626using HeuristicLab.Hive.Server.Core;
    2727using HeuristicLab.Hive.Server.Core.InternalInterfaces;
     28using HeuristicLab.DataAccess.Interfaces;
    2829
    2930/// <summary>
    … …  
    3435    new DiscoveryService();
    3536
    36   private static ITransactionManager transManager = null;
     37  private static IDBSynchronizer transManager = null;
    3738
    3839  private static IClientManager clientManager = null;
    3940
    4041  private static IJobManager jobManager = null;
    41 
    42   private static IUserRoleManager userRoleManager = null;
    4342
    4443  private static IClientCommunicator clientCommunicator = null;
    … …  
    5150
    5251  private static IResourceAdapter resourceAdapter = null;
    53 
    54   private static IUserAdapter userAdapter = null;
    55 
    56   private static IUserGroupAdapter userGroupAdapter = null;
    57 
    58   private static IPermissionOwnerAdapter permOwnerAdapter = null;
    5952
    6053  private static IJobAdapter jobAdapter = null;
    … …  
    7063  /// <returns></returns>
    7164  [MethodImpl(MethodImplOptions.Synchronized)]
    72   public static ITransactionManager GetTransactionManager() {
     65  public static IDBSynchronizer GetDBSynchronizer() {
    7366    if (transManager == null) {
    74       transManager = discoveryService.GetInstances<ITransactionManager>()[0];
     67      transManager = discoveryService.GetInstances<IDBSynchronizer>()[0];
    7568    }
    7669
    … …  
    10093
    10194    return jobManager;
    102   }
    103 
    104   /// <summary>
    105   /// Gets the user role manager
    106   /// </summary>
    107   /// <returns></returns>
    108   [MethodImpl(MethodImplOptions.Synchronized)]
    109   public static IUserRoleManager GetUserRoleManager() {
    110     if (userRoleManager == null)
    111       userRoleManager = new UserRoleManager();
    112 
    113     return userRoleManager;
    11495  }
    11596
    … …  
    179160
    180161  /// <summary>
    181   /// Gets the user database adapter
    182   /// </summary>
    183   /// <returns></returns>
    184   [MethodImpl(MethodImplOptions.Synchronized)]
    185   public static IUserAdapter GetUserAdapter() {
    186     if (userAdapter == null) {
    187       userAdapter = discoveryService.GetInstances<IUserAdapter>()[0];
    188     }
    189 
    190     return userAdapter;
    191   }
    192 
    193   /// <summary>
    194   /// Gets the user group database adapter
    195   /// </summary>
    196   /// <returns></returns>
    197   [MethodImpl(MethodImplOptions.Synchronized)]
    198   public static IUserGroupAdapter GetUserGroupAdapter() {
    199     if (userGroupAdapter == null) {
    200       userGroupAdapter = discoveryService.GetInstances<IUserGroupAdapter>()[0];
    201     }
    202 
    203     return userGroupAdapter;
    204   }
    205 
    206   /// <summary>
    207   /// Gets the permission owner database adapter
    208   /// </summary>
    209   /// <returns></returns>
    210   [MethodImpl(MethodImplOptions.Synchronized)]
    211   public static IPermissionOwnerAdapter GetPermissionOwnerAdapter() {
    212     if (permOwnerAdapter == null) {
    213       permOwnerAdapter = discoveryService.GetInstances<IPermissionOwnerAdapter>()[0];
    214     }
    215 
    216     return permOwnerAdapter;
    217   }
    218 
    219   /// <summary>
    220162  /// Gets the job database adapter
    221163  /// </summary>
Note: See TracChangeset for help on using the changeset viewer.