Changeset 4342
- Timestamp:
- 08/30/10 13:47:43 (14 years ago)
- Location:
- branches/3.3-Hive/sources/HeuristicLab.Hive
- Files:
-
- 6 added
- 22 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Calendar/3.3/Properties/AssemblyInfo.cs
r4338 r4342 58 58 // [assembly: AssemblyVersion("1.0.*")] 59 59 [assembly: AssemblyVersion("3.3.0.0")] 60 [assembly: AssemblyFileVersion("3.3.0.433 7")]60 [assembly: AssemblyFileVersion("3.3.0.4338")] -
branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/HeuristicLab.Hive.Experiment.Views-3.3.csproj
r4296 r4342 88 88 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization.Views-3.3.dll</HintPath> 89 89 </Reference> 90 <Reference Include="HeuristicLab.Optimizer-3.3"> 91 <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimizer-3.3.dll</HintPath> 92 </Reference> 90 93 <Reference Include="HeuristicLab.Persistence-3.3"> 91 94 <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath> … … 104 107 </ItemGroup> 105 108 <ItemGroup> 109 <Compile Include="ConnectionSetupView.cs"> 110 <SubType>Form</SubType> 111 </Compile> 112 <Compile Include="ConnectionSetupView.Designer.cs"> 113 <DependentUpon>ConnectionSetupView.cs</DependentUpon> 114 </Compile> 106 115 <Compile Include="ControlExtensions.cs" /> 107 116 <Compile Include="HeuristicLabHiveExperimentViewsPlugin.cs" /> … … 124 133 <DependentUpon>JobItemView.cs</DependentUpon> 125 134 </Compile> 135 <Compile Include="MenuItems\ConnectionSetupMenuItem.cs" /> 126 136 <Compile Include="Properties\AssemblyInfo.cs" /> 127 137 <Compile Include="Properties\Resources.Designer.cs"> … … 154 164 </ItemGroup> 155 165 <ItemGroup> 166 <EmbeddedResource Include="ConnectionSetupView.resx"> 167 <DependentUpon>ConnectionSetupView.cs</DependentUpon> 168 </EmbeddedResource> 156 169 <EmbeddedResource Include="HiveExperimentView.resx"> 157 170 <DependentUpon>HiveExperimentView.cs</DependentUpon> -
branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/HeuristicLabHiveExperimentViewsPlugin.cs
r4121 r4342 40 40 [PluginDependency("HeuristicLab.MainForm", "3.3")] 41 41 [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")] 42 [PluginDependency("HeuristicLab.Optimizer", "3.3")] 42 43 [PluginDependency("HeuristicLab.Operators.Views", "3.3")] 43 44 [PluginDependency("HeuristicLab.Optimization", "3.3")] -
branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/HiveExperimentView.Designer.cs
r4305 r4342 64 64 this.executionTimeTextBox = new System.Windows.Forms.TextBox(); 65 65 this.pauseButton = new System.Windows.Forms.Button(); 66 this.ServerIpLabel = new System.Windows.Forms.Label();67 66 this.resourceIdsLabel = new System.Windows.Forms.Label(); 68 this.serverIpTextBox = new System.Windows.Forms.TextBox();69 67 this.resourceIdsTextBox = new System.Windows.Forms.TextBox(); 70 68 this.disconnectButton = new System.Windows.Forms.Button(); … … 97 95 this.tabControl.Controls.Add(this.runsTabPage); 98 96 this.tabControl.Controls.Add(this.logTabPage); 99 this.tabControl.Location = new System.Drawing.Point(0, 99);97 this.tabControl.Location = new System.Drawing.Point(0, 78); 100 98 this.tabControl.Name = "tabControl"; 101 99 this.tabControl.SelectedIndex = 0; 102 this.tabControl.Size = new System.Drawing.Size(735, 395);100 this.tabControl.Size = new System.Drawing.Size(735, 416); 103 101 this.tabControl.TabIndex = 4; 104 102 // … … 112 110 this.experimentTabPage.Name = "experimentTabPage"; 113 111 this.experimentTabPage.Padding = new System.Windows.Forms.Padding(3); 114 this.experimentTabPage.Size = new System.Drawing.Size(727, 3 69);112 this.experimentTabPage.Size = new System.Drawing.Size(727, 390); 115 113 this.experimentTabPage.TabIndex = 1; 116 114 this.experimentTabPage.Text = "Experiment"; … … 302 300 this.pauseButton.Click += new System.EventHandler(this.pauseButton_Click); 303 301 // 304 // ServerUrlLabel305 //306 this.ServerIpLabel.AutoSize = true;307 this.ServerIpLabel.Location = new System.Drawing.Point(1, 53);308 this.ServerIpLabel.Name = "ServerIpLabel";309 this.ServerIpLabel.Size = new System.Drawing.Size(51, 13);310 this.ServerIpLabel.TabIndex = 11;311 this.ServerIpLabel.Text = "ServerIp";312 //313 302 // resourceIdsLabel 314 303 // 315 304 this.resourceIdsLabel.AutoSize = true; 316 this.resourceIdsLabel.Location = new System.Drawing.Point(3, 76);305 this.resourceIdsLabel.Location = new System.Drawing.Point(3, 55); 317 306 this.resourceIdsLabel.Name = "resourceIdsLabel"; 318 307 this.resourceIdsLabel.Size = new System.Drawing.Size(67, 13); … … 320 309 this.resourceIdsLabel.Text = "ResourceIds"; 321 310 // 322 // serverUrlTextBox323 //324 this.serverIpTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)325 | System.Windows.Forms.AnchorStyles.Right)));326 this.serverIpTextBox.Location = new System.Drawing.Point(72, 50);327 this.serverIpTextBox.Name = "serverIpTextBox";328 this.serverIpTextBox.Size = new System.Drawing.Size(663, 20);329 this.serverIpTextBox.TabIndex = 13;330 this.serverIpTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.serverUrlTextBox_Validating);331 this.serverIpTextBox.Validated += new System.EventHandler(this.serverUrlTextBox_Validated);332 //333 311 // resourceIdsTextBox 334 312 // 335 313 this.resourceIdsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 336 314 | System.Windows.Forms.AnchorStyles.Right))); 337 this.resourceIdsTextBox.Location = new System.Drawing.Point(72, 73);315 this.resourceIdsTextBox.Location = new System.Drawing.Point(72, 52); 338 316 this.resourceIdsTextBox.Name = "resourceIdsTextBox"; 339 317 this.resourceIdsTextBox.Size = new System.Drawing.Size(663, 20); … … 371 349 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 372 350 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 373 this.Controls.Add(this.resourceIdsTextBox);374 this.Controls.Add(this.serverIpTextBox);375 this.Controls.Add(this.resourceIdsLabel);376 351 this.Controls.Add(this.tabControl); 377 352 this.Controls.Add(this.disconnectButton); 378 353 this.Controls.Add(this.startButton); 354 this.Controls.Add(this.resourceIdsTextBox); 379 355 this.Controls.Add(this.executionTimeTextBox); 356 this.Controls.Add(this.resourceIdsLabel); 380 357 this.Controls.Add(this.executionTimeLabel); 381 this.Controls.Add(this.ServerIpLabel);382 358 this.Controls.Add(this.pauseButton); 383 359 this.Controls.Add(this.stopButton); … … 390 366 this.Controls.SetChildIndex(this.stopButton, 0); 391 367 this.Controls.SetChildIndex(this.pauseButton, 0); 392 this.Controls.SetChildIndex(this.ServerIpLabel, 0);393 368 this.Controls.SetChildIndex(this.executionTimeLabel, 0); 369 this.Controls.SetChildIndex(this.resourceIdsLabel, 0); 394 370 this.Controls.SetChildIndex(this.executionTimeTextBox, 0); 371 this.Controls.SetChildIndex(this.resourceIdsTextBox, 0); 395 372 this.Controls.SetChildIndex(this.startButton, 0); 396 373 this.Controls.SetChildIndex(this.disconnectButton, 0); 397 374 this.Controls.SetChildIndex(this.tabControl, 0); 398 this.Controls.SetChildIndex(this.resourceIdsLabel, 0);399 this.Controls.SetChildIndex(this.serverIpTextBox, 0);400 this.Controls.SetChildIndex(this.resourceIdsTextBox, 0);401 375 this.Controls.SetChildIndex(this.nameLabel, 0); 402 376 this.Controls.SetChildIndex(this.descriptionLabel, 0); … … 424 398 private System.Windows.Forms.Button pauseButton; 425 399 private System.Windows.Forms.TabPage hiveStatusTabPage; 426 private System.Windows.Forms.Label ServerIpLabel;427 400 private System.Windows.Forms.Label resourceIdsLabel; 428 private System.Windows.Forms.TextBox serverIpTextBox;429 401 private System.Windows.Forms.TextBox resourceIdsTextBox; 430 402 private System.Windows.Forms.Button viewExperimentButton; -
branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/HiveExperimentView.cs
r4333 r4342 83 83 executionTimeTextBox.Text = Content.ExecutionTime.ToString(); 84 84 resourceIdsTextBox.Text = Content.ResourceIds; 85 serverIpTextBox.Text = Settings.Default.HiveServerIp;86 85 experimentNamedItemView.Content = Content.Experiment; 87 86 logView.Content = Content.Log; … … 191 190 private void resetButton_Click(object sender, EventArgs e) { 192 191 Content.Prepare(); 193 }194 195 private void serverUrlTextBox_Validating(object sender, System.ComponentModel.CancelEventArgs e) {196 if (string.IsNullOrEmpty(serverIpTextBox.Text)) {197 e.Cancel = true;198 errorProvider.SetError(serverIpTextBox, "ServerUrl cannot be empty");199 serverIpTextBox.SelectAll();200 return;201 }202 Settings.Default.HiveServerIp = serverIpTextBox.Text;203 }204 205 private void serverUrlTextBox_Validated(object sender, EventArgs e) {206 errorProvider.SetError(serverIpTextBox, string.Empty);207 192 } 208 193 -
branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/HiveExperimentView.resx
r4173 r4342 119 119 </resheader> 120 120 <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> 121 <value>10 2, 17</value>121 <value>107, 17</value> 122 122 </metadata> 123 123 <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> … … 129 129 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 130 130 YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALDAAA 131 CwwBP0AiyAAAAn 9JREFUOE+lk2tI01EYxhf0oU8WqVEIRpaIBWJgSPUhROmippS3QkkTylsXDMW8ts3b132 1G06daVibuqaOq0sxbBCKBSJ0PJCialZUFSKqaGSt1//TbIsww8deOBwznl+5zkv71kHiP5rGAFrKb1Q133 5ypR6bmaVU6m2kCiXJv007Om2XgwJEaNT4QiyDi/GF9mKRVgsWkav+CYQkR1utwAQfypphqZ4l/JIhOL134 jvtGKfCOyDMB6O/WMjNea9L3MT1zIxoM5QrqdWnS1SA+kUq8w1V4hhUgqq1QMj1WtcK88KmIud5oqsqy135 qCzOQFMopSQvhRvyBApkcQLzV91E1docpr9ol29eFMz0J0Bv2Kr6C3CrVMa3jyWm2EZzc12OSQ8M2TTo136 ZdytzMCgSUVfIqFcfY2bqiSKlQmoc+JNaUSVJRlMvsvHGHuoVUx9lZKFIQkMp63UW2FtMBH6YuBVFF01137 /lwO9aoQadSpTAxkwXs596oVtD+ULx36/Qkvg6HDl/k2D2YeufCmwoELZ45MCIA9olKVmK+vJQy3JVOv138 l7M4KIae8CVAV6hgPMV8uxczLYeZbDrIaN1eJBG2nHazyDN1cZEymdHueG7rcuh8KiTpixYA56AziMVn139 J5h9coyp5kOM1TvxudqejvRNBHrY4GRnZmcCqLMT6GlJ4Y4uGwZS4IUQ97kfs62eTD12YbzBmRGDAx+0140 u+iVmyMO24njbqvG5VbOz4yjtjyL3vuRdOSKltUuX0+LbAON0o3UJFmiibPi+pXtBLrvWHR2tHZfBuSm141 xZIrPk9mfAiJlwKMleWsvxsnj+7H9YAD+xxssbexwnqbBVs2m7HV3GxlI631E9fa/wGRpaRpa3TTbQAA142 AABJRU5ErkJggg==131 CwwBP0AiyAAAAnpJREFUOE+lk1lIlFEYhv+LLrqySI1CMLJELBADQ6qLEKVFTSm3QkkTyq0FQzHXZlxH 132 nRnXKRVzRp1GHa0sxbBCKBSJ0HKhxNQsKCrF1FDJ7emfkSzLQPDiuTmc9znv+ThHAIT1sKZwWqHWWZqn 133 41pmORkqPfFyTcKvQ9ckCIpS4RWmCDCELsWWmSeLsuhUtU9gVCFCnTbHT4S/aaqRKf53tfD4ohPeEQo8 134 w3KNAvq7NcyM1xr5MaZjbkSNvlxBvTY1eTWJV7gSz9A83EMKEGorlEyPVa0IL3wuYq43kqqyTCqL01EX 135 JlOSm8RNeRwFshjR+XvwQrUmm+mvmuWTF8Uw/XHQG7Iq/whul8r4/qnEWNsQbq7LNvJQn0WDTsa9ynT0 136 6hR0JVLKVde5lZdAsTIOVXassY1QWZLO5Pt8DLWHWiXUVylZGJLCcOpK3olrg/HQFwWvI+iq8eVKsEeF 137 oFalMDGQCR/k3K9W0P5IvrTpzyu8CoQOb+bb3Jh57MTbCjsunj06IQr2CqV5Er69kTLclki9Ts7ioAR6 138 QpcEXcFi8DTz7R7MtBxhsukQo3X7kIZZc8bFLNcwTKFImchodyx3tNl0PhOb9EWKgvPQGcDi85PMPj3O 139 VPNhxuod+FJtS0faZvzdrHCwMbExClRZcfS0JHFXmwUDSfBSrPvCh9lWd6aeODHe4MiI3o6Pmt30yk2R 140 hOzCfo9F4/JTzs+IobY8k94H4XTkCMu0yzfQIttIY/ImahLMUcdYcOPqDvxddy462lu6LgtyUqPJkVwg 141 IzaI+Mt+hslyzteFU8cO4HzQjv121thaWWC53YytW0zYZmqy8iGt5ysbsj8BvQ/ROxW7aPkAAAAASUVO 142 RK5CYII= 143 143 </value> 144 144 </data> … … 160 160 <value> 161 161 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 162 YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALA QAA163 Cw EBNnBPWwAAALZJREFUOE9j/P//PwNFAGQAOi7bn+2GTRybGIZmkKKEGRH/iTUEpwGWZfpEGYLVgKgp164 Qf833Fr8nxhDsBoQPMEbZDtRhmA1wKfLGWwACEctCsDrEqwGODZb/M/YEAvWbNus/1+nWOG/RBo3iFZD165 jwmsBpjX6KFo5k9gwaoZnIawxa1eqTLcZnyacRqgki8FdjYhzTgNkM4QJEozTgNEkjlx+pmoQMQW2rjy166 BtZAJDYj4fQCKQYAAPmEmBfWSTCRAAAAAElFTkSuQmCC162 YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALAAAA 163 CwAB5DetvwAAALBJREFUOE9j+P//PwMlGKvmsv3ZbsQaitWAhBkR/4k1BKcBlmX6RBmC1YCoKUH/N9xa 164 /J8YQ7AaEDzBG2Q7UYZgNcCnyxlsAAhHLQrA6xKsBjg2W/zP2BAL1mzbrP9fp1jhv0QaN4hWQ48drAaY 165 1+ihaOZPYMGqGWQYVgP0SpXhNuPTjNMAlXwpsLMJacZpgHSGIFGacRogksyJ089EBSK20MaVNyjKiTi9 166 QGxOBKkDACT9xOni1RbMAAAAAElFTkSuQmCC 167 167 </value> 168 168 </data> … … 170 170 <value> 171 171 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 172 YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALA QAA173 Cw EBNnBPWwAAAXJJREFUOE+tkj1IQmEYhWsoaIi2xmhpiYSgKFoiCMLJJYSEJiEI0mgIyqjA6vaLUKIU174 iZlJKKUoWEbZDzVYCYlQYVxcNDIoRND8ud7idD83C27g7YNvPM8573nfcgBlgh4BCPmCxIX0Qtx/ATTu175 Lyy78ph3ZKC2pTBlSWB86w2jhleMrD9jWB9N/jQsSkDEj5FPPERZ+J7yOL5j4PYzsPsYGL1piKR7nL64176 syIAcaZfWPhptiC0XeWw4clgzZ3CgiWMBskOP4DEvo+wOAkw2L3IQccJKVsSE6Z3KDRB1PVs8gPIzDch177 Fo5rzvkoi8V9Io5DqYtBOnaO2k4tP4AU5g0yMJ/lsOr6gMqUwKA2BtlcGOKhA9S0rfADSNvOWwa6wzSm178 LXEo9JyYoiFRBdA9YEdVM8UPIKvaPk1h1hyCUhOAbPKSc3aiS25Fe58BFU1qfgDZc4fcg5Z+Fxp7ragX179 GwtzV7cuoVI08zeglKv831MuJcE3MLnHrIkIZqEAAAAASUVORK5CYII=172 YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALAAAA 173 CwAB5DetvwAAAWtJREFUOE/Nkz9IAmEYxl0KGqKtMVpaIiEoipYIgnByCSGhSQiCNBqCMiqwsr8clChF 174 YmYSSikeWEbZH2qwEhKhwhAXjQwKEbw0zyue7nO7hgtyqOEbf7/ne5+XVwJAUsorCSbB/0xAeT+xSBcw 175 685B52QwYU9jdOMFw+ZnDK0+YtCUyHzvSzACge/jH7hLcAg8FHB4w8IbZOEKsLD4s5AqdnheWLpAQJKj 176 TxyCUa4IOi/yWPPlsOJlMGePoU6+JS4g376NczgKsdg+y8PIg3pnBmPWV6ipMGq61sUFZOarCAf3JZ98 177 8I75XQKnoDEmoRg5RXW7QVxACvOHWdhO8lim36C1ptFvSEI5E4NsYA9VLUviAtK255qFcT+LSXsKahMP 178 66OQa0Po7HOholEvLiCr2jxmMG2LQEOFoBw/55M96FA50NpjRlmDTlxA9tym8qGpl0Z9twO1Mktx7srm 179 BZRLp34W/Oao/v4WvgBcI/R+TmAaZAAAAABJRU5ErkJggg== 180 180 </value> 181 181 </data> … … 183 183 <value> 184 184 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 185 YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALA QAA186 Cw EBNnBPWwAAAYNJREFUOE9j/P//PwNFAGQAJZgizWDXI9veu/nvfxhuW/vtf+OKz/9rF7//XzHv1f+S187 2c//F0x//L901mOgFoSrUQzo2vDr/6aT3/6vPPTl/4I9n/5ffvDzf+/ad/+bl74BG5I3/cV/3dBVuA0A188 2bri4Jf/83Z9+n/ryS+Qwv8NS978L5378n/O1Of/k3qf/Vf1W4TbAJCT5+z49P/hyx9gzSBQMvvl/6wp189 z/8n9D79H9b6+L+c2yzcBoD8e/PRZ7hmZMaxy2/+e9U+/C9mNwm3ASB/Ni978//UlZdwvdGdT/4HNj0C190 8x1K7//nN+vGbQAopMuBhuRMe/5/55G7YE0BDY/+u1U9ALPN8u7+5zRoxW0AKJqygf5NBPo3vO3x/znr191 Lvx3rbj/36b4HtgAvYxb/1l1GnEbAIrjuJ6n/0NbHv33qXv436n8/n/rwnv/TbLvgA1QTyLCAMukbf9B192 2Dhmw3+t4OX/FTzmggOO16TzP5tuE34XAC0hOWmTrAHdEooNAABnu83WrybVqwAAAABJRU5ErkJggg==185 YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALAAAA 186 CwAB5DetvwAAAX9JREFUOE9j+P//PwMlmCLNIIupa0Dv5r//Ybht7bf/jSs+/69d/P5/xbxX/0tmP/9f 187 MP3x/9JZj4EWI7yN4oKuDb/+bzr57f/KQ1/+L9jz6f/lBz//965997956RuwIXnTX/zXDV2F2wCQrSsO 188 fvk/b9en/7ee/AIp/N+w5M3/0rkv/+dMff4/qffZf1W/RbgNADl5zo5P/x++/AHWDAIls1/+z5ry/H9C 189 79P/Ya2P/8u5zcJtAMi/Nx99hmtGZhy7/Oa/V+3D/2J2k3AbAPJn87I3/09deQnXG9355H9g0yMw36H0 190 /n9+s27cBoBCuhxoSM605/93HrkL1hTQ8Oi/W9UDMNss7+5/ToNW3AaAoikb6N9EoH/D2x7/n7Puwn/X 191 ivv/bYrvgQ3Qy7j1n1WnEbcBoDiO63n6P7Tl0X+fuof/ncrv/7cuvPffJPsO2AD1JCIMsEza9h+EjWM2 192 /NcKXv5fwWMuOOB4TTr/s+k24XcB0BKSkzbJGtAtodgAAJMl+qgyDSjjAAAAAElFTkSuQmCC 193 193 </value> 194 194 </data> … … 196 196 <value> 197 197 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 198 YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALA QAA199 Cw EBNnBPWwAAAMZJREFUOE9j/P//PwNFAGQAJZgizWDXU2I7VgN6N//937Xh1/+8qY8+gRSg89EtxHAB200 SPPVh3/+64auAqr9z4DOJ2hA29pv/289/f1f1W8R2AB0PkEDGld8/n/54e//cm6zwAag8wkaULv4/f8T201 13//F7ObBDYAnU/QgIp5r/7vvvDzP79ZN9gAdD5BA0pmP/+//uTP/5wGrWAD0PkEDSiY/vj/gj2f/7Pq202 NIINQOcTNAAU/2y6TXAD0PkEDSA1ZVI/KZPqAgBmE8VVB/UQsAAAAABJRU5ErkJggg==198 YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALAAAA 199 CwAB5DetvwAAAL5JREFUOE9j+P//PwMlmCLNIIsHoQG9m//+79rw63/e1EefQE5E56OHF4YXQJqvPvzz 200 Xzd0FVDtfwZ0PkED2tZ++3/r6e//qn6LwAag8wka0Lji8//LD3//l3ObBTYAnU/QgNrF7/+fuP77v5jd 201 JLAB6HyCBlTMe/V/94Wf//nNusEGoPMJGlAy+/n/9Sd//uc0aAUbgM4naEDB9Mf/F+z5/J9VpxFsADqf 202 oAGg+GfTbYIbgM4naACpGWvg8wIAkX3yJyVePz4AAAAASUVORK5CYII= 203 203 </value> 204 204 </data> -
branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HeuristicLab.Hive.Experiment-3.3.csproj
r4305 r4342 105 105 </Compile> 106 106 <Compile Include="ServiceLocator.cs" /> 107 <Compile Include="Settings.cs" /> 107 108 </ItemGroup> 108 109 <ItemGroup> -
branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs
r4333 r4342 44 44 using HeuristicLab.Hive.Contracts.ResponseObjects; 45 45 using HeuristicLab.Hive.Experiment.Properties; 46 using System.ComponentModel; 46 47 47 48 namespace HeuristicLab.Hive.Experiment { … … 304 305 ServiceLocator.DisposeClientFacade(clientFacade); 305 306 } 306 307 307 sendingJobsFinished = true; 308 308 }); … … 830 830 } 831 831 832 public event EventHandler ServerUrlChanged;833 protected virtual void OnServerUrlChanged() {834 EventHandler handler = ServerUrlChanged;835 if (handler != null) handler(this, EventArgs.Empty);836 }837 838 832 public event EventHandler IsResultsPollingChanged; 839 833 private void OnIsPollingResultsChanged() { -
branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/app.config
r4337 r4342 30 30 <netTcpBinding> 31 31 <binding name="ClientTcpStreamedEndpoint" closeTimeout="00:01:00" 32 openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00: 10:00"32 openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" 33 33 transactionFlow="false" transferMode="Streamed" transactionProtocol="OleTransactions" 34 hostNameComparisonMode="StrongWildcard" 35 maxBufferPoolSize=" 104857600" maxBufferSize="104857600"34 hostNameComparisonMode="StrongWildcard" listenBacklog="10" 35 maxBufferPoolSize="524288" maxBufferSize="65536" maxConnections="10" 36 36 maxReceivedMessageSize="104857600"> 37 37 <readerQuotas maxDepth="32" maxStringContentLength="104857600" maxArrayLength="104857600" … … 42 42 <transport clientCredentialType="Windows" protectionLevel="EncryptAndSign" /> 43 43 <message clientCredentialType="UserName" algorithmSuite="Default" /> 44 </security>45 </binding>46 <binding name="ClientTcpMexEndpoint" closeTimeout="00:01:00"47 openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"48 transactionFlow="false" transferMode="Buffered" transactionProtocol="OleTransactions"49 hostNameComparisonMode="StrongWildcard"50 maxBufferPoolSize="524288" maxBufferSize="65536"51 maxReceivedMessageSize="65536">52 <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"53 maxBytesPerRead="4096" maxNameTableCharCount="16384" />54 <reliableSession ordered="true" inactivityTimeout="00:10:00"55 enabled="false" />56 <security mode="None">57 <transport clientCredentialType="Windows" protectionLevel="EncryptAndSign" />58 <message clientCredentialType="Windows" />59 44 </security> 60 45 </binding> … … 78 63 </security> 79 64 </binding> 80 <binding name="ClientHttpMexEndpoint" closeTimeout="00:01:00"81 openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"82 bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard"83 maxBufferPoolSize="524288" maxReceivedMessageSize="65536"84 messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true"85 allowCookies="false">86 <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"87 maxBytesPerRead="4096" maxNameTableCharCount="16384" />88 <reliableSession ordered="true" inactivityTimeout="00:10:00"89 enabled="false" />90 <security mode="None">91 <transport clientCredentialType="Windows" proxyCredentialType="None"92 realm="" />93 <message clientCredentialType="Windows" negotiateServiceCredential="true" />94 </security>95 </binding>96 65 </wsHttpBinding> 97 66 </bindings> … … 104 73 </identity> 105 74 </endpoint> 106 <endpoint address="net.tcp://localhost:9001/ClientServiceStreamed/mex" 107 binding="netTcpBinding" bindingConfiguration="ClientTcpMexEndpoint" 108 contract="IClientFacade" name="ClientTcpMexEndpoint" /> 109 <endpoint address="http://localhost:9000/ClientService" behaviorConfiguration="ClientServiceBehaviour" binding="wsHttpBinding" 75 <endpoint address="http://localhost:9000/ClientService" binding="wsHttpBinding" behaviorConfiguration="ClientServiceBehaviour" 110 76 bindingConfiguration="ClientHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" 111 77 name="ClientHttpEndpoint"> 112 78 <identity> 113 <certificate encodedValue="AwAAAAEAAAAUAAAA eBLH/0jWrlsW42fIC8VIIdAE6PUgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgyMzE1NTg0OFoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmOgweB6X4Ss6W2xb2hg1x61cjD2T7SO0ckkzmtqRhC2UWly9dBnonFJmg9RjN0y6l2tZhVzNhq8DgCkn3hPg5GL3XIwYX4PsXwNmeT6i+7s6rGbESuaEMvYOAQJSJ+MTgBvXCwo2g5nFHIBqP4W4aU2eybxP7H4cm1rQpoYHHjQIDAQABo0kwRzBFBgNVHQEEPjA8gBASDhO/IE7Ff7PpkCVF8oUpoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQADgYEAhxAzm3JTV7j51jti5P7izTEs7+8534kQloeAJDwlKolkd4ZMkf0BiexC2Vt1KsnxUjrK0HbbITzazkvkAmKi7dP+4G+3SrWag5lS4NcoPjTQy16T3zC9E6yafRaZp1/pxjC3Ap44qwq4Kjl2mEjeHHsdie/h4loowTqC9FlLbgo=" />79 <certificate encodedValue="AwAAAAEAAAAUAAAAJ5p7xBv8o/BZ9Lp1c1d+F13FxN8gAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhBvZlgTCjsfjEG5QUX7yOhOMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgzMDA5MTMyMVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbjJrhOtSpfFz51JPvdfxMVSKqnWhfzjrZvtwpVsy8D589m3SeS6AalWwtkpPCR2C+a4GKo9e689o0+BtuOugypAWqkUhkz//XLvUp5KPNB7igY7he4ngMLp4GsWBWZdl+P8g29t5+nde1Tiv6dPzx5YgfB9lrvZzaS6TT/eNasQIDAQABo0kwRzBFBgNVHQEEPjA8gBBPTuRH17g8MfpeT/ODWdXuoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghBvZlgTCjsfjEG5QUX7yOhOMAkGBSsOAwIdBQADgYEAUpgK4sUxAqwR8eyRK8cmyzhhN31xN8/nKPIo9cETaNvjJXL8zO7DeXCyyiBETAkfnhIChRIAmE/PjxvFdB2fOuQY3/OHrobai+G7IQ8SHF+AKdx7cJXt0h4Okny4DpPjQl4V9P2lZaG8fVXmpKhpeZ+ChA8Y/xPCDzTzLleQ/mY=" /> 114 80 </identity> 115 81 </endpoint> 116 <endpoint address="http://localhost:9000/ClientService/mex"117 binding="wsHttpBinding" bindingConfiguration="ClientHttpMexEndpoint"118 contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" name="ClientHttpMexEndpoint" />119 82 </client> 120 83 -
branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/app.config
r4316 r4342 32 32 </security> 33 33 </binding> 34 <binding name="ServerConsoleMexEndpoint" closeTimeout="00:01:00"35 openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"36 bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard"37 maxBufferPoolSize="524288" maxReceivedMessageSize="65536"38 messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true"39 allowCookies="false">40 <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"41 maxBytesPerRead="4096" maxNameTableCharCount="16384" />42 <reliableSession ordered="true" inactivityTimeout="00:10:00"43 enabled="false" />44 <security mode="None">45 <transport clientCredentialType="Windows" proxyCredentialType="None"46 realm="" />47 <message clientCredentialType="Windows" negotiateServiceCredential="true" />48 </security>49 </binding>50 34 </wsHttpBinding> 51 35 </bindings> … … 55 39 contract="HeuristicLab.Hive.Contracts.Interfaces.IServerConsoleFacade" name="ServerConsoleHttpEndpoint"> 56 40 <identity> 57 <certificate encodedValue="AwAAAAEAAAAUAAAA eBLH/0jWrlsW42fIC8VIIdAE6PUgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgyMzE1NTg0OFoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmOgweB6X4Ss6W2xb2hg1x61cjD2T7SO0ckkzmtqRhC2UWly9dBnonFJmg9RjN0y6l2tZhVzNhq8DgCkn3hPg5GL3XIwYX4PsXwNmeT6i+7s6rGbESuaEMvYOAQJSJ+MTgBvXCwo2g5nFHIBqP4W4aU2eybxP7H4cm1rQpoYHHjQIDAQABo0kwRzBFBgNVHQEEPjA8gBASDhO/IE7Ff7PpkCVF8oUpoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQADgYEAhxAzm3JTV7j51jti5P7izTEs7+8534kQloeAJDwlKolkd4ZMkf0BiexC2Vt1KsnxUjrK0HbbITzazkvkAmKi7dP+4G+3SrWag5lS4NcoPjTQy16T3zC9E6yafRaZp1/pxjC3Ap44qwq4Kjl2mEjeHHsdie/h4loowTqC9FlLbgo=" />41 <certificate encodedValue="AwAAAAEAAAAUAAAAJ5p7xBv8o/BZ9Lp1c1d+F13FxN8gAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhBvZlgTCjsfjEG5QUX7yOhOMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgzMDA5MTMyMVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbjJrhOtSpfFz51JPvdfxMVSKqnWhfzjrZvtwpVsy8D589m3SeS6AalWwtkpPCR2C+a4GKo9e689o0+BtuOugypAWqkUhkz//XLvUp5KPNB7igY7he4ngMLp4GsWBWZdl+P8g29t5+nde1Tiv6dPzx5YgfB9lrvZzaS6TT/eNasQIDAQABo0kwRzBFBgNVHQEEPjA8gBBPTuRH17g8MfpeT/ODWdXuoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghBvZlgTCjsfjEG5QUX7yOhOMAkGBSsOAwIdBQADgYEAUpgK4sUxAqwR8eyRK8cmyzhhN31xN8/nKPIo9cETaNvjJXL8zO7DeXCyyiBETAkfnhIChRIAmE/PjxvFdB2fOuQY3/OHrobai+G7IQ8SHF+AKdx7cJXt0h4Okny4DpPjQl4V9P2lZaG8fVXmpKhpeZ+ChA8Y/xPCDzTzLleQ/mY=" /> 58 42 </identity> 59 43 </endpoint> 60 <endpoint address="http://localhost:9000/ServerConsoleService/mex" behaviorConfiguration="ServerConsoleBehaviour"61 binding="wsHttpBinding" bindingConfiguration="ServerConsoleMexEndpoint"62 contract="HeuristicLab.Hive.Contracts.Interfaces.IServerConsoleFacade" name="ServerConsoleMexEndpoint" />63 44 </client> 64 45 </system.serviceModel> -
branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/app.config
r4338 r4342 90 90 <services> 91 91 <service behaviorConfiguration="ServiceBehaviour" name="HeuristicLab.Hive.Server.Core.SlaveFacade"> 92 <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" 93 name="SlaveHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.ISlaveFacade" /> 94 <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="" 95 name="SlaveMexEndpoint" contract="IMetadataExchange" /> 96 <endpoint binding="netTcpBinding" bindingConfiguration="TcpStreamedBinding" 97 name="SlaveTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.ISlaveFacade" /> 92 <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="SlaveHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.ISlaveFacade" /> 93 <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="" name="SlaveMexEndpoint" contract="IMetadataExchange" /> 94 <endpoint binding="netTcpBinding" bindingConfiguration="TcpStreamedBinding" name="SlaveTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.ISlaveFacade" /> 98 95 <host> 99 96 <baseAddresses> … … 104 101 </service> 105 102 <service behaviorConfiguration="ServiceBehaviour" name="HeuristicLab.Hive.Server.Core.ServerConsoleFacade"> 106 <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" 107 name="ServerConsoleHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IServerConsoleFacade" /> 108 <endpoint address="mex" binding="mexHttpBinding" name="ServerConsoleMexEndpoint" 109 contract="IMetadataExchange" /> 103 <endpoint address="" binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="ServerConsoleHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IServerConsoleFacade" /> 104 <endpoint address="mex" binding="mexHttpBinding" name="ServerConsoleMexEndpoint" contract="IMetadataExchange" /> 110 105 <host> 111 106 <baseAddresses> … … 115 110 </service> 116 111 <service behaviorConfiguration="ServiceBehaviour" name="HeuristicLab.Hive.Server.Core.ClientFacade"> 117 <endpoint address="" binding="netTcpBinding" bindingConfiguration="TcpStreamedBinding" 118 name="ClientTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" /> 119 <endpoint binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" 120 name="ClientHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" /> 121 <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="" 122 name="ClientHttpMexEndpoint" contract="IMetadataExchange" /> 112 <endpoint address="" binding="netTcpBinding" bindingConfiguration="TcpStreamedBinding" name="ClientTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" /> 113 <endpoint binding="wsHttpBinding" bindingConfiguration="HiveServerHttpBinding" name="ClientHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" /> 114 <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="" name="ClientHttpMexEndpoint" contract="IMetadataExchange" /> 123 115 <host> 124 116 <baseAddresses> -
branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/Service References/SlaveService/Reference.svcmap
r4305 r4342 33 33 <MetadataFile FileName="SlaveService7.xsd" MetadataType="Schema" ID="25348808-3181-4343-bba3-796e0172b1fd" SourceId="1" SourceUrl="http://localhost:9000/SlaveService?xsd=xsd0" /> 34 34 <MetadataFile FileName="SlaveService8.xsd" MetadataType="Schema" ID="4c7dfc61-c84a-4378-b121-38f8f8f2a86a" SourceId="1" SourceUrl="http://localhost:9000/SlaveService?xsd=xsd3" /> 35 <MetadataFile FileName="SlaveService.wsdl" MetadataType="Wsdl" ID=" ef494f6e-9864-4628-b3e8-58f471d5d1bd" SourceId="1" SourceUrl="http://localhost:9000/SlaveService?wsdl=wsdl0" />35 <MetadataFile FileName="SlaveService.wsdl" MetadataType="Wsdl" ID="23cc9a85-d45a-4906-bd6e-fdedba89cc5e" SourceId="1" SourceUrl="http://localhost:9000/SlaveService?wsdl=wsdl0" /> 36 36 <MetadataFile FileName="SlaveService9.xsd" MetadataType="Schema" ID="c6237b7a-a9fd-42d5-bcc3-bb872bb61485" SourceId="1" SourceUrl="http://localhost:9000/SlaveService?xsd=xsd2" /> 37 37 </Metadata> -
branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/Service References/SlaveService/SlaveFacade.wsdl
r4338 r4342 1194 1194 <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> 1195 1195 <X509Data> 1196 <X509Certificate>MIIB7jCCAVugAwIBAgIQ 3s9wqCSCIrRGeccFaiyZ+jAJBgUrDgMCHQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xMDA4MjMxNTU4NDhaFw0zOTEyMzEyMzU5NTlaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApjoMHgel+ErOltsW9oYNcetXIw9k+0jtHJJM5rakYQtlFpcvXQZ6JxSZoPUYzdMupdrWYVczYavA4ApJ94T4ORi91yMGF+D7F8DZnk+ovu7OqxmxErmhDL2DgECUifjE4Ab1wsKNoOZxRyAaj+FuGlNnsm8T+x+HJta0KaGBx40CAwEAAaNJMEcwRQYDVR0BBD4wPIAQEg4TvyBOxX+z6ZAlRfKFKaEWMBQxEjAQBgNVBAMTCWxvY2FsaG9zdIIQ3s9wqCSCIrRGeccFaiyZ+jAJBgUrDgMCHQUAA4GBAIcQM5tyU1e4+dY7YuT+4s0xLO/vOd+JEJaHgCQ8JSqJZHeGTJH9AYnsQtlbdSrJ8VI6ytB22yE82s5L5AJiou3T/uBvt0q1moOZUuDXKD400Mtek98wvROsmn0Wmadf6cYwtwKeOKsKuCo5dphI3hx7HYnv4eJaKME6gvRZS24K</X509Certificate>1196 <X509Certificate>MIIB7jCCAVugAwIBAgIQb2ZYEwo7H4xBuUFF+8joTjAJBgUrDgMCHQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xMDA4MzAwOTEzMjFaFw0zOTEyMzEyMzU5NTlaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAm4ya4TrUqXxc+dST73X8TFUiqp1oX8462b7cKVbMvA+fPZt0nkugGpVsLZKTwkdgvmuBiqPXuvPaNPgbbjroMqQFqpFIZM//1y71KeSjzQe4oGO4XuJ4DC6eBrFgVmXZfj/INvbefp3XtU4r+nT88eWIHwfZa72c2kuk0/3jWrECAwEAAaNJMEcwRQYDVR0BBD4wPIAQT07kR9e4PDH6Xk/zg1nV7qEWMBQxEjAQBgNVBAMTCWxvY2FsaG9zdIIQb2ZYEwo7H4xBuUFF+8joTjAJBgUrDgMCHQUAA4GBAFKYCuLFMQKsEfHskSvHJss4YTd9cTfP5yjyKPXBE2jb4yVy/Mzuw3lwssogREwJH54SAoUSAJhPz48bxXQdnzrkGN/zh66G2ovhuyEPEhxfgCnce3CV7dIeDpJ8uA6T40JeFfT9pWWhvH1V5qSoaXmfgoQPGP8Twg808y5XkP5m</X509Certificate> 1197 1197 </X509Data> 1198 1198 </KeyInfo> -
branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/Service References/SlaveService/configuration.svcinfo
r4338 r4342 8 8 </bindings> 9 9 <endpoints> 10 <endpoint normalizedDigest="<?xml version="1.0" encoding="utf-16"?><Data address="http://localhost:9000/SlaveService" binding="wsHttpBinding" bindingConfiguration="SlaveHttpEndpoint" contract="SlaveService.ISlaveFacade" name="SlaveHttpEndpoint"><identity><certificate encodedValue="AwAAAAEAAAAUAAAA eBLH/0jWrlsW42fIC8VIIdAE6PUgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgyMzE1NTg0OFoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmOgweB6X4Ss6W2xb2hg1x61cjD2T7SO0ckkzmtqRhC2UWly9dBnonFJmg9RjN0y6l2tZhVzNhq8DgCkn3hPg5GL3XIwYX4PsXwNmeT6i+7s6rGbESuaEMvYOAQJSJ+MTgBvXCwo2g5nFHIBqP4W4aU2eybxP7H4cm1rQpoYHHjQIDAQABo0kwRzBFBgNVHQEEPjA8gBASDhO/IE7Ff7PpkCVF8oUpoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQADgYEAhxAzm3JTV7j51jti5P7izTEs7+8534kQloeAJDwlKolkd4ZMkf0BiexC2Vt1KsnxUjrK0HbbITzazkvkAmKi7dP+4G+3SrWag5lS4NcoPjTQy16T3zC9E6yafRaZp1/pxjC3Ap44qwq4Kjl2mEjeHHsdie/h4loowTqC9FlLbgo=" /></identity></Data>" digest="<?xml version="1.0" encoding="utf-16"?><Data address="http://localhost:9000/SlaveService" binding="wsHttpBinding" bindingConfiguration="SlaveHttpEndpoint" contract="SlaveService.ISlaveFacade" name="SlaveHttpEndpoint"><identity><certificate encodedValue="AwAAAAEAAAAUAAAAeBLH/0jWrlsW42fIC8VIIdAE6PUgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgyMzE1NTg0OFoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmOgweB6X4Ss6W2xb2hg1x61cjD2T7SO0ckkzmtqRhC2UWly9dBnonFJmg9RjN0y6l2tZhVzNhq8DgCkn3hPg5GL3XIwYX4PsXwNmeT6i+7s6rGbESuaEMvYOAQJSJ+MTgBvXCwo2g5nFHIBqP4W4aU2eybxP7H4cm1rQpoYHHjQIDAQABo0kwRzBFBgNVHQEEPjA8gBASDhO/IE7Ff7PpkCVF8oUpoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQADgYEAhxAzm3JTV7j51jti5P7izTEs7+8534kQloeAJDwlKolkd4ZMkf0BiexC2Vt1KsnxUjrK0HbbITzazkvkAmKi7dP+4G+3SrWag5lS4NcoPjTQy16T3zC9E6yafRaZp1/pxjC3Ap44qwq4Kjl2mEjeHHsdie/h4loowTqC9FlLbgo=" /></identity></Data>" contractName="SlaveService.ISlaveFacade" name="SlaveHttpEndpoint" />10 <endpoint normalizedDigest="<?xml version="1.0" encoding="utf-16"?><Data address="http://localhost:9000/SlaveService" binding="wsHttpBinding" bindingConfiguration="SlaveHttpEndpoint" contract="SlaveService.ISlaveFacade" name="SlaveHttpEndpoint"><identity><certificate encodedValue="AwAAAAEAAAAUAAAAJ5p7xBv8o/BZ9Lp1c1d+F13FxN8gAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhBvZlgTCjsfjEG5QUX7yOhOMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgzMDA5MTMyMVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbjJrhOtSpfFz51JPvdfxMVSKqnWhfzjrZvtwpVsy8D589m3SeS6AalWwtkpPCR2C+a4GKo9e689o0+BtuOugypAWqkUhkz//XLvUp5KPNB7igY7he4ngMLp4GsWBWZdl+P8g29t5+nde1Tiv6dPzx5YgfB9lrvZzaS6TT/eNasQIDAQABo0kwRzBFBgNVHQEEPjA8gBBPTuRH17g8MfpeT/ODWdXuoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghBvZlgTCjsfjEG5QUX7yOhOMAkGBSsOAwIdBQADgYEAUpgK4sUxAqwR8eyRK8cmyzhhN31xN8/nKPIo9cETaNvjJXL8zO7DeXCyyiBETAkfnhIChRIAmE/PjxvFdB2fOuQY3/OHrobai+G7IQ8SHF+AKdx7cJXt0h4Okny4DpPjQl4V9P2lZaG8fVXmpKhpeZ+ChA8Y/xPCDzTzLleQ/mY=" /></identity></Data>" digest="<?xml version="1.0" encoding="utf-16"?><Data address="http://localhost:9000/SlaveService" binding="wsHttpBinding" bindingConfiguration="SlaveHttpEndpoint" contract="SlaveService.ISlaveFacade" name="SlaveHttpEndpoint"><identity><certificate encodedValue="AwAAAAEAAAAUAAAAJ5p7xBv8o/BZ9Lp1c1d+F13FxN8gAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhBvZlgTCjsfjEG5QUX7yOhOMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgzMDA5MTMyMVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbjJrhOtSpfFz51JPvdfxMVSKqnWhfzjrZvtwpVsy8D589m3SeS6AalWwtkpPCR2C+a4GKo9e689o0+BtuOugypAWqkUhkz//XLvUp5KPNB7igY7he4ngMLp4GsWBWZdl+P8g29t5+nde1Tiv6dPzx5YgfB9lrvZzaS6TT/eNasQIDAQABo0kwRzBFBgNVHQEEPjA8gBBPTuRH17g8MfpeT/ODWdXuoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghBvZlgTCjsfjEG5QUX7yOhOMAkGBSsOAwIdBQADgYEAUpgK4sUxAqwR8eyRK8cmyzhhN31xN8/nKPIo9cETaNvjJXL8zO7DeXCyyiBETAkfnhIChRIAmE/PjxvFdB2fOuQY3/OHrobai+G7IQ8SHF+AKdx7cJXt0h4Okny4DpPjQl4V9P2lZaG8fVXmpKhpeZ+ChA8Y/xPCDzTzLleQ/mY=" /></identity></Data>" contractName="SlaveService.ISlaveFacade" name="SlaveHttpEndpoint" /> 11 11 <endpoint normalizedDigest="<?xml version="1.0" encoding="utf-16"?><Data address="http://localhost:9000/SlaveService/mex" binding="wsHttpBinding" bindingConfiguration="SlaveMexEndpoint" contract="SlaveService.ISlaveFacade" name="SlaveMexEndpoint" />" digest="<?xml version="1.0" encoding="utf-16"?><Data address="http://localhost:9000/SlaveService/mex" binding="wsHttpBinding" bindingConfiguration="SlaveMexEndpoint" contract="SlaveService.ISlaveFacade" name="SlaveMexEndpoint" />" contractName="SlaveService.ISlaveFacade" name="SlaveMexEndpoint" /> 12 12 <endpoint normalizedDigest="<?xml version="1.0" encoding="utf-16"?><Data address="net.tcp://localhost:9001/SlaveServiceStreamed" binding="netTcpBinding" bindingConfiguration="SlaveTcpStreamedEndpoint" contract="SlaveService.ISlaveFacade" name="SlaveTcpStreamedEndpoint"><identity><dns value="localhost" /></identity></Data>" digest="<?xml version="1.0" encoding="utf-16"?><Data address="net.tcp://localhost:9001/SlaveServiceStreamed" binding="netTcpBinding" bindingConfiguration="SlaveTcpStreamedEndpoint" contract="SlaveService.ISlaveFacade" name="SlaveTcpStreamedEndpoint"><identity><dns value="localhost" /></identity></Data>" contractName="SlaveService.ISlaveFacade" name="SlaveTcpStreamedEndpoint" /> -
branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/Service References/SlaveService/configuration91.svcinfo
r4338 r4342 1 1 <?xml version="1.0" encoding="utf-8"?> 2 <SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum=" IVbHOGoLIiHm7HALbaYOYdLHHj8=">2 <SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="T11XGf41DbSFPlmAHGf/VqqlcJw="> 3 3 <bindingConfigurations> 4 4 <bindingConfiguration bindingType="netTcpBinding" name="SlaveTcpStreamedEndpoint"> … … 421 421 </property> 422 422 <property path="/identity/certificate/encodedValue" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 423 <serializedValue>AwAAAAEAAAAUAAAA eBLH/0jWrlsW42fIC8VIIdAE6PUgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgyMzE1NTg0OFoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmOgweB6X4Ss6W2xb2hg1x61cjD2T7SO0ckkzmtqRhC2UWly9dBnonFJmg9RjN0y6l2tZhVzNhq8DgCkn3hPg5GL3XIwYX4PsXwNmeT6i+7s6rGbESuaEMvYOAQJSJ+MTgBvXCwo2g5nFHIBqP4W4aU2eybxP7H4cm1rQpoYHHjQIDAQABo0kwRzBFBgNVHQEEPjA8gBASDhO/IE7Ff7PpkCVF8oUpoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQADgYEAhxAzm3JTV7j51jti5P7izTEs7+8534kQloeAJDwlKolkd4ZMkf0BiexC2Vt1KsnxUjrK0HbbITzazkvkAmKi7dP+4G+3SrWag5lS4NcoPjTQy16T3zC9E6yafRaZp1/pxjC3Ap44qwq4Kjl2mEjeHHsdie/h4loowTqC9FlLbgo=</serializedValue>423 <serializedValue>AwAAAAEAAAAUAAAAJ5p7xBv8o/BZ9Lp1c1d+F13FxN8gAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhBvZlgTCjsfjEG5QUX7yOhOMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgzMDA5MTMyMVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbjJrhOtSpfFz51JPvdfxMVSKqnWhfzjrZvtwpVsy8D589m3SeS6AalWwtkpPCR2C+a4GKo9e689o0+BtuOugypAWqkUhkz//XLvUp5KPNB7igY7he4ngMLp4GsWBWZdl+P8g29t5+nde1Tiv6dPzx5YgfB9lrvZzaS6TT/eNasQIDAQABo0kwRzBFBgNVHQEEPjA8gBBPTuRH17g8MfpeT/ODWdXuoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghBvZlgTCjsfjEG5QUX7yOhOMAkGBSsOAwIdBQADgYEAUpgK4sUxAqwR8eyRK8cmyzhhN31xN8/nKPIo9cETaNvjJXL8zO7DeXCyyiBETAkfnhIChRIAmE/PjxvFdB2fOuQY3/OHrobai+G7IQ8SHF+AKdx7cJXt0h4Okny4DpPjQl4V9P2lZaG8fVXmpKhpeZ+ChA8Y/xPCDzTzLleQ/mY=</serializedValue> 424 424 </property> 425 425 <property path="/identity/certificateReference" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.CertificateReferenceElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> -
branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/SlaveServicePool.cs
r4338 r4342 8 8 using HeuristicLab.Hive.Slave.Communication.Properties; 9 9 using HeuristicLab.Tracing; 10 using System.ServiceModel.Security; 10 11 11 12 namespace HeuristicLab.Hive.Slave.Communication { … … 42 43 internal ISlaveFacade CreateStreamedSlaveFacade() { 43 44 lock (locker) { 44 if (cachedSlaveFacadeClientStreamed == null) { 45 cachedSlaveFacadeClientStreamed = new SlaveFacadeClient("SlaveTcpStreamedEndpoint"); 46 WcfSettings.SetEndpointAddress(cachedSlaveFacadeClientStreamed.Endpoint, this.serverIp); 47 SetCredentials(cachedSlaveFacadeClientStreamed); 48 cachedSlaveFacadeClientStreamed.Open(); 49 Logger.Debug("Created SlaveFacadeClientStreamed"); 45 try { 46 if (cachedSlaveFacadeClientStreamed == null) { 47 cachedSlaveFacadeClientStreamed = new SlaveFacadeClient("SlaveTcpStreamedEndpoint"); 48 WcfSettings.SetEndpointAddress(cachedSlaveFacadeClientStreamed.Endpoint, this.serverIp); 49 SetCredentials(cachedSlaveFacadeClientStreamed); 50 cachedSlaveFacadeClientStreamed.Open(); 51 Logger.Debug("Created SlaveFacadeClientStreamed"); 52 } 53 streamedClientCount++; 54 Logger.Debug("SlaveFacadeClientCount: " + streamedClientCount); 55 return cachedSlaveFacadeClientStreamed; 50 56 } 51 streamedClientCount++; 52 Logger.Debug("SlaveFacadeClientCount: " + streamedClientCount); 53 return cachedSlaveFacadeClientStreamed; 57 catch (MessageSecurityException exception) { 58 // more info in innerexception, probably credentials are wrong 59 throw exception.InnerException; 60 } 54 61 } 55 62 } 56 63 57 64 private void SetCredentials(SlaveFacadeClient client) { 65 Logger.Debug("Setting credentials for user \"" + Settings.Default.HiveUsername + "\""); 58 66 client.ClientCredentials.UserName.UserName = Settings.Default.HiveUsername; 59 67 client.ClientCredentials.UserName.Password = Settings.Default.HivePassword; … … 62 70 public void DisposeSlaveClient(ISlaveFacade slaveFacade) { 63 71 lock (locker) { 64 if (slaveFacade == cachedSlaveFacadeClient) { 65 clientCount--; 66 Logger.Debug("Disposing SlaveFacadeClient. Count: " + clientCount); 67 if (clientCount < 0) 68 throw new Exception("SlaveFacadeClient Count is less than zero. It was released too often."); 69 if (clientCount == 0) { 70 WcfSettings.DisposeWcfClient((ICommunicationObject)slaveFacade); 71 cachedSlaveFacadeClient = null; 72 if (slaveFacade != null) { 73 if (slaveFacade == cachedSlaveFacadeClient) { 74 clientCount--; 75 Logger.Debug("Disposing SlaveFacadeClient. Count: " + clientCount); 76 if (clientCount < 0) 77 throw new Exception("SlaveFacadeClient Count is less than zero. It was released too often."); 78 if (clientCount == 0) { 79 WcfSettings.DisposeWcfClient((ICommunicationObject)slaveFacade); 80 cachedSlaveFacadeClient = null; 81 } 82 } else if (slaveFacade == cachedSlaveFacadeClientStreamed) { 83 streamedClientCount--; 84 Logger.Debug("Disposing SlaveFacadeClientStreamed. Count: " + streamedClientCount); 85 if (streamedClientCount < 0) 86 throw new Exception("SlaveFacadeClientStreamed Count is less than zero. It was released too often."); 87 if (streamedClientCount == 0) { 88 WcfSettings.DisposeWcfClient((ICommunicationObject)slaveFacade); 89 cachedSlaveFacadeClientStreamed = null; 90 } 91 } else { 92 throw new Exception("Cannot dispose slaveFacade. Cannot be found in cache."); 72 93 } 73 } else if (slaveFacade == cachedSlaveFacadeClientStreamed) {74 streamedClientCount--;75 Logger.Debug("Disposing SlaveFacadeClientStreamed. Count: " + streamedClientCount);76 if (streamedClientCount < 0)77 throw new Exception("SlaveFacadeClientStreamed Count is less than zero. It was released too often.");78 if (streamedClientCount == 0) {79 WcfSettings.DisposeWcfClient((ICommunicationObject)slaveFacade);80 cachedSlaveFacadeClientStreamed = null;81 }82 } else {83 throw new Exception("Cannot dispose slaveFacade. Cannot be found in cache.");84 94 } 85 95 } // lock -
branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/app.config
r4338 r4342 7 7 </configSections> 8 8 <system.serviceModel> 9 <bindings> 10 <netTcpBinding> 11 <binding name="SlaveTcpStreamedEndpoint" closeTimeout="00:01:00" 12 openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" 13 transactionFlow="false" transferMode="Streamed" transactionProtocol="OleTransactions" 14 hostNameComparisonMode="StrongWildcard" listenBacklog="10" maxBufferPoolSize="524288" 15 maxBufferSize="65536" maxConnections="10" maxReceivedMessageSize="104857600"> 16 <readerQuotas maxDepth="32" maxStringContentLength="104857600" maxArrayLength="104857600" 17 maxBytesPerRead="4096" maxNameTableCharCount="16384" /> 18 <reliableSession ordered="true" inactivityTimeout="00:10:00" 19 enabled="false" /> 20 <security mode="TransportWithMessageCredential"> 21 <transport clientCredentialType="Windows" protectionLevel="EncryptAndSign" /> 22 <message clientCredentialType="UserName" algorithmSuite="Default" /> 23 </security> 24 </binding> 25 </netTcpBinding> 26 <wsHttpBinding> 27 <binding name="SlaveHttpEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00" 28 receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false" 29 transactionFlow="false" hostNameComparisonMode="StrongWildcard" 30 maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text" 31 textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false"> 32 <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" 33 maxBytesPerRead="4096" maxNameTableCharCount="16384" /> 34 <reliableSession ordered="true" inactivityTimeout="00:10:00" 35 enabled="false" /> 36 <security mode="Message"> 37 <transport clientCredentialType="Windows" proxyCredentialType="None" 38 realm="" /> 39 <message clientCredentialType="UserName" negotiateServiceCredential="true" 40 algorithmSuite="Default" /> 41 </security> 42 </binding> 43 </wsHttpBinding> 44 </bindings> 45 <client> 46 <endpoint address="http://localhost:9000/SlaveService" binding="wsHttpBinding" behaviorConfiguration="SlaveServiceBehaviour" 47 bindingConfiguration="SlaveHttpEndpoint" contract="SlaveService.ISlaveFacade" 48 name="SlaveHttpEndpoint"> 49 <identity> 50 <certificate encodedValue="AwAAAAEAAAAUAAAAJ5p7xBv8o/BZ9Lp1c1d+F13FxN8gAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhBvZlgTCjsfjEG5QUX7yOhOMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgzMDA5MTMyMVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbjJrhOtSpfFz51JPvdfxMVSKqnWhfzjrZvtwpVsy8D589m3SeS6AalWwtkpPCR2C+a4GKo9e689o0+BtuOugypAWqkUhkz//XLvUp5KPNB7igY7he4ngMLp4GsWBWZdl+P8g29t5+nde1Tiv6dPzx5YgfB9lrvZzaS6TT/eNasQIDAQABo0kwRzBFBgNVHQEEPjA8gBBPTuRH17g8MfpeT/ODWdXuoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghBvZlgTCjsfjEG5QUX7yOhOMAkGBSsOAwIdBQADgYEAUpgK4sUxAqwR8eyRK8cmyzhhN31xN8/nKPIo9cETaNvjJXL8zO7DeXCyyiBETAkfnhIChRIAmE/PjxvFdB2fOuQY3/OHrobai+G7IQ8SHF+AKdx7cJXt0h4Okny4DpPjQl4V9P2lZaG8fVXmpKhpeZ+ChA8Y/xPCDzTzLleQ/mY=" /> 51 </identity> 52 </endpoint> 53 <endpoint address="net.tcp://localhost:9001/SlaveServiceStreamed" behaviorConfiguration="SlaveServiceBehaviour" 54 binding="netTcpBinding" bindingConfiguration="SlaveTcpStreamedEndpoint" 55 contract="SlaveService.ISlaveFacade" name="SlaveTcpStreamedEndpoint"> 56 <identity> 57 <dns value="localhost" /> 58 </identity> 59 </endpoint> 60 </client> 9 61 <behaviors> 10 62 <endpointBehaviors> … … 18 70 </endpointBehaviors> 19 71 </behaviors> 20 <bindings> 21 <netTcpBinding> 22 <binding name="SlaveTcpStreamedEndpoint" closeTimeout="00:01:00" 23 openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:10:00" 24 transactionFlow="false" transferMode="Streamed" transactionProtocol="OleTransactions" 25 hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="104857600" 26 maxBufferSize="104857600" maxReceivedMessageSize="104857600"> 27 <readerQuotas maxDepth="32" maxStringContentLength="104857600" 28 maxArrayLength="104857600" maxBytesPerRead="4096" maxNameTableCharCount="16384" /> 29 <reliableSession ordered="true" inactivityTimeout="00:10:00" 30 enabled="false" /> 31 <security mode="TransportWithMessageCredential"> 32 <transport clientCredentialType="Windows" protectionLevel="EncryptAndSign" /> 33 <message clientCredentialType="UserName" algorithmSuite="Default" /> 34 </security> 35 </binding> 36 </netTcpBinding> 37 <wsHttpBinding> 38 <binding name="SlaveHttpEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00" 39 receiveTimeout="00:10:00" sendTimeout="00:10:00" bypassProxyOnLocal="false" 40 transactionFlow="false" hostNameComparisonMode="StrongWildcard" 41 maxBufferPoolSize="104857600" maxReceivedMessageSize="104857600" 42 messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" 43 allowCookies="false"> 44 <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" 45 maxBytesPerRead="4096" maxNameTableCharCount="16384" /> 46 <reliableSession ordered="true" inactivityTimeout="00:10:00" 47 enabled="false" /> 48 <security mode="Message"> 49 <transport clientCredentialType="Windows" proxyCredentialType="None" 50 realm="" /> 51 <message clientCredentialType="UserName" negotiateServiceCredential="true" 52 algorithmSuite="Default" /> 53 </security> 54 </binding> 55 <binding name="SlaveMexEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00" 56 receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false" 57 transactionFlow="false" hostNameComparisonMode="StrongWildcard" 58 maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text" 59 textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false"> 60 <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" 61 maxBytesPerRead="4096" maxNameTableCharCount="16384" /> 62 <reliableSession ordered="true" inactivityTimeout="00:10:00" 63 enabled="false" /> 64 <security mode="None"> 65 <transport clientCredentialType="Windows" proxyCredentialType="None" 66 realm="" /> 67 <message clientCredentialType="Windows" negotiateServiceCredential="true" /> 68 </security> 69 </binding> 70 </wsHttpBinding> 71 </bindings> 72 <client> 73 <endpoint address="http://localhost:9000/SlaveService" binding="wsHttpBinding" behaviorConfiguration="SlaveServiceBehaviour" 74 bindingConfiguration="SlaveHttpEndpoint" contract="SlaveService.ISlaveFacade" 75 name="SlaveHttpEndpoint"> 76 <identity> 77 <certificate encodedValue="AwAAAAEAAAAUAAAAeBLH/0jWrlsW42fIC8VIIdAE6PUgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgyMzE1NTg0OFoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmOgweB6X4Ss6W2xb2hg1x61cjD2T7SO0ckkzmtqRhC2UWly9dBnonFJmg9RjN0y6l2tZhVzNhq8DgCkn3hPg5GL3XIwYX4PsXwNmeT6i+7s6rGbESuaEMvYOAQJSJ+MTgBvXCwo2g5nFHIBqP4W4aU2eybxP7H4cm1rQpoYHHjQIDAQABo0kwRzBFBgNVHQEEPjA8gBASDhO/IE7Ff7PpkCVF8oUpoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQADgYEAhxAzm3JTV7j51jti5P7izTEs7+8534kQloeAJDwlKolkd4ZMkf0BiexC2Vt1KsnxUjrK0HbbITzazkvkAmKi7dP+4G+3SrWag5lS4NcoPjTQy16T3zC9E6yafRaZp1/pxjC3Ap44qwq4Kjl2mEjeHHsdie/h4loowTqC9FlLbgo=" /> 78 </identity> 79 </endpoint> 80 <endpoint address="http://localhost:9000/SlaveService/mex" binding="wsHttpBinding" behaviorConfiguration="SlaveMexEndpoint" 81 bindingConfiguration="SlaveMexEndpoint" contract="SlaveService.ISlaveFacade" 82 name="SlaveMexEndpoint" /> 83 <endpoint address="net.tcp://localhost:9001/SlaveServiceStreamed" behaviorConfiguration="SlaveServiceBehaviour" 84 binding="netTcpBinding" bindingConfiguration="SlaveTcpStreamedEndpoint" 85 contract="SlaveService.ISlaveFacade" name="SlaveTcpStreamedEndpoint"> 86 <identity> 87 <dns value="localhost" /> 88 </identity> 89 </endpoint> 90 </client> 72 91 73 </system.serviceModel> 92 74 <userSettings> -
branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/HiveSlaveConsole.cs
r4320 r4342 549 549 550 550 private void btnDisconnect_Click(object sender, EventArgs e) { 551 slaveCommunicator.DisconnectAsync();551 //slaveCommunicator.DisconnectAsync(); // [chn] todo 552 552 } 553 553 -
branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/Service References/SlaveConsoleService/Reference.cs
r4320 r4342 346 346 void EndSetConnection(System.IAsyncResult result); 347 347 348 [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveConsoleCommunicator/Disconnect", ReplyAction="http://tempuri.org/ISlaveConsoleCommunicator/DisconnectResponse")]349 void Disconnect();350 351 [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/ISlaveConsoleCommunicator/Disconnect", ReplyAction="http://tempuri.org/ISlaveConsoleCommunicator/DisconnectResponse")]352 System.IAsyncResult BeginDisconnect(System.AsyncCallback callback, object asyncState);353 354 void EndDisconnect(System.IAsyncResult result);355 356 348 [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ISlaveConsoleCommunicator/GetCurrentConnection", ReplyAction="http://tempuri.org/ISlaveConsoleCommunicator/GetCurrentConnectionResponse")] 357 349 HeuristicLab.Hive.Slave.Console.SlaveConsoleService.ConnectionContainer GetCurrentConnection(); … … 464 456 private System.Threading.SendOrPostCallback onSetConnectionCompletedDelegate; 465 457 466 private BeginOperationDelegate onBeginDisconnectDelegate;467 468 private EndOperationDelegate onEndDisconnectDelegate;469 470 private System.Threading.SendOrPostCallback onDisconnectCompletedDelegate;471 472 458 private BeginOperationDelegate onBeginGetCurrentConnectionDelegate; 473 459 … … 516 502 517 503 public event System.EventHandler<System.ComponentModel.AsyncCompletedEventArgs> SetConnectionCompleted; 518 519 public event System.EventHandler<System.ComponentModel.AsyncCompletedEventArgs> DisconnectCompleted;520 504 521 505 public event System.EventHandler<GetCurrentConnectionCompletedEventArgs> GetCurrentConnectionCompleted; … … 624 608 } 625 609 626 public void Disconnect() {627 base.Channel.Disconnect();628 }629 630 [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]631 public System.IAsyncResult BeginDisconnect(System.AsyncCallback callback, object asyncState) {632 return base.Channel.BeginDisconnect(callback, asyncState);633 }634 635 [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]636 public void EndDisconnect(System.IAsyncResult result) {637 base.Channel.EndDisconnect(result);638 }639 640 private System.IAsyncResult OnBeginDisconnect(object[] inValues, System.AsyncCallback callback, object asyncState) {641 return this.BeginDisconnect(callback, asyncState);642 }643 644 private object[] OnEndDisconnect(System.IAsyncResult result) {645 this.EndDisconnect(result);646 return null;647 }648 649 private void OnDisconnectCompleted(object state) {650 if ((this.DisconnectCompleted != null)) {651 InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));652 this.DisconnectCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(e.Error, e.Cancelled, e.UserState));653 }654 }655 656 public void DisconnectAsync() {657 this.DisconnectAsync(null);658 }659 660 public void DisconnectAsync(object userState) {661 if ((this.onBeginDisconnectDelegate == null)) {662 this.onBeginDisconnectDelegate = new BeginOperationDelegate(this.OnBeginDisconnect);663 }664 if ((this.onEndDisconnectDelegate == null)) {665 this.onEndDisconnectDelegate = new EndOperationDelegate(this.OnEndDisconnect);666 }667 if ((this.onDisconnectCompletedDelegate == null)) {668 this.onDisconnectCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnDisconnectCompleted);669 }670 base.InvokeAsync(this.onBeginDisconnectDelegate, null, this.onEndDisconnectDelegate, this.onDisconnectCompletedDelegate, userState);671 }672 673 610 public HeuristicLab.Hive.Slave.Console.SlaveConsoleService.ConnectionContainer GetCurrentConnection() { 674 611 return base.Channel.GetCurrentConnection(); -
branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/Service References/SlaveConsoleService/service.wsdl
r4320 r4342 33 33 <wsdl:part name="parameters" element="tns:SetConnectionResponse" /> 34 34 </wsdl:message> 35 <wsdl:message name="ISlaveConsoleCommunicator_Disconnect_InputMessage">36 <wsdl:part name="parameters" element="tns:Disconnect" />37 </wsdl:message>38 <wsdl:message name="ISlaveConsoleCommunicator_Disconnect_OutputMessage">39 <wsdl:part name="parameters" element="tns:DisconnectResponse" />40 </wsdl:message>41 35 <wsdl:message name="ISlaveConsoleCommunicator_GetCurrentConnection_InputMessage"> 42 36 <wsdl:part name="parameters" element="tns:GetCurrentConnection" /> … … 72 66 <wsdl:output wsaw:Action="http://tempuri.org/ISlaveConsoleCommunicator/SetConnectionResponse" message="tns:ISlaveConsoleCommunicator_SetConnection_OutputMessage" /> 73 67 </wsdl:operation> 74 <wsdl:operation name="Disconnect">75 <wsdl:input wsaw:Action="http://tempuri.org/ISlaveConsoleCommunicator/Disconnect" message="tns:ISlaveConsoleCommunicator_Disconnect_InputMessage" />76 <wsdl:output wsaw:Action="http://tempuri.org/ISlaveConsoleCommunicator/DisconnectResponse" message="tns:ISlaveConsoleCommunicator_Disconnect_OutputMessage" />77 </wsdl:operation>78 68 <wsdl:operation name="GetCurrentConnection"> 79 69 <wsdl:input wsaw:Action="http://tempuri.org/ISlaveConsoleCommunicator/GetCurrentConnection" message="tns:ISlaveConsoleCommunicator_GetCurrentConnection_InputMessage" /> … … 108 98 <wsdl:operation name="SetConnection"> 109 99 <soap12:operation soapAction="http://tempuri.org/ISlaveConsoleCommunicator/SetConnection" style="document" /> 110 <wsdl:input>111 <soap12:body use="literal" />112 </wsdl:input>113 <wsdl:output>114 <soap12:body use="literal" />115 </wsdl:output>116 </wsdl:operation>117 <wsdl:operation name="Disconnect">118 <soap12:operation soapAction="http://tempuri.org/ISlaveConsoleCommunicator/Disconnect" style="document" />119 100 <wsdl:input> 120 101 <soap12:body use="literal" /> -
branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/Service References/SlaveConsoleService/service.xsd
r4320 r4342 23 23 </xs:element> 24 24 <xs:element name="SetConnectionResponse"> 25 <xs:complexType>26 <xs:sequence />27 </xs:complexType>28 </xs:element>29 <xs:element name="Disconnect">30 <xs:complexType>31 <xs:sequence />32 </xs:complexType>33 </xs:element>34 <xs:element name="DisconnectResponse">35 25 <xs:complexType> 36 26 <xs:sequence /> -
branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/HeartbeatManager.cs
r4337 r4342 108 108 109 109 } // lock 110 try {111 heartBeatThreadIsSleepingLock.EnterWriteLock();112 heartBeatThreadIsSleeping = true;113 heartBeatThreadIsSleepingLock.ExitWriteLock();114 115 Thread.Sleep(Interval);116 117 heartBeatThreadIsSleepingLock.EnterWriteLock();118 heartBeatThreadIsSleeping = false;119 heartBeatThreadIsSleepingLock.ExitWriteLock();120 }121 catch (ThreadInterruptedException e) {122 Logger.Debug("Heartbeat sleep interrupted");123 }124 110 } 125 111 catch (Exception e) { 126 112 Logger.Error("Heartbeat Thread failed badly: " + e.Message); 113 } 114 115 try { 116 heartBeatThreadIsSleepingLock.EnterWriteLock(); 117 heartBeatThreadIsSleeping = true; 118 heartBeatThreadIsSleepingLock.ExitWriteLock(); 119 120 Thread.Sleep(Interval); 121 122 heartBeatThreadIsSleepingLock.EnterWriteLock(); 123 heartBeatThreadIsSleeping = false; 124 heartBeatThreadIsSleepingLock.ExitWriteLock(); 125 } 126 catch (ThreadInterruptedException e) { 127 Logger.Debug("Heartbeat sleep interrupted"); 127 128 } 128 129 } // while
Note: See TracChangeset
for help on using the changeset viewer.