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

Timestamp:

08/02/10 17:27:24 (14 years ago)

Author:

cneumuel

Message:

• Made HiveExperiment storable, so that a running HiveExperiment can be disconnected, stored and later resumed. (#1115)
• Added Log to each JobItem (#1115)

Location:

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

Files:

• ClientCommunicator.cs (modified) (1 diff)
• ClientManager.cs (modified) (3 diffs)
• Facades/ServerConsoleFacade.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core-3.3.csproj (modified) (2 diffs)
• Properties/AssemblyInfo.cs (modified) (1 diff)
• SpringTransaction.cs (deleted)

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

@@ -584 +584 @@
       response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOBRESULT_RECEIVED;
       response.JobId = jobId;
-      response.finished = finished;
+      response.Finished = finished;
 
       Logger.Info("END Job received for Storage - SUB method: " + jobId);

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

@@ -168 +168 @@
     }
 
-    public ResponseObject<List<ClientGroup>> GetAllGroupsOfResource(Guid resourceId) {
-      ResponseObject<List<ClientGroup>> response = new ResponseObject<List<ClientGroup>>();
+    public ResponseObject<ClientGroupDtoList> GetAllGroupsOfResource(Guid resourceId) {
+      ResponseObject<ClientGroupDtoList> response = new ResponseObject<ClientGroupDtoList>();
 
       ClientDto client = DaoLocator.ClientDao.FindById(resourceId);
       if (client != null) {
-        List<ClientGroup> groupsOfClient = new List<ClientGroup>(DaoLocator.ClientGroupDao.MemberOf(client));
+        ClientGroupDtoList groupsOfClient = new ClientGroupDtoList(DaoLocator.ClientGroupDao.MemberOf(client));
         response.Obj = groupsOfClient;
         response.Success = true;
@@ -179 +179 @@
       }
       else {
-        response.Obj = new List<ClientGroup>();
+        response.Obj = new ClientGroupDtoList();
         response.Success = false;
         response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_RESOURCE_NOT_FOUND;
@@ -217 +217 @@
     }
     #endregion
-  }
+ }
 }

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

@@ -184 +184 @@
     }
 
-    public ResponseObject<List<ClientGroupDto>> GetAllGroupsOfResource(Guid resourceId) {
+    public ResponseObject<ClientGroupDtoList> GetAllGroupsOfResource(Guid resourceId) {
       using (contextFactory.GetContext()) {
         secMan.Authorize("AccessUserGroup", sessionID, Guid.Empty);

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

@@ -76 +76 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Collections-3.3">
+      <HintPath>..\..\..\..\..\..\..\..\..\Programme\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>
+    </Reference>
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
@@ -136 +142 @@
     </Compile>
     <Compile Include="Settings.cs" />
-    <Compile Include="SpringTransaction.cs" />
   </ItemGroup>
   <ItemGroup>

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

@@ -55 +55 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.3.0.4120")]
-[assembly: AssemblyFileVersion("3.3.0.4120")]
-[assembly: AssemblyBuildDate("2010/07/30 13:39:26")]
+[assembly: AssemblyVersion("3.3.0.4121")]
+[assembly: AssemblyFileVersion("3.3.0.4121")]
+[assembly: AssemblyBuildDate("2010/08/02 17:23:55")]