Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/22/10 17:13:27 (14 years ago)
Author:
cneumuel
Message:

#1233

  • added plugin management features
  • took over client-GUI from old branch
  • merged with bugfixes from old branch
  • added hive-web (for IIS)
Location:
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New
Files:
2 added
2 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New

    • Property svn:ignore

      •  

        old new  
        11*.suo
         2Tests

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/HiveItemBase.cs

    r4796 r4905  
    1010  [DataContract]
    1111  [Serializable]
    12   public abstract class HiveItemBase : DeepCloneable {
     12  public abstract class HiveItemBase : IDeepCloneable {
    1313    protected HiveItemBase() { }
    14     protected HiveItemBase(HiveItemBase original, Cloner cloner) : base(original, cloner) { }
     14    protected HiveItemBase(HiveItemBase original, Cloner cloner) {
     15      cloner.RegisterClonedObject(original, this);
     16    }
     17
     18    public abstract IDeepCloneable Clone(Cloner cloner);
     19
     20    public object Clone() {
     21      return Clone(new Cloner());
     22    }
    1523  }
    1624}

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/Job.cs

    r4796 r4905  
    4040    [DataMember]
    4141    public Guid? ProjectId { get; set; }
     42    [DataMember]
     43    public List<Guid> PluginsNeededIds { get; set; }
    4244
    4345    public Job() { }
    … …  
    4850      this.MemoryNeeded = original.MemoryNeeded;
    4951      this.ProjectId = original.ProjectId;
     52      this.PluginsNeededIds = new List<Guid>(original.PluginsNeededIds);
    5053    }
    5154    public override IDeepCloneable Clone(Cloner cloner) {
    … …  
    5659      return string.Format("State: {0}, SlaveId: {1}, DateCreated: {2}, DateCalculated: {3}, CoresNeeded: {4}, MemoryNeeded: {5}", JobState, SlaveId, DateCreated, DateCalculated, CoresNeeded, MemoryNeeded);
    5760    }
     61
    5862  }
    5963}

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/HeuristicLab.Services.Hive.Common-3.3.csproj

    r4649 r4905  
    6868    <Compile Include="DataTransfer\HiveItem.cs" />
    6969    <Compile Include="DataTransfer\HiveItemBase.cs" />
    70     <Compile Include="DataTransfer\HivePluginData.cs" />
    71     <Compile Include="DataTransfer\HivePlugin.cs" />
     70    <Compile Include="DataTransfer\PluginData.cs" />
     71    <Compile Include="DataTransfer\Plugin.cs" />
    7272    <Compile Include="DataTransfer\Job.cs" />
    7373    <Compile Include="DataTransfer\LightweightJob.cs" />

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/MessageContainer.cs

    r4796 r4905  
    3131  [StorableClass]
    3232  [Serializable]
    33   public class MessageContainer : DeepCloneable {
     33  public class MessageContainer : IDeepCloneable {
    3434
    3535    public enum MessageType {
    … …  
    6969      JobId = jobId;
    7070    }
    71     protected MessageContainer(MessageContainer original, Cloner cloner) : base(original, cloner) {
     71    protected MessageContainer(MessageContainer original, Cloner cloner) {
     72      cloner.RegisterClonedObject(original, this);
    7273      this.Message = original.Message;
    7374      this.JobId = original.JobId;
    7475    }
    75     public override IDeepCloneable Clone(Cloner cloner) {
     76    public virtual IDeepCloneable Clone(Cloner cloner) {
    7677      return new MessageContainer(this, cloner);
     78    }
     79    public object Clone() {
     80      return Clone(new Cloner());
    7781    }
    7882  }

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/ServiceContracts/IHiveService.cs

    r4649 r4905  
    1515    #region Job Methods
    1616    [OperationContract]
    17     Guid AddJob(Job jobDto, JobData jobDataDto);
     17    Guid AddJob(Job job, JobData jobData);
    1818
    1919    [OperationContract]
    20     Guid AddChildJob(Guid parentJobId, Job jobDto, JobData jobDataDto);
     20    Guid AddChildJob(Guid parentJobId, Job job, JobData jobData);
    2121
    2222    [OperationContract] // formerly GetJobById
    … …  
    7878
    7979    [OperationContract]
    80     Job PauseJob(JobData serializedJob);
     80    Job PauseJob(Guid jobId);
    8181    #endregion
    8282
    … …  
    138138    #region Plugin Methods
    139139    [OperationContract]
    140     IEnumerable<HivePluginData> GetPlugins(List<HivePlugin> pluginList);
     140    IEnumerable<PluginData> GetPluginDatas(List<Guid> pluginIds);
    141141    [OperationContract]
    142     Stream GetStreamedPlugins(List<HivePlugin> pluginList);
     142    Stream GetStreamedPluginDatas(List<Guid> pluginIds);
     143    [OperationContract]
     144    IEnumerable<Plugin> GetAvailablePlugins();
     145    [OperationContract]
     146    Guid AddPlugin(Plugin plugin, List<PluginData> pluginData);
    143147    #endregion
    144148
Note: See TracChangeset for help on using the changeset viewer.