Changeset 5602 for branches/HeuristicLab.Hive-3.4
- Timestamp:
- 03/03/11 17:28:03 (14 years ago)
- Location:
- branches/HeuristicLab.Hive-3.4/sources
- Files:
-
- 10 added
- 1 deleted
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Tests/Mocks/MockHiveService.cs
r5599 r5602 207 207 } 208 208 209 public List<HiveExperiment> GetAllHiveExperiments() { 210 return hiveExperiments; 211 } 212 209 213 public void UpdateHiveExperiment(HiveExperiment hiveExperimentDto) { 210 214 // do nothing … … 337 341 } 338 342 #endregion 343 339 344 } 340 345 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/HeuristicLab.Clients.Hive.Slave.Views-3.4.csproj
r5599 r5602 125 125 </ItemGroup> 126 126 <ItemGroup> 127 <Compile Include="Properties\Resources.Designer.cs"> 128 <AutoGen>True</AutoGen> 129 <DesignTime>True</DesignTime> 130 <DependentUpon>Resources.resx</DependentUpon> 131 </Compile> 132 <Compile Include="SlaveAboutDialog.cs"> 133 <SubType>Form</SubType> 134 </Compile> 135 <Compile Include="SlaveAboutDialog.Designer.cs"> 136 <DependentUpon>SlaveAboutDialog.cs</DependentUpon> 137 </Compile> 127 138 <Compile Include="SlaveItem.cs" /> 128 139 <None Include="Properties\AssemblyInfo.cs.frame" /> … … 147 158 </ItemGroup> 148 159 <ItemGroup> 160 <EmbeddedResource Include="Properties\Resources.resx"> 161 <Generator>ResXFileCodeGenerator</Generator> 162 <LastGenOutput>Resources.Designer.cs</LastGenOutput> 163 </EmbeddedResource> 164 <EmbeddedResource Include="SlaveAboutDialog.resx"> 165 <DependentUpon>SlaveAboutDialog.cs</DependentUpon> 166 </EmbeddedResource> 149 167 <EmbeddedResource Include="SlaveView.resx"> 150 168 <DependentUpon>SlaveView.cs</DependentUpon> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveView.Designer.cs
r5599 r5602 51 51 this.btnRestart = new System.Windows.Forms.Button(); 52 52 this.btnSleep = new System.Windows.Forms.Button(); 53 this.btnAbout = new System.Windows.Forms.Button(); 53 54 this.SuspendLayout(); 54 55 // … … 56 57 // 57 58 this.label1.AutoSize = true; 58 this.label1.Location = new System.Drawing.Point( 40, 24);59 this.label1.Location = new System.Drawing.Point(17, 24); 59 60 this.label1.Name = "label1"; 60 61 this.label1.Size = new System.Drawing.Size(85, 13); … … 75 76 // btnPauseAll 76 77 // 77 this.btnPauseAll.Location = new System.Drawing.Point( 390, 24);78 this.btnPauseAll.Location = new System.Drawing.Point(455, 24); 78 79 this.btnPauseAll.Name = "btnPauseAll"; 79 80 this.btnPauseAll.Size = new System.Drawing.Size(111, 23); … … 85 86 // btnStopAll 86 87 // 87 this.btnStopAll.Location = new System.Drawing.Point( 390, 53);88 this.btnStopAll.Location = new System.Drawing.Point(455, 53); 88 89 this.btnStopAll.Name = "btnStopAll"; 89 90 this.btnStopAll.Size = new System.Drawing.Size(111, 23); … … 95 96 // btnRestart 96 97 // 97 this.btnRestart.Location = new System.Drawing.Point( 390, 111);98 this.btnRestart.Location = new System.Drawing.Point(455, 111); 98 99 this.btnRestart.Name = "btnRestart"; 99 100 this.btnRestart.Size = new System.Drawing.Size(111, 23); … … 105 106 // btnSleep 106 107 // 107 this.btnSleep.Location = new System.Drawing.Point( 390, 82);108 this.btnSleep.Location = new System.Drawing.Point(455, 82); 108 109 this.btnSleep.Name = "btnSleep"; 109 110 this.btnSleep.Size = new System.Drawing.Size(111, 23); … … 113 114 this.btnSleep.Click += new System.EventHandler(this.btnSleep_Click); 114 115 // 116 // btnAbout 117 // 118 this.btnAbout.Location = new System.Drawing.Point(455, 140); 119 this.btnAbout.Name = "btnAbout"; 120 this.btnAbout.Size = new System.Drawing.Size(111, 23); 121 this.btnAbout.TabIndex = 6; 122 this.btnAbout.Text = "About Hive"; 123 this.btnAbout.UseVisualStyleBackColor = true; 124 this.btnAbout.Click += new System.EventHandler(this.btnAbout_Click); 125 // 115 126 // SlaveView 116 127 // 117 128 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 118 129 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 130 this.Controls.Add(this.btnAbout); 119 131 this.Controls.Add(this.btnSleep); 120 132 this.Controls.Add(this.btnRestart); … … 138 150 private System.Windows.Forms.Button btnRestart; 139 151 private System.Windows.Forms.Button btnSleep; 152 private System.Windows.Forms.Button btnAbout; 140 153 } 141 154 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveView.cs
r5599 r5602 113 113 Content.Sleep(); 114 114 } 115 116 private void btnAbout_Click(object sender, System.EventArgs e) { 117 SlaveAboutDialog diag = new SlaveAboutDialog(); 118 diag.ShowDialog(); 119 } 115 120 } 116 121 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/Administration/HiveAdministrationView.cs
r5538 r5602 25 25 using HeuristicLab.Core.Views; 26 26 using HeuristicLab.MainForm; 27 using HeuristicLab.Services.Hive.Common.DataTransfer;28 27 29 28 namespace HeuristicLab.Clients.Hive.Views.Administration { -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/Administration/HiveAdministrationClient.cs
r5599 r5602 31 31 public List<Slave> Slaves; 32 32 public List<string> Users; 33 public List<HiveExperiment> Experiments; 33 34 34 35 public HiveAdministrationClient() { … … 59 60 SlaveGroups = new List<SlaveGroup>(service.GetSlaveGroups()); 60 61 Slaves = new List<Slave>(service.GetSlaves()); 61 OnItemImageChanged();62 Experiments = new List<HiveExperiment>(service.GetAllHiveExperiments()); 62 63 }); 63 64 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HeuristicLab.Clients.Hive-3.4.csproj
r5599 r5602 142 142 <None Include="Properties\AssemblyInfo.cs.frame" /> 143 143 <Compile Include="Exceptions\ServiceClientFactoryException.cs" /> 144 <Compile Include="ServiceClients\StateLog.cs" /> 145 <Compile Include="ServiceClients\HiveExperiment.cs" /> 146 <Compile Include="ServiceClients\SlaveGroup.cs" /> 147 <Compile Include="ServiceClients\Slave.cs" /> 144 148 <Compile Include="ServiceClients\LightweightJob.cs" /> 145 149 <Compile Include="ServiceClients\ExecutorMessageContainer.cs" /> … … 161 165 </None> 162 166 </ItemGroup> 163 <ItemGroup> 164 <Folder Include="Slave\" /> 165 </ItemGroup> 167 <ItemGroup /> 166 168 <ItemGroup> 167 169 <ProjectReference Include="..\..\HeuristicLab.Hive\3.4\HeuristicLab.Hive-3.4.csproj"> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveServiceClient.cs
r5599 r5602 14 14 using System; 15 15 16 17 [System.Diagnostics.DebuggerStepThroughAttribute()]18 [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]19 [System.Runtime.Serialization.DataContractAttribute(Name="Slave", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.Common.DataTra" +20 "nsfer")]21 [System.SerializableAttribute()]22 public partial class Slave : HeuristicLab.Clients.Hive.Resource23 {24 25 [System.Runtime.Serialization.OptionalFieldAttribute()]26 private System.Nullable<int> CoresField;27 28 [System.Runtime.Serialization.OptionalFieldAttribute()]29 private HeuristicLab.Clients.Hive.CpuArchitecture CpuArchitectureField;30 31 [System.Runtime.Serialization.OptionalFieldAttribute()]32 private System.Nullable<int> CpuSpeedField;33 34 [System.Runtime.Serialization.OptionalFieldAttribute()]35 private System.Nullable<int> FreeCoresField;36 37 [System.Runtime.Serialization.OptionalFieldAttribute()]38 private System.Nullable<int> FreeMemoryField;39 40 [System.Runtime.Serialization.OptionalFieldAttribute()]41 private bool IsAllowedToCalculateField;42 43 [System.Runtime.Serialization.OptionalFieldAttribute()]44 private System.Nullable<System.DateTime> LastHeartbeatField;45 46 [System.Runtime.Serialization.OptionalFieldAttribute()]47 private System.Nullable<int> MemoryField;48 49 [System.Runtime.Serialization.OptionalFieldAttribute()]50 private string OperatingSystemField;51 52 [System.Runtime.Serialization.OptionalFieldAttribute()]53 private HeuristicLab.Clients.Hive.SlaveState SlaveStateField;54 55 [System.Runtime.Serialization.DataMemberAttribute()]56 public System.Nullable<int> Cores57 {58 get59 {60 return this.CoresField;61 }62 set63 {64 if ((this.CoresField.Equals(value) != true))65 {66 this.CoresField = value;67 this.RaisePropertyChanged("Cores");68 }69 }70 }71 72 [System.Runtime.Serialization.DataMemberAttribute()]73 public HeuristicLab.Clients.Hive.CpuArchitecture CpuArchitecture74 {75 get76 {77 return this.CpuArchitectureField;78 }79 set80 {81 if ((this.CpuArchitectureField.Equals(value) != true))82 {83 this.CpuArchitectureField = value;84 this.RaisePropertyChanged("CpuArchitecture");85 }86 }87 }88 89 [System.Runtime.Serialization.DataMemberAttribute()]90 public System.Nullable<int> CpuSpeed91 {92 get93 {94 return this.CpuSpeedField;95 }96 set97 {98 if ((this.CpuSpeedField.Equals(value) != true))99 {100 this.CpuSpeedField = value;101 this.RaisePropertyChanged("CpuSpeed");102 }103 }104 }105 106 [System.Runtime.Serialization.DataMemberAttribute()]107 public System.Nullable<int> FreeCores108 {109 get110 {111 return this.FreeCoresField;112 }113 set114 {115 if ((this.FreeCoresField.Equals(value) != true))116 {117 this.FreeCoresField = value;118 this.RaisePropertyChanged("FreeCores");119 }120 }121 }122 123 [System.Runtime.Serialization.DataMemberAttribute()]124 public System.Nullable<int> FreeMemory125 {126 get127 {128 return this.FreeMemoryField;129 }130 set131 {132 if ((this.FreeMemoryField.Equals(value) != true))133 {134 this.FreeMemoryField = value;135 this.RaisePropertyChanged("FreeMemory");136 }137 }138 }139 140 [System.Runtime.Serialization.DataMemberAttribute()]141 public bool IsAllowedToCalculate142 {143 get144 {145 return this.IsAllowedToCalculateField;146 }147 set148 {149 if ((this.IsAllowedToCalculateField.Equals(value) != true))150 {151 this.IsAllowedToCalculateField = value;152 this.RaisePropertyChanged("IsAllowedToCalculate");153 }154 }155 }156 157 [System.Runtime.Serialization.DataMemberAttribute()]158 public System.Nullable<System.DateTime> LastHeartbeat159 {160 get161 {162 return this.LastHeartbeatField;163 }164 set165 {166 if ((this.LastHeartbeatField.Equals(value) != true))167 {168 this.LastHeartbeatField = value;169 this.RaisePropertyChanged("LastHeartbeat");170 }171 }172 }173 174 [System.Runtime.Serialization.DataMemberAttribute()]175 public System.Nullable<int> Memory176 {177 get178 {179 return this.MemoryField;180 }181 set182 {183 if ((this.MemoryField.Equals(value) != true))184 {185 this.MemoryField = value;186 this.RaisePropertyChanged("Memory");187 }188 }189 }190 191 [System.Runtime.Serialization.DataMemberAttribute()]192 public string OperatingSystem193 {194 get195 {196 return this.OperatingSystemField;197 }198 set199 {200 if ((object.ReferenceEquals(this.OperatingSystemField, value) != true))201 {202 this.OperatingSystemField = value;203 this.RaisePropertyChanged("OperatingSystem");204 }205 }206 }207 208 [System.Runtime.Serialization.DataMemberAttribute()]209 public HeuristicLab.Clients.Hive.SlaveState SlaveState210 {211 get212 {213 return this.SlaveStateField;214 }215 set216 {217 if ((this.SlaveStateField.Equals(value) != true))218 {219 this.SlaveStateField = value;220 this.RaisePropertyChanged("SlaveState");221 }222 }223 }224 }225 16 226 17 [System.Diagnostics.DebuggerStepThroughAttribute()] … … 239 30 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Plugin))] 240 31 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Resource))] 32 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Slave))] 241 33 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.SlaveGroup))] 242 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Slave))]243 34 public partial class HiveItemBase : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged 244 35 { … … 353 144 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Plugin))] 354 145 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Resource))] 146 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Slave))] 355 147 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.SlaveGroup))] 356 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Slave))]357 148 public partial class HiveItem : HeuristicLab.Clients.Hive.HiveItemBase 358 149 { … … 824 615 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Plugin))] 825 616 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Resource))] 617 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Slave))] 826 618 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.SlaveGroup))] 827 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Slave))]828 619 public partial class NamedHiveItem : HeuristicLab.Clients.Hive.HiveItem 829 620 { … … 1073 864 "nsfer")] 1074 865 [System.SerializableAttribute()] 866 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Slave))] 1075 867 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.SlaveGroup))] 1076 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Slave))]1077 868 public partial class Resource : HeuristicLab.Clients.Hive.NamedHiveItem 1078 869 { … … 1094 885 this.ParentResourceIdField = value; 1095 886 this.RaisePropertyChanged("ParentResourceId"); 887 } 888 } 889 } 890 } 891 892 [System.Diagnostics.DebuggerStepThroughAttribute()] 893 [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] 894 [System.Runtime.Serialization.DataContractAttribute(Name="Slave", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.Common.DataTra" + 895 "nsfer")] 896 [System.SerializableAttribute()] 897 public partial class Slave : HeuristicLab.Clients.Hive.Resource 898 { 899 900 [System.Runtime.Serialization.OptionalFieldAttribute()] 901 private System.Nullable<int> CoresField; 902 903 [System.Runtime.Serialization.OptionalFieldAttribute()] 904 private HeuristicLab.Clients.Hive.CpuArchitecture CpuArchitectureField; 905 906 [System.Runtime.Serialization.OptionalFieldAttribute()] 907 private System.Nullable<int> CpuSpeedField; 908 909 [System.Runtime.Serialization.OptionalFieldAttribute()] 910 private System.Nullable<int> FreeCoresField; 911 912 [System.Runtime.Serialization.OptionalFieldAttribute()] 913 private System.Nullable<int> FreeMemoryField; 914 915 [System.Runtime.Serialization.OptionalFieldAttribute()] 916 private bool IsAllowedToCalculateField; 917 918 [System.Runtime.Serialization.OptionalFieldAttribute()] 919 private System.Nullable<System.DateTime> LastHeartbeatField; 920 921 [System.Runtime.Serialization.OptionalFieldAttribute()] 922 private System.Nullable<int> MemoryField; 923 924 [System.Runtime.Serialization.OptionalFieldAttribute()] 925 private string OperatingSystemField; 926 927 [System.Runtime.Serialization.OptionalFieldAttribute()] 928 private HeuristicLab.Clients.Hive.SlaveState SlaveStateField; 929 930 [System.Runtime.Serialization.DataMemberAttribute()] 931 public System.Nullable<int> Cores 932 { 933 get 934 { 935 return this.CoresField; 936 } 937 set 938 { 939 if ((this.CoresField.Equals(value) != true)) 940 { 941 this.CoresField = value; 942 this.RaisePropertyChanged("Cores"); 943 } 944 } 945 } 946 947 [System.Runtime.Serialization.DataMemberAttribute()] 948 public HeuristicLab.Clients.Hive.CpuArchitecture CpuArchitecture 949 { 950 get 951 { 952 return this.CpuArchitectureField; 953 } 954 set 955 { 956 if ((this.CpuArchitectureField.Equals(value) != true)) 957 { 958 this.CpuArchitectureField = value; 959 this.RaisePropertyChanged("CpuArchitecture"); 960 } 961 } 962 } 963 964 [System.Runtime.Serialization.DataMemberAttribute()] 965 public System.Nullable<int> CpuSpeed 966 { 967 get 968 { 969 return this.CpuSpeedField; 970 } 971 set 972 { 973 if ((this.CpuSpeedField.Equals(value) != true)) 974 { 975 this.CpuSpeedField = value; 976 this.RaisePropertyChanged("CpuSpeed"); 977 } 978 } 979 } 980 981 [System.Runtime.Serialization.DataMemberAttribute()] 982 public System.Nullable<int> FreeCores 983 { 984 get 985 { 986 return this.FreeCoresField; 987 } 988 set 989 { 990 if ((this.FreeCoresField.Equals(value) != true)) 991 { 992 this.FreeCoresField = value; 993 this.RaisePropertyChanged("FreeCores"); 994 } 995 } 996 } 997 998 [System.Runtime.Serialization.DataMemberAttribute()] 999 public System.Nullable<int> FreeMemory 1000 { 1001 get 1002 { 1003 return this.FreeMemoryField; 1004 } 1005 set 1006 { 1007 if ((this.FreeMemoryField.Equals(value) != true)) 1008 { 1009 this.FreeMemoryField = value; 1010 this.RaisePropertyChanged("FreeMemory"); 1011 } 1012 } 1013 } 1014 1015 [System.Runtime.Serialization.DataMemberAttribute()] 1016 public bool IsAllowedToCalculate 1017 { 1018 get 1019 { 1020 return this.IsAllowedToCalculateField; 1021 } 1022 set 1023 { 1024 if ((this.IsAllowedToCalculateField.Equals(value) != true)) 1025 { 1026 this.IsAllowedToCalculateField = value; 1027 this.RaisePropertyChanged("IsAllowedToCalculate"); 1028 } 1029 } 1030 } 1031 1032 [System.Runtime.Serialization.DataMemberAttribute()] 1033 public System.Nullable<System.DateTime> LastHeartbeat 1034 { 1035 get 1036 { 1037 return this.LastHeartbeatField; 1038 } 1039 set 1040 { 1041 if ((this.LastHeartbeatField.Equals(value) != true)) 1042 { 1043 this.LastHeartbeatField = value; 1044 this.RaisePropertyChanged("LastHeartbeat"); 1045 } 1046 } 1047 } 1048 1049 [System.Runtime.Serialization.DataMemberAttribute()] 1050 public System.Nullable<int> Memory 1051 { 1052 get 1053 { 1054 return this.MemoryField; 1055 } 1056 set 1057 { 1058 if ((this.MemoryField.Equals(value) != true)) 1059 { 1060 this.MemoryField = value; 1061 this.RaisePropertyChanged("Memory"); 1062 } 1063 } 1064 } 1065 1066 [System.Runtime.Serialization.DataMemberAttribute()] 1067 public string OperatingSystem 1068 { 1069 get 1070 { 1071 return this.OperatingSystemField; 1072 } 1073 set 1074 { 1075 if ((object.ReferenceEquals(this.OperatingSystemField, value) != true)) 1076 { 1077 this.OperatingSystemField = value; 1078 this.RaisePropertyChanged("OperatingSystem"); 1079 } 1080 } 1081 } 1082 1083 [System.Runtime.Serialization.DataMemberAttribute()] 1084 public HeuristicLab.Clients.Hive.SlaveState SlaveState 1085 { 1086 get 1087 { 1088 return this.SlaveStateField; 1089 } 1090 set 1091 { 1092 if ((this.SlaveStateField.Equals(value) != true)) 1093 { 1094 this.SlaveStateField = value; 1095 this.RaisePropertyChanged("SlaveState"); 1096 1096 } 1097 1097 } … … 1109 1109 1110 1110 [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] 1111 [System.Runtime.Serialization.DataContractAttribute(Name="JobState", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.Common.DataTra" + 1112 "nsfer")] 1113 public enum JobState : int 1114 { 1115 1116 [System.Runtime.Serialization.EnumMemberAttribute()] 1117 Offline = 0, 1118 1119 [System.Runtime.Serialization.EnumMemberAttribute()] 1120 Waiting = 1, 1121 1122 [System.Runtime.Serialization.EnumMemberAttribute()] 1123 Transferring = 2, 1124 1125 [System.Runtime.Serialization.EnumMemberAttribute()] 1126 Calculating = 3, 1127 1128 [System.Runtime.Serialization.EnumMemberAttribute()] 1129 Finished = 4, 1130 1131 [System.Runtime.Serialization.EnumMemberAttribute()] 1132 Aborted = 5, 1133 1134 [System.Runtime.Serialization.EnumMemberAttribute()] 1135 Failed = 6, 1136 } 1137 1138 [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] 1111 1139 [System.Runtime.Serialization.DataContractAttribute(Name="CpuArchitecture", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.Common.DataTra" + 1112 1140 "nsfer")] … … 1135 1163 [System.Runtime.Serialization.EnumMemberAttribute()] 1136 1164 Offline = 2, 1137 }1138 1139 [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]1140 [System.Runtime.Serialization.DataContractAttribute(Name="JobState", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.Common.DataTra" +1141 "nsfer")]1142 public enum JobState : int1143 {1144 1145 [System.Runtime.Serialization.EnumMemberAttribute()]1146 Offline = 0,1147 1148 [System.Runtime.Serialization.EnumMemberAttribute()]1149 Waiting = 1,1150 1151 [System.Runtime.Serialization.EnumMemberAttribute()]1152 Transferring = 2,1153 1154 [System.Runtime.Serialization.EnumMemberAttribute()]1155 Calculating = 3,1156 1157 [System.Runtime.Serialization.EnumMemberAttribute()]1158 Finished = 4,1159 1160 [System.Runtime.Serialization.EnumMemberAttribute()]1161 Aborted = 5,1162 1163 [System.Runtime.Serialization.EnumMemberAttribute()]1164 Failed = 6,1165 1165 } 1166 1166 … … 1427 1427 { 1428 1428 1429 [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetSlaveGroup", ReplyAction="http://tempuri.org/IHiveService/GetSlaveGroupResponse")] 1430 HeuristicLab.Clients.Hive.SlaveGroup GetSlaveGroup(System.Guid slaveGroupId); 1431 1429 1432 [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetSlaves", ReplyAction="http://tempuri.org/IHiveService/GetSlavesResponse")] 1430 1433 System.Collections.Generic.List<HeuristicLab.Clients.Hive.Slave> GetSlaves(); … … 1502 1505 System.Collections.Generic.List<HeuristicLab.Clients.Hive.HiveExperiment> GetHiveExperiments(); 1503 1506 1507 [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetAllHiveExperiments", ReplyAction="http://tempuri.org/IHiveService/GetAllHiveExperimentsResponse")] 1508 System.Collections.Generic.List<HeuristicLab.Clients.Hive.HiveExperiment> GetAllHiveExperiments(); 1509 1504 1510 [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/AddHiveExperiment", ReplyAction="http://tempuri.org/IHiveService/AddHiveExperimentResponse")] 1505 1511 System.Guid AddHiveExperiment(HeuristicLab.Clients.Hive.HiveExperiment hiveExperimentDto); … … 1537 1543 [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetSlave", ReplyAction="http://tempuri.org/IHiveService/GetSlaveResponse")] 1538 1544 HeuristicLab.Clients.Hive.Slave GetSlave(System.Guid slaveId); 1539 1540 [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetSlaveGroup", ReplyAction="http://tempuri.org/IHiveService/GetSlaveGroupResponse")]1541 HeuristicLab.Clients.Hive.SlaveGroup GetSlaveGroup(System.Guid slaveGroupId);1542 1545 } 1543 1546 … … 1576 1579 } 1577 1580 1581 public HeuristicLab.Clients.Hive.SlaveGroup GetSlaveGroup(System.Guid slaveGroupId) 1582 { 1583 return base.Channel.GetSlaveGroup(slaveGroupId); 1584 } 1585 1578 1586 public System.Collections.Generic.List<HeuristicLab.Clients.Hive.Slave> GetSlaves() 1579 1587 { … … 1701 1709 } 1702 1710 1711 public System.Collections.Generic.List<HeuristicLab.Clients.Hive.HiveExperiment> GetAllHiveExperiments() 1712 { 1713 return base.Channel.GetAllHiveExperiments(); 1714 } 1715 1703 1716 public System.Guid AddHiveExperiment(HeuristicLab.Clients.Hive.HiveExperiment hiveExperimentDto) 1704 1717 { … … 1760 1773 return base.Channel.GetSlave(slaveId); 1761 1774 } 1762 1763 public HeuristicLab.Clients.Hive.SlaveGroup GetSlaveGroup(System.Guid slaveGroupId)1764 {1765 return base.Channel.GetSlaveGroup(slaveGroupId);1766 }1767 1775 } 1768 1776 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/Job.cs
r5599 r5602 23 23 using System.Collections.Generic; 24 24 using HeuristicLab.Common; 25 using HeuristicLab.Core; 25 26 26 27 namespace HeuristicLab.Clients.Hive { 27 28 29 [Item("Job", "A Hive job.")] 28 30 public partial class Job : IDeepCloneable { 29 31 … … 67 69 return Clone(new Cloner()); 68 70 } 71 72 69 73 } 70 74 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/LightweightJob.cs
r5599 r5602 23 23 using System.Collections.Generic; 24 24 using System.Linq; 25 using HeuristicLab.Core; 25 26 26 27 namespace HeuristicLab.Clients.Hive { 27 28 29 [Item("LightweightJob", "A lightweight Hive job.")] 28 30 public partial class LightweightJob { 29 31 … … 31 33 StateLog = new List<StateLog>(); 32 34 } 33 34 35 35 36 public LightweightJob(Job job) { -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/ServiceContracts/IHiveService.cs
r5593 r5602 34 34 [OperationContract] 35 35 void UpdateJob(Job jobDto); 36 36 37 37 [OperationContract] 38 38 void UpdateJobData(Job jobDto, JobData jobDataDto); … … 62 62 [OperationContract] 63 63 IEnumerable<HiveExperiment> GetHiveExperiments(); 64 65 /// <summary> 66 /// Returns all experiments in the hive (only for admins) 67 /// </summary> 68 /// <returns></returns> 69 [OperationContract] 70 IEnumerable<HiveExperiment> GetAllHiveExperiments(); 64 71 65 72 [OperationContract] -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs
r5599 r5602 173 173 } 174 174 175 // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)] 176 public IEnumerable<HiveExperiment> GetAllHiveExperiments() { 177 return dao.GetHiveExperiments(x => true); 178 } 179 175 180 // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)] 176 181 // [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
Note: See TracChangeset
for help on using the changeset viewer.