Changeset 4305 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3

Timestamp:

08/24/10 18:37:04 (14 years ago)

Author:

cneumuel

Message:

added streamedHttpEndpoit binding (without message-security (for now)) (#1168)

Location:

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3

Files:

• HeuristicLab.Hive.Experiment-3.3.csproj (modified) (4 diffs)
• HiveExperiment.cs (modified) (15 diffs)
• Properties/Settings.Designer.cs (modified) (3 diffs)
• Properties/Settings.settings (modified) (1 diff)
• ServiceLocator.cs (modified) (1 diff)
• Settings.cs (deleted)
• Tools (added)
• Tools/RecreateServiceConfig.bat (added)
• app.config (modified) (1 diff)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HeuristicLab.Hive.Experiment-3.3.csproj

@@ -85 +85 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml.Linq" />
@@ -104 +105 @@
     </Compile>
     <Compile Include="ServiceLocator.cs" />
-    <Compile Include="Settings.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -113 +113 @@
     <None Include="Properties\AssemblyInfo.frame" />
     <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
+      <Generator>PublicSettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
+    <None Include="Tools\RecreateServiceConfig.bat" />
   </ItemGroup>
   <ItemGroup>
@@ -130 +131 @@
       <Name>HeuristicLab.Hive.JobBase-3.3</Name>
     </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <WCFMetadata Include="Service References\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs

@@ -43 +43 @@
 using System.ServiceModel;
 using HeuristicLab.Hive.Contracts.ResponseObjects;
+using HeuristicLab.Hive.Experiment.Properties;
 
 namespace HeuristicLab.Hive.Experiment {
@@ -90 +91 @@
       }
     }
-    
+
     #region Storable Properties
     [Storable]
@@ -114 +115 @@
     public JobItemList JobItems {
       get { return jobItems; }
-    }
-
-
-    [Storable]
-    private string serverUrl;
-    public string ServerUrl {
-      get { return serverUrl; }
-      set {
-        if (serverUrl != value) {
-          serverUrl = value;
-          OnServerUrlChanged();
-        }
-      }
     }
 
@@ -191 +179 @@
     public HiveExperiment()
       : base(itemName, itemDescription) {
-      this.ServerUrl = HeuristicLab.Hive.Experiment.Properties.Settings.Default.HiveServerUrl;
       this.ResourceIds = HeuristicLab.Hive.Experiment.Properties.Settings.Default.ResourceIds;
       this.log = new Log();
@@ -205 +192 @@
       HiveExperiment clone = (HiveExperiment)base.Clone(cloner);
       clone.resourceIds = this.resourceIds;
-      clone.serverUrl = this.serverUrl;
       clone.experiment = (HeuristicLab.Optimization.Experiment)cloner.Clone(experiment);
       clone.executionState = this.executionState;
@@ -279 +265 @@
 
       Thread t = new Thread(() => {
-        IClientFacade clientFacade = GetClientFacade();
+        IClientFacade clientFacade = CreateStreamedClientFacade();
 
         try {
@@ -307 +293 @@
             LogMessage(jobItem.JobDto.Id, "Job sent to Hive");
           }
-        } catch (Exception e) {
+        }
+        catch (Exception e) {
           LogMessage("Error: Starting HiveExperiment failed: " + e.Message);
           this.ExecutionState = Core.ExecutionState.Stopped;
@@ -468 +455 @@
     private void FetchAndUpdateJob(Guid jobId) {
       LogMessage(jobId, "FetchAndUpdateJob started");
-      IClientFacade clientFacade = GetClientFacade();
+      IClientFacade clientFacade = CreateStreamedClientFacade();
       IOptimizer originalOptimizer;
       lock (pendingOptimizersByJobId) {
@@ -490 +477 @@
 
     public void AbortJob(Guid jobId) {
-      IClientFacade clientFacade = GetClientFacade();
+      IClientFacade clientFacade = CreateClientFacade();
       Response response = clientFacade.AbortJob(jobId);
       LogMessage(jobId, "Aborting Job: " + response.StatusMessage);
@@ -554 +541 @@
         try {
           do {
-            IClientFacade clientFacade = GetClientFacade();
+            IClientFacade clientFacade = CreateStreamedClientFacade();
             IEnumerable<Guid> jobIdsToQuery = from job in JobItems
                                               where job.State != JobState.Finished &&
@@ -571 +558 @@
                   throw new Exception(response.StatusMessage.ToString());
                 }
-              } catch (Exception e) {
+              }
+              catch (Exception e) {
                 LogMessage("Polling results failed: " + e.Message);
               }
@@ -582 +570 @@
             }
           } while (!this.stopResultsPollingPending);
-        } catch (ThreadInterruptedException exception) {
+        }
+        catch (ThreadInterruptedException exception) {
           // thread has been interuppted
-        } finally {
+        }
+        finally {
           this.IsPollingResults = false;
         }
@@ -601 +591 @@
     public void RequestSnapshot(Guid jobId) {
       Thread t = new Thread(() => {
-        IClientFacade clientFacade = GetClientFacade();
+        IClientFacade clientFacade = CreateStreamedClientFacade();
         ResponseObject<SerializedJob> response;
         int retryCount = 0;
@@ -876 +866 @@
 
     #region Helper Functions
-    private IClientFacade GetClientFacade() {
+    private IClientFacade CreateClientFacade() {
       IClientFacade clientFacade = null;
       do {
         try {
-          clientFacade = ServiceLocator.CreateClientFacade(ServerUrl);
+          clientFacade = ServiceLocator.CreateClientFacade(string.Format("http://{0}:{1}/{2}", Settings.Default.HiveServerIp, Settings.Default.HiveServerPort, WcfSettings.ClientServiceName));
+
         } catch (EndpointNotFoundException exception) {
           LogMessage("Could not connect to Server: " + exception.Message + ". Will try again in " + (resultPollingIntervalMs / 1000) + " sec.");
@@ -889 +880 @@
     }
 
+    private IClientFacade CreateStreamedClientFacade() {
+      IClientFacade clientFacade = null;
+      do {
+        try {
+          clientFacade = ServiceLocator.CreateStreamedClientFacade(string.Format("http://{0}:{1}/{2}", Settings.Default.HiveServerIp, Settings.Default.HiveServerPort, WcfSettings.ClientStreamedServiceName));
+
+        } catch (EndpointNotFoundException exception) {
+          LogMessage("Could not connect to Server: " + exception.Message + ". Will try again in " + (resultPollingIntervalMs / 1000) + " sec.");
+          Thread.Sleep(resultPollingIntervalMs);
+        }
+      } while (clientFacade == null && this.ExecutionState != Core.ExecutionState.Stopped);
+      return clientFacade;
+    }
 
     private void AddRange(IDictionary<IOptimizer, IOptimizer> optimizers, IDictionary<IOptimizer, IOptimizer> childs) {

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/Properties/Settings.Designer.cs

@@ -14 +14 @@
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+    public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -21 +21 @@
             get {
                 return defaultInstance;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("net.tcp://10.42.1.153:9000/ExecutionEngine/ExecutionEngineFacade")]
-        public string HiveServerUrl {
-            get {
-                return ((string)(this["HiveServerUrl"]));
-            }
-            set {
-                this["HiveServerUrl"] = value;
             }
         }
@@ -47 +35 @@
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("localhost")]
+        public string HiveServerIp {
+            get {
+                return ((string)(this["HiveServerIp"]));
+            }
+            set {
+                this["HiveServerIp"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("cneumueller")]
+        public string HiveUsername {
+            get {
+                return ((string)(this["HiveUsername"]));
+            }
+            set {
+                this["HiveUsername"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("cneumueller")]
+        public string HivePassword {
+            get {
+                return ((string)(this["HivePassword"]));
+            }
+            set {
+                this["HivePassword"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("9000")]
+        public string HiveServerPort {
+            get {
+                return ((string)(this["HiveServerPort"]));
+            }
+            set {
+                this["HiveServerPort"] = value;
+            }
+        }
     }
 }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/Properties/Settings.settings

@@ -3 +3 @@
   <Profiles />
   <Settings>
-    <Setting Name="HiveServerUrl" Type="System.String" Scope="User">
-      <Value Profile="(Default)">net.tcp://10.42.1.153:9000/ExecutionEngine/ExecutionEngineFacade</Value>
-    </Setting>
     <Setting Name="ResourceIds" Type="System.String" Scope="User">
       <Value Profile="(Default)">MyGroup</Value>
     </Setting>
+    <Setting Name="HiveServerIp" Type="System.String" Scope="User">
+      <Value Profile="(Default)">localhost</Value>
+    </Setting>
+    <Setting Name="HiveUsername" Type="System.String" Scope="User">
+      <Value Profile="(Default)">cneumueller</Value>
+    </Setting>
+    <Setting Name="HivePassword" Type="System.String" Scope="User">
+      <Value Profile="(Default)">cneumueller</Value>
+    </Setting>
+    <Setting Name="HiveServerPort" Type="System.String" Scope="User">
+      <Value Profile="(Default)">9000</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/ServiceLocator.cs

@@ -27 +27 @@
 using System.ServiceModel;
 using HeuristicLab.Hive.Contracts;
+using HeuristicLab.Hive.Experiment.Properties;
 
 namespace HeuristicLab.Hive.Experiment {
   internal class ServiceLocator {
     internal static IClientFacade CreateClientFacade(string url) {
-      ChannelFactory<IClientFacade> factory = new ChannelFactory<IClientFacade>(
-          WcfSettings.GetStreamedBinding(),
-          new EndpointAddress(url));
-      return factory.CreateChannel();
+      ChannelFactory<IClientFacade> factory = new ChannelFactory<IClientFacade>("ClientHttpEndpoint");
+      WcfSettings.SetEndpointAddress(factory.Endpoint, url);
+
+      factory.Credentials.UserName.UserName = Settings.Default.HiveUsername;
+      factory.Credentials.UserName.Password = Settings.Default.HivePassword;
+
+      IClientFacade client = factory.CreateChannel();
+      return client;
+    }
+
+    internal static IClientFacade CreateStreamedClientFacade(string url) {
+      ChannelFactory<IClientFacade> factory = new ChannelFactory<IClientFacade>("ClientStreamedHttpEndpoint");
+      WcfSettings.SetEndpointAddress(factory.Endpoint, url);
+
+      factory.Credentials.UserName.UserName = Settings.Default.HiveUsername;
+      factory.Credentials.UserName.Password = Settings.Default.HivePassword;
+
+      IClientFacade client = factory.CreateChannel();
+      return client;
     }
   }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/app.config

@@ -8 +8 @@
   <userSettings>
     <HeuristicLab.Hive.Experiment.Properties.Settings>
-      <setting name="HiveServerUrl" serializeAs="String">
-        <value>net.tcp://10.20.71.22:9000/ExecutionEngine/ExecutionEngineFacade</value>
-      </setting>
       <setting name="ResourceIds" serializeAs="String">
         <value>MyGroup</value>
       </setting>
+      <setting name="HiveServerIp" serializeAs="String">
+        <value>localhost</value>
+      </setting>
+      <setting name="HiveUsername" serializeAs="String">
+        <value>cneumueller</value>
+      </setting>
+      <setting name="HivePassword" serializeAs="String">
+        <value>cneumueller</value>
+      </setting>
+      <setting name="HiveServerPort" serializeAs="String">
+        <value>9000</value>
+      </setting>
     </HeuristicLab.Hive.Experiment.Properties.Settings>
   </userSettings>
+  <system.serviceModel>
+
+    <bindings>
+      <basicHttpBinding>
+        <binding name="ClientStreamedHttpEndpoint" closeTimeout="00:01:00"
+            openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
+            allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard"
+            maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
+            messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered"
+            useDefaultWebProxy="true">
+          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
+              maxBytesPerRead="4096" maxNameTableCharCount="16384" />
+          <security mode="None">
+            <transport clientCredentialType="None" proxyCredentialType="None"
+                realm="" />
+            <message clientCredentialType="UserName" algorithmSuite="Default" />
+          </security>
+        </binding>
+      </basicHttpBinding>
+      <wsHttpBinding>
+        <binding name="ClientHttpEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00"
+            receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false"
+            transactionFlow="false" hostNameComparisonMode="StrongWildcard"
+            maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
+            messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true"
+            allowCookies="false">
+          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
+              maxBytesPerRead="4096" maxNameTableCharCount="16384" />
+          <reliableSession ordered="true" inactivityTimeout="00:10:00"
+              enabled="false" />
+          <security mode="Message">
+            <transport clientCredentialType="Windows" proxyCredentialType="None"
+                realm="" />
+            <message clientCredentialType="UserName" negotiateServiceCredential="true"
+                algorithmSuite="Default" />
+          </security>
+        </binding>
+        <binding name="ClientMexEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00"
+            receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false"
+            transactionFlow="false" hostNameComparisonMode="StrongWildcard"
+            maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
+            messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true"
+            allowCookies="false">
+          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
+              maxBytesPerRead="4096" maxNameTableCharCount="16384" />
+          <reliableSession ordered="true" inactivityTimeout="00:10:00"
+              enabled="false" />
+          <security mode="None">
+            <transport clientCredentialType="Windows" proxyCredentialType="None"
+                realm="" />
+            <message clientCredentialType="Windows" negotiateServiceCredential="true" />
+          </security>
+        </binding>
+      </wsHttpBinding>
+    </bindings>
+    <client>
+      <endpoint address="http://localhost:9000/ClientService" behaviorConfiguration="ClientServiceBehaviour" binding="wsHttpBinding"
+          bindingConfiguration="ClientHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade"
+          name="ClientHttpEndpoint">
+        <identity>
+          <certificate encodedValue="AwAAAAEAAAAUAAAAeBLH/0jWrlsW42fIC8VIIdAE6PUgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgyMzE1NTg0OFoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmOgweB6X4Ss6W2xb2hg1x61cjD2T7SO0ckkzmtqRhC2UWly9dBnonFJmg9RjN0y6l2tZhVzNhq8DgCkn3hPg5GL3XIwYX4PsXwNmeT6i+7s6rGbESuaEMvYOAQJSJ+MTgBvXCwo2g5nFHIBqP4W4aU2eybxP7H4cm1rQpoYHHjQIDAQABo0kwRzBFBgNVHQEEPjA8gBASDhO/IE7Ff7PpkCVF8oUpoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQADgYEAhxAzm3JTV7j51jti5P7izTEs7+8534kQloeAJDwlKolkd4ZMkf0BiexC2Vt1KsnxUjrK0HbbITzazkvkAmKi7dP+4G+3SrWag5lS4NcoPjTQy16T3zC9E6yafRaZp1/pxjC3Ap44qwq4Kjl2mEjeHHsdie/h4loowTqC9FlLbgo=" />
+        </identity>
+      </endpoint>
+      <endpoint address="http://localhost:9000/ClientService/mex" binding="wsHttpBinding"
+          bindingConfiguration="ClientMexEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade"
+          name="ClientMexEndpoint" />
+      <endpoint address="http://localhost:9000/ClientServiceStreamed"
+          binding="basicHttpBinding" bindingConfiguration="ClientStreamedHttpEndpoint"
+          contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" name="ClientStreamedHttpEndpoint" />
+    </client>
+    
+    <behaviors>
+      <endpointBehaviors>
+        <behavior name="ClientServiceBehaviour">
+          <clientCredentials>
+            <serviceCertificate>
+              <authentication certificateValidationMode="None" />
+            </serviceCertificate>
+          </clientCredentials>
+        </behavior>
+      </endpointBehaviors>
+    </behaviors>
+
+  </system.serviceModel>
 </configuration>