Changeset 4141 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts

Timestamp:

08/04/10 10:44:14 (14 years ago)

Author:

cneumuel

Message:

merged with changes from Hive-3.2

Location:

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3

Files:

• ApplicationConstants.cs (modified) (1 diff)
• BusinessObjects/ClientDto.cs (modified) (1 diff)
• BusinessObjects/HivePluginInfoDto.cs (modified) (2 diffs)
• BusinessObjects/JobDto.cs (modified) (3 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/ApplicationConstants.cs

@@ -87 +87 @@
     public static string RESPONSE_COMMUNICATOR_SEND_JOBRESULT = "Please send the Jobresult to the server";
     public static string RESPONSE_COMMUNICATOR_PLUGINS_SENT = "Communicator.PluginsSent";
+    public static string RESPONSE_COMMUNICATOR_PLUGINS_NOT_AVAIL = "Communicator.PluginsNotAvail";
     public static string RESPONSE_COMMUNICATOR_JOB_WAS_ABORTED = "Job was aborted";
 

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/BusinessObjects/ClientDto.cs

@@ -27 +27 @@
 using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-                                   
+
 namespace HeuristicLab.Hive.Contracts.BusinessObjects {
 
-  public enum State { NullState, Idle, Calculating, Offline, Finished, Abort, RequestSnapshot, RequestSnapshotSent, Pending };
+  public enum State { NullState, Idle, Calculating, Offline, Finished, Abort, RequestSnapshot, RequestSnapshotSent, Pending, Failed };
   public enum CalendarState { Fetch, ForceFetch, Fetching, Fetched, NotAllowedToFetch };
 

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/BusinessObjects/HivePluginInfoDto.cs

@@ -45 +45 @@
     private string storableVersion;
 
+    [Storable]
+    [DataMember]
+    public Boolean Update { get; set; }
+
     public HivePluginInfoDto() { }
 
@@ -64 +68 @@
       clone.Name = this.Name;
       clone.Version = (Version)this.Version.Clone();
+      clone.Update = this.Update;
       return clone;
     }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/BusinessObjects/JobDto.cs

@@ -53 +53 @@
     [Storable]
     [DataMember]
+    public String Exception { get; set; }
+    [Storable]
+    [DataMember]
     public DateTime? DateCreated { get; set; }
     [Storable]
@@ -79 +82 @@
     public ProjectDto Project { get; set; }
 
+    
+
     public override string ToString() {
       return base.ToString() + "State: " + State + ", [Ressource : " + Client + " ] , DateCreated: " + DateCreated + ", DateCalculated: " + DateCalculated +
@@ -98 +103 @@
       clone.DateCreated = this.DateCreated;
       clone.DateFinished = this.DateFinished;
+      clone.Exception = this.Exception;
       clone.Id = this.Id;
       clone.MemoryNeeded = this.MemoryNeeded;