Changeset 4425

Timestamp:

09/17/10 11:54:44 (14 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:

• HeuristicLab.Calendar/3.3/Properties/AssemblyInfo.cs (modified) (1 diff)
• HeuristicLab.Hive 3.3.sln (modified) (2 diffs)
• HeuristicLab.Hive.Server.Console/3.3/HiveServerConsole.Designer.cs (modified) (5 diffs)
• HeuristicLab.Hive.Server.Console/3.3/HiveServerConsole.cs (modified) (4 diffs)
• HeuristicLab.Hive.Server.Console/3.3/HiveServerConsole.resx (modified) (2 diffs)
• HeuristicLab.Hive.Server.Console/3.3/ServiceLocator.cs (modified) (2 diffs)
• HeuristicLab.Hive/3.3/Files.txt (modified) (1 diff)

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Calendar/3.3/Properties/AssemblyInfo.cs

@@ -58 +58 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.0.4423")]
+[assembly: AssemblyFileVersion("3.3.0.4424")]

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive 3.3.sln

@@ -256 +256 @@
     {A84C0A25-13D0-40A6-924F-53556D9691DC}.Debug|x86.ActiveCfg = Debug|x86
     {A84C0A25-13D0-40A6-924F-53556D9691DC}.Debug|x86.Build.0 = Debug|x86
-    {A84C0A25-13D0-40A6-924F-53556D9691DC}.Release|Any CPU.ActiveCfg = Release|x86
+    {A84C0A25-13D0-40A6-924F-53556D9691DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {A84C0A25-13D0-40A6-924F-53556D9691DC}.Release|Any CPU.Build.0 = Release|Any CPU
     {A84C0A25-13D0-40A6-924F-53556D9691DC}.Release|Mixed Platforms.ActiveCfg = Release|x86
     {A84C0A25-13D0-40A6-924F-53556D9691DC}.Release|Mixed Platforms.Build.0 = Release|x86
@@ -270 +271 @@
     {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Debug|x86.ActiveCfg = Debug|x86
     {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Debug|x86.Build.0 = Debug|x86
-    {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Release|Any CPU.ActiveCfg = Release|x86
+    {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Release|Any CPU.Build.0 = Release|Any CPU
     {4F15BEA2-F494-4584-A0E5-6BA85377B313}.Release|Mixed Platforms.ActiveCfg = Release|x86
     {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

@@ -47 +47 @@
       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HiveServerConsole));
       this.gbConfiguration = new System.Windows.Forms.GroupBox();
-      this.lblPort = new System.Windows.Forms.Label();
       this.lblIp = new System.Windows.Forms.Label();
-      this.tbPort = new System.Windows.Forms.TextBox();
       this.tbIp = new System.Windows.Forms.TextBox();
       this.btnLogin = new System.Windows.Forms.Button();
@@ -67 +65 @@
       // gbConfiguration
       // 
-      this.gbConfiguration.Controls.Add(this.lblPort);
       this.gbConfiguration.Controls.Add(this.lblIp);
-      this.gbConfiguration.Controls.Add(this.tbPort);
       this.gbConfiguration.Controls.Add(this.tbIp);
       this.gbConfiguration.Location = new System.Drawing.Point(188, 100);
@@ -78 +74 @@
       this.gbConfiguration.Text = "Configuration";
       // 
-      // lblPort
-      // 
-      this.lblPort.AutoSize = true;
-      this.lblPort.Location = new System.Drawing.Point(16, 54);
-      this.lblPort.Name = "lblPort";
-      this.lblPort.Size = new System.Drawing.Size(26, 13);
-      this.lblPort.TabIndex = 3;
-      this.lblPort.Text = "Port";
-      // 
       // lblIp
       // 
@@ -95 +82 @@
       this.lblIp.TabIndex = 2;
       this.lblIp.Text = "IP";
-      // 
-      // tbPort
-      // 
-      this.tbPort.Location = new System.Drawing.Point(77, 47);
-      this.tbPort.Name = "tbPort";
-      this.tbPort.Size = new System.Drawing.Size(189, 20);
-      this.tbPort.TabIndex = 6;
-      this.tbPort.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.HiveServerConsole_KeyPress);
       // 
       // tbIp
@@ -233 +212 @@
 
     private System.Windows.Forms.GroupBox gbConfiguration;
-    private System.Windows.Forms.Label lblPort;
     private System.Windows.Forms.Label lblIp;
-    private System.Windows.Forms.TextBox tbPort;
     private System.Windows.Forms.TextBox tbIp;
     private System.Windows.Forms.Button btnLogin;

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HiveServerConsole.cs

@@ -54 +54 @@
 
       ServiceLocator.Address = newIp;
-      ServiceLocator.Port = this.tbPort.Text;
 
       if (IsValid()) {
@@ -73 +72 @@
       if (IsFormValidated()) {
         IPAddress ipAdress = IPAddress.Parse(tbIp.Text);
-        int port = int.Parse(tbPort.Text);
         IServerConsoleFacade scf;
         Response resp;
@@ -82 +80 @@
 
           ServiceLocator.Address = tbIp.Text.Replace(" ", "");
-          ServiceLocator.Port = tbPort.Text;
           ServiceLocator.Username = tbUserName.Text;
           ServiceLocator.Password = tbPwd.Text;
@@ -136 +133 @@
         isValid = false;
       }
-      if (String.IsNullOrEmpty(tbPort.Text)) {
-        lblError.Text = "Please type in IP-Address.";
-        isValid = false;
-      }
-      try {
-        int.Parse(tbPort.Text);
-      }
-      catch (Exception ex) {
-        isValid = false;
-        lblError.Text = "Please verify entered Port.";
-      }
       try {
         IPAddress.Parse(tbIp.Text);

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HiveServerConsole.resx

@@ -121 +121 @@
   <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        R0lGODlh7gDTAPcAAAAAAIAAAACAAICAAAAAgIAAgACAgMDAwMDcwKbK8AQEBAgICAwMDBERERYWFhwc
+        R0lGODlh7gDTAIcAAAAAAIAAAACAAICAAAAAgIAAgACAgMDAwMDcwKbK8AQEBAgICAwMDBERERYWFhwc
         HCIiIikpKVVVVU1NTUJCQjk5Of98gP9QUNYAk8zs/+/Wxufn1q2pkDMAAGYAAJkAAMwAAAAzADMzAGYz
         AJkzAMwzAP8zAABmADNmAGZmAJlmAMxmAP9mAACZADOZAGaZAJmZAMyZAP+ZAADMADPMAGbMAJnMAMzM
@@ -134 +134 @@
         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
-        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
-        ADs=
+        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
 </value>
   </data>

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/ServiceLocator.cs

@@ -10 +10 @@
 
     internal static string Address { get; set; }
-    internal static string Port { get; set; }
     internal static string Username { get; set; }
     internal static string Password { get; set; } // [chn] TODO: Don't store plaintext password in memory!
@@ -23 +22 @@
 
     internal static IServerConsoleFacade GetServerConsoleFacade() {
-      if (serverConsoleFacade == null && Address != String.Empty && Port != String.Empty) {
+      if (serverConsoleFacade == null && Address != String.Empty) {
         ChannelFactory<IServerConsoleFacade> factory = new ChannelFactory<IServerConsoleFacade>("ServerConsoleHttpEndpoint");
         WcfSettings.SetEndpointAddress(factory.Endpoint, Address);

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/Files.txt

@@ -5 +5 @@
 
 HeuristicLab.DataAccess\3.3:HeuristicLab.DataAccess-3.3.dll
-HeuristicLab.DataAccess.ADOHelper\3.3:HeuristicLab.DataAccess.ADOHelper-3.3.dll
 
 HeuristicLab.Hive.Slave.Common\3.3:HeuristicLab.Hive.Slave.Common-3.3.dll