Changeset 4425


Ignore:
Timestamp:
09/17/10 11:54:44 (9 years ago)
Author:
cneumuel
Message:
  • removed port setting from HiveServerConsole (port is configured in config file)
  • updated Files.txt
Location:
branches/3.3-Hive/sources/HeuristicLab.Hive
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Calendar/3.3/Properties/AssemblyInfo.cs

    r4424 r4425  
    5858// [assembly: AssemblyVersion("1.0.*")]
    5959[assembly: AssemblyVersion("3.3.0.0")]
    60 [assembly: AssemblyFileVersion("3.3.0.4423")]
     60[assembly: AssemblyFileVersion("3.3.0.4424")]
  • branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive 3.3.sln

    r4424 r4425  
    256256    {A84C0A25-13D0-40A6-924F-53556D9691DC}.Debug|x86.ActiveCfg = Debug|x86
    257257    {A84C0A25-13D0-40A6-924F-53556D9691DC}.Debug|x86.Build.0 = Debug|x86
    258     {A84C0A25-13D0-40A6-924F-53556D9691DC}.Release|Any CPU.ActiveCfg = Release|x86
     258    {A84C0A25-13D0-40A6-924F-53556D9691DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
     259    {A84C0A25-13D0-40A6-924F-53556D9691DC}.Release|Any CPU.Build.0 = Release|Any CPU
    259260    {A84C0A25-13D0-40A6-924F-53556D9691DC}.Release|Mixed Platforms.ActiveCfg = Release|x86
    260261    {A84C0A25-13D0-40A6-924F-53556D9691DC}.Release|Mixed Platforms.Build.0 = Release|x86
     
    270271    {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Debug|x86.ActiveCfg = Debug|x86
    271272    {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Debug|x86.Build.0 = Debug|x86
    272     {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Release|Any CPU.ActiveCfg = Release|x86
     273    {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Release|Any CPU.ActiveCfg = Release|Any CPU
     274    {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Release|Any CPU.Build.0 = Release|Any CPU
    273275    {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Release|Mixed Platforms.ActiveCfg = Release|x86
    274276    {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Release|Mixed Platforms.Build.0 = Release|x86
  • branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HiveServerConsole.Designer.cs

    r4424 r4425  
    4747      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HiveServerConsole));
    4848      this.gbConfiguration = new System.Windows.Forms.GroupBox();
    49       this.lblPort = new System.Windows.Forms.Label();
    5049      this.lblIp = new System.Windows.Forms.Label();
    51       this.tbPort = new System.Windows.Forms.TextBox();
    5250      this.tbIp = new System.Windows.Forms.TextBox();
    5351      this.btnLogin = new System.Windows.Forms.Button();
     
    6765      // gbConfiguration
    6866      //
    69       this.gbConfiguration.Controls.Add(this.lblPort);
    7067      this.gbConfiguration.Controls.Add(this.lblIp);
    71       this.gbConfiguration.Controls.Add(this.tbPort);
    7268      this.gbConfiguration.Controls.Add(this.tbIp);
    7369      this.gbConfiguration.Location = new System.Drawing.Point(188, 100);
     
    7874      this.gbConfiguration.Text = "Configuration";
    7975      //
    80       // lblPort
    81       //
    82       this.lblPort.AutoSize = true;
    83       this.lblPort.Location = new System.Drawing.Point(16, 54);
    84       this.lblPort.Name = "lblPort";
    85       this.lblPort.Size = new System.Drawing.Size(26, 13);
    86       this.lblPort.TabIndex = 3;
    87       this.lblPort.Text = "Port";
    88       //
    8976      // lblIp
    9077      //
     
    9582      this.lblIp.TabIndex = 2;
    9683      this.lblIp.Text = "IP";
    97       //
    98       // tbPort
    99       //
    100       this.tbPort.Location = new System.Drawing.Point(77, 47);
    101       this.tbPort.Name = "tbPort";
    102       this.tbPort.Size = new System.Drawing.Size(189, 20);
    103       this.tbPort.TabIndex = 6;
    104       this.tbPort.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.HiveServerConsole_KeyPress);
    10584      //
    10685      // tbIp
     
    233212
    234213    private System.Windows.Forms.GroupBox gbConfiguration;
    235     private System.Windows.Forms.Label lblPort;
    236214    private System.Windows.Forms.Label lblIp;
    237     private System.Windows.Forms.TextBox tbPort;
    238215    private System.Windows.Forms.TextBox tbIp;
    239216    private System.Windows.Forms.Button btnLogin;
  • branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HiveServerConsole.cs

    r4424 r4425  
    5454
    5555      ServiceLocator.Address = newIp;
    56       ServiceLocator.Port = this.tbPort.Text;
    5756
    5857      if (IsValid()) {
     
    7372      if (IsFormValidated()) {
    7473        IPAddress ipAdress = IPAddress.Parse(tbIp.Text);
    75         int port = int.Parse(tbPort.Text);
    7674        IServerConsoleFacade scf;
    7775        Response resp;
     
    8280
    8381          ServiceLocator.Address = tbIp.Text.Replace(" ", "");
    84           ServiceLocator.Port = tbPort.Text;
    8582          ServiceLocator.Username = tbUserName.Text;
    8683          ServiceLocator.Password = tbPwd.Text;
     
    136133        isValid = false;
    137134      }
    138       if (String.IsNullOrEmpty(tbPort.Text)) {
    139         lblError.Text = "Please type in IP-Address.";
    140         isValid = false;
    141       }
    142       try {
    143         int.Parse(tbPort.Text);
    144       }
    145       catch (Exception ex) {
    146         isValid = false;
    147         lblError.Text = "Please verify entered Port.";
    148       }
    149135      try {
    150136        IPAddress.Parse(tbIp.Text);
  • branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HiveServerConsole.resx

    r2065 r4425  
    121121  <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    122122    <value>
    123         R0lGODlh7gDTAPcAAAAAAIAAAACAAICAAAAAgIAAgACAgMDAwMDcwKbK8AQEBAgICAwMDBERERYWFhwc
     123        R0lGODlh7gDTAIcAAAAAAIAAAACAAICAAAAAgIAAgACAgMDAwMDcwKbK8AQEBAgICAwMDBERERYWFhwc
    124124        HCIiIikpKVVVVU1NTUJCQjk5Of98gP9QUNYAk8zs/+/Wxufn1q2pkDMAAGYAAJkAAMwAAAAzADMzAGYz
    125125        AJkzAMwzAP8zAABmADNmAGZmAJlmAMxmAP9mAACZADOZAGaZAJmZAMyZAP+ZAADMADPMAGbMAJnMAMzM
     
    134134        //+Z/wDM/zPM/2bM/5nM/8zM///M/zP//2b/zJn//8z///9mZmb/Zv//ZmZm//9m/2b//6UAIV9fX3d3
    135135        d4aGhpaWlsvLy7KystfX193d3ePj4+rq6vHx8fj4+P/78KCgpICAgP8AAAD/AP//AAAA//8A/wD/////
    136         /ywAAAAA7gDTAAAI/wD/CRxIsKDBgwgTKlzIsKFDhPUydEtAsWKGDPUeatzIsaPHjyBDihxJMEPFkygp
    137         0iPJsqXLlzBjbqSXsibKjDJz6tzJs+fAiTaDUuzms6jRo0gT1hPKtCLOpFCjSmVJs6nVp1Ozat0K0arX
    138         BFzDitX69evYs2h9lv1KNK3btyxNrvWaAa7duxuXzv2KFa/fvwP3rgVM+K9cwV77Fl58FvFgxpDHHnZs
    139         tW7ky1n1UjaLuTNUwRf3WvZMuqfmsjgncy7NOufelQNVe21N+2XVsqMDz4Vdu3fIvYpPr/ZNfKPsprlL
    140         zk1evLnSvQqhO5+eULTC40zbUt8u8HZZhsC5c/+XvlD4bPHTsQtljlB9UN7oiZNnaN5q/OLubbJPmL/m
    141         /vud1ddUXuEB2FqBGvVXk4GsCciUR68xSNp8HFEoIWMKovRfQxmetOGFdzkolEgWgvgXULiJ1KFFJhYm
    142         YlAkIdgiXiV65N1wM8J1Y2UtyZijWz6SONePcK1I0YcdWUdkWjUK+diSY6H4FZI2zqUdlFvtaJ9MQWIZ
    143         VZcsvWiTl1oZmQCVIZkJH5lJNdmSmAuyCZWZaKq4nJxIwZlSUW7iGROYCNEjkUkXzaMYf336+Wai3SF3
    144         qEERKroTo/+kWB6lkn6kJVNIbvrgQkpmChOgApnpFKhDivpSqF05thCdqi7/mmp0m6G61qOxVjhrdZsl
    145         gOs/eqKUq0ieBnXlQcEOSOutw4JEaqW9UvRrshU16xGstvb6IbbWapSoqcZeumu3DHHLa7QUlYuptdSm
    146         Cx660r7LLLnZfrUmQvDGK+6T9B5kakPtNnXvQc92S2mxgg1M8Lj9lnpnQwjPxY3CBpnbcMAPRbzbQ+tm
    147         WvBA9HCT768F/dswsOsGzBTJBX3s8Vwst5wvgQw3qzFKxzaUL1gbsWqtywTlm7PONccqJV0dgatf0g83
    148         i3FH88A7D4Qw/9w0zdHGfNDNJw0tKdcVee0QvM5WnSvQC0cL0tOqWszR0YiJ7ZDbfnbsb7R1tjqvpHTP
    149         /4S3nWvJjaXdyGY9EtomRuokZSSxLSfY1cbYa1wb40k4orU2fvl9fVdJWd7qrgU6gI6PpLKHLm0unplT
    150         p06Z1g91bmLpkru6qtlLIj434y/R3iLkCQj+kdLu3i567ri7BDzqfxYtoewhnX6mTNDH53uPiMGepPMA
    151         +my86hCDT9v1LSk9afIMis8hYjypT1r1poPGE/zO6U711TKRvx39h9vPdODp4973vqMW9HEHbgIrisl6
    152         srz7NLAoUTueAisnHv99pF2ji577CrNAPu3NJ/wrzQZ79sEC8ss5IWwJAkeElBReRn86MdJnDNgbCxLL
    153         UnkaIVxgqJNkZZAlivONDv+35xWK9WSIaAHeD7GXGKm4kDBIfBuO2kRDz3ivhVNEygNbw0MGIi0rNnxL
    154         GMP0RTAKcDFK5EoRt7JCoRhxMWNk4sq20kXD4G8qCgrLE4F0xqPASSxBhEwb3yMWMS1RJluETB2Pgpyx
    155         BLIwcRwVU96YlEWmJZF6nKNk7viXKJIkP0zqY1oGuTS0vCgtZhKeKT0JxKAcsn1VFCMF0bIet1iSjqxs
    156         pU0oOZVIevCEaFGP9mYITLekES4RjNNb9kjFEq5yTHbxZQw5SUv/3AV4qpzKLXtZE15uRZrNW4s32ViT
    157         YUplm0bBZJGUeRc1hbKYb0nmSf6Czp4wMyrmeWVS7un/GlE6UkNQjOWcqAmXlLTOjv40TS51cjRzfnOW
    158         3HQmXlSzmHrCxKJaichFLoIhghploWQCaehweLL1SRAqAXNov8C5EVJ2s6RYI2AOEwpTgbB0bDStqU1z
    159         OpJj6jRBHg0nan4a0yzmhJ8l7WAPRSqqm6atLON8i0Y9hJHOgFSdhImYPssU1P5J1C/JOqiLcolUPHZ1
    160         mWf9iFNByD7GeLKsUSEezwqDzYsyNSbLw5lbIerVocKxV1EtpA4xmhW5zvOvJ+0rXyoKL5U+FJ7/Iylg
    161         DNu1jia2bF+9y84gM8Yr+mVnjs0o+AhLlnxtVSqP9JZA7ZLXWnKWp40CIGRa68rI/+xxrUWhbSkZg064
    162         anNnpzVrTu96PngF9p1+dYhLUxJcM5INM4skbViWK9PLpPap9vKMbgFqxT4q1broKk31iOuT7R6JNX3y
    163         rVgo25q66q26InwdbcDkzvE5prlj8Z10pSq/Gt4Rt2FZrVXHhUHn3Ay/aE0sgM8iqNpShzw+3Y5GLxLa
    164         yACvddQ9LFEbkyoBb/hLg2nXh1EpThmO+JlTuuyJM7mzU624mi2e64v/2WIEz5hyNb7xWSirnwrruCX0
    165         yHCMh0zkIhv5yEhOspKXzOQmw4vHTo6ylKf8ZOlR+cpYzvJQtczlLnvZdlD+spjHbGTLWJnMaE5zi5Wj
    166         5ja7mTfJyXmznOdMZOzS+c54dl6e98xnZZ2rz4DuM9ECTWg61ynMhU50kUeHaEU7+m+aavSjJz2lhgQE
    167         ADs=
     136        /yH/C05FVFNDQVBFMi4wAwEBAAAh+QQAAAAAACwAAAAA7gDTAAAI/wD/CRxIsKDBgwgTKlzIsKFDhPUy
     137        dEtAsWKGDPUeatzIsaPHjyBDihxJMEPFkygp0iPJsqXLlzBjbqSXsibKjDJz6tzJs+fAiTaDUuzms6jR
     138        o0gT1hPKtCLOpFCjSmVJs6nVp1Ozat0K0arXBFzDitX69evYs2h9lv1KNK3btyxNrvWaAa7duxuXzv2K
     139        Fa/fvwP3rgVM+K9cwV77Fl58FvFgxpDHHnZstW7ky1n1UjaLuTNUwRf3WvZMuqfmsjgncy7NOufelQNV
     140        e21N+2XVsqMDz4Vdu3fIvYpPr/ZNfKPsprlLzk1evLnSvQqhO5+eULTC40zbUt8u8HZZhsC5c8yXvlD4
     141        bPHTsQtljlB9UN7oiZNnaN5q/OLubbJPmL/m/vud1ddUXuEB2FqBGvVXk4GsCciUR68xSNp8HFEoIWMK
     142        ovRfQxmetOGFdzkolEgWgvgXULiJ1KFFJhYmYlAkIdgiXiV65N1wM8J1Y2UtyZijWz6SONePcK1I0Ycd
     143        WUdkWjUK+diSY6H4FZI2zqUdlFvtaJ9MQWIZVZcsvWiTl1oZmQCVIZkJH5lJNdmSmAuyCZWZaKq4nJxI
     144        wZlSUW7iGROYCNEjkUkXzaMYf33/+vlmot0hd6hBESq6E6P/pFgepZJ+pCVTSG764EJKZgoToAKZ6RSo
     145        Q4r6UqhdObYQnaoummp0m6G61qOxVjhrdZslgOs/eqKUq0ieBnXlQcEOSOutw4JEaqW9UvRrshU16xGs
     146        tvb6IbbWapSoqcZeumu3DHHLa7QUlYuptdSmCx660r7LLLnZfrUmQvDGK+6T9B5kakPtNnXvQc92S2mx
     147        gg1M8Lj9lnpnQwjPxY3CBpnbcMAPRbzbQ+tmWvBA9HCT768F/dswsOsGzBTJBX3s8Vwst5wvgQw3qzFK
     148        xzaUL1gbsWqtywTlm7PONccqJV0dgatf0g83i3FH88A7D4Qw1v/cNM3RxnzQzScNLSnXFXntELzOVp0r
     149        0AtHC9LTqlrM0dGIie2Q23527G+0dbY6r6R0z4S3nWvJjaXdyGY9EtomRuokZSSxLSfY1cbYa1wb40k4
     150        orU2fvl9fVdJWd7qrgU6gI6PpLKHLm0unplTp06Z1g91bmLpkru6qtlLIj434y/R3iLkCQj+kdLu3i56
     151        7ri7BDzqfxYtoewhnX6mTNDH53uPiMGepPMA+my86hCDT9v1LSk9afIMis8hYjypT1r1poPGE/zO6U71
     152        1TKRvx39h9vPdOD/6ePe976jFvRxB24CK4rJerK8+zSwKFE7ngIrJx7/faRdo4ue+wqzQD7tzSf8K80G
     153        e/bBAvLLOSFsCQJHhJQUXkZ/OjHSZwzYGwsSy1J5GiFcYKiTZGWQJYrzjQ635xWK9WSIaAHeD7GXGKm4
     154        kDBIfBuO2kRDz3ivhVNEygNbw0MGIi0rNnxLGMP0RTAKcDFK5EoRt7JCoRhxMWNk4sq20kXD4G8qCgrL
     155        E4F0xqPASSxBhEwb3yMWMS1RJluETB2PgpyxBLIwcRwVU96YlEWmJZF6nKNk7viXKJIkP0zqY1oGuTS0
     156        vCgtZhKeKT0JxKAcsn1VFCMF0bIet1iSjqxsuqVNKDmVSHrwhGhRj/ZmCEy3pBEuEYzTW/ZIxRKuckx2
     157        8WUMOUlL/9wFeKqcyi17WRNebkWazVuLN9lYk2FKZZtGwWSRlHkXNYWymG9J5kn+gs6eMDMq5nllUu7p
     158        GlE6UkNQjOWcqAmXlLTOjv40TS51cjRzfnOW3HQmXlSzmHrCxKJaichFLoIhghploWQCaehweLL1SRAq
     159        AXNov8C5EVJ2s6RYI2AOEwpTgbB0bDStqU1zOpJj6jRBHv8NJ2p+GtMs5oSfJe1gD0UqqpumrSzjfItG
     160        PYSRzoBUnYSJmD7LFNT+SdQvyTqoi3KJVDx2dZln/YhTQcg+xniyrFEhHs8Kg82LMjUmy8OZWyHq1aHC
     161        sVdRLaQOMZoVuc7zryftK18qCi+VPhSe/yMpYAzbtY4mtmxfvcvOIDPGK/plZ47NKPgIS5Z8bVUqj/SW
     162        QO2S11pylqeNAiBkWuvKyOxxrUWhbSkZg064anNnpzVrTu96PngF9p1+dYhLUxJcM5INM4skbViWK9PL
     163        pPap9vKMbgFqxT4q1broKk31iOuT7R6JNX3yrVgo25q66q26InwdbcDkzvE5prlj8Z2KdKUqvxreEbdh
     164        Wa1Vx4VB59wMv2hNLIDPIqjaUoc8Pt2ORi8S2sgAr3XUPSxRG5MqAW/4S4Np14dRKU4ZjviZU7rsiTO5
     165        s1OtuJotnuuL/9liBM+YcjW+8Vkoq58K67gl9MhwjIdM5CIb+chITrKSl8zkJsOLx06OspSn/GTpUfnK
     166        WM7yULXM5S57Ttl2UP6ymMdsZMtYmcxoTnOLlaPmNruZycl5s5znTGTs0vnOeHZenvfMZ2Wdq8+A7jPR
     167        Ak1oOtcpzIVOdJFHh2hFO/pvmmr0oyc9pYYEBAA7
    168168</value>
    169169  </data>
  • branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/ServiceLocator.cs

    r4424 r4425  
    1010
    1111    internal static string Address { get; set; }
    12     internal static string Port { get; set; }
    1312    internal static string Username { get; set; }
    1413    internal static string Password { get; set; } // [chn] TODO: Don't store plaintext password in memory!
     
    2322
    2423    internal static IServerConsoleFacade GetServerConsoleFacade() {
    25       if (serverConsoleFacade == null && Address != String.Empty && Port != String.Empty) {
     24      if (serverConsoleFacade == null && Address != String.Empty) {
    2625        ChannelFactory<IServerConsoleFacade> factory = new ChannelFactory<IServerConsoleFacade>("ServerConsoleHttpEndpoint");
    2726        WcfSettings.SetEndpointAddress(factory.Endpoint, Address);
  • branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/Files.txt

    r4296 r4425  
    55
    66HeuristicLab.DataAccess\3.3:HeuristicLab.DataAccess-3.3.dll
    7 HeuristicLab.DataAccess.ADOHelper\3.3:HeuristicLab.DataAccess.ADOHelper-3.3.dll
    87
    98HeuristicLab.Hive.Slave.Common\3.3:HeuristicLab.Hive.Slave.Common-3.3.dll
Note: See TracChangeset for help on using the changeset viewer.