Changeset 4320


Ignore:
Timestamp:
08/25/10 17:46:07 (12 years ago)
Author:
cneumuel
Message:

made slave-console service configurable via xml

Location:
branches/3.3-HiveMigration/sources/HeuristicLab.Hive
Files:
14 added
2 deleted
19 edited

Legend:

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

    r4316 r4320  
    5858// [assembly: AssemblyVersion("1.0.*")]
    5959[assembly: AssemblyVersion("3.3.0.0")]
    60 [assembly: AssemblyFileVersion("3.3.0.4305")]
     60[assembly: AssemblyFileVersion("3.3.0.4316")]
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive 3.3.sln

    r4305 r4320  
    9494EndProject
    9595Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Slave.Console-3.3", "HeuristicLab.Hive.Slave.Console\3.3\HeuristicLab.Hive.Slave.Console-3.3.csproj", "{8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}"
     96  ProjectSection(ProjectDependencies) = postProject
     97    {5010BD86-23B7-4F8C-888A-76D21AD5266A} = {5010BD86-23B7-4F8C-888A-76D21AD5266A}
     98  EndProjectSection
    9699EndProject
    97100Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Slave.Core-3.3", "HeuristicLab.Hive.Slave.Core\3.3\HeuristicLab.Hive.Slave.Core-3.3.csproj", "{5010BD86-23B7-4F8C-888A-76D21AD5266A}"
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/app.config

    r4316 r4320  
    3333          <readerQuotas maxStringContentLength="104857600" maxArrayLength="104857600" />
    3434          <security mode="TransportWithMessageCredential">
    35             <transport clientCredentialType="Certificate">
    36               <extendedProtectionPolicy policyEnforcement="Never" />
    37             </transport>
     35            <transport clientCredentialType="Certificate" />
    3836            <message clientCredentialType="UserName" />
    3937          </security>
     
    4341        <binding name="HttpBinding">
    4442          <security mode="Message">
    45             <transport>
    46               <extendedProtectionPolicy policyEnforcement="Never" />
    47             </transport>
    4843            <message clientCredentialType="UserName" />
    4944          </security>
     
    7772          name="SlaveTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.ISlaveFacade" />
    7873        <endpoint address="mex" binding="mexTcpBinding" bindingConfiguration=""
    79           name="SlaveTcpMexEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.ISlaveFacade" />
     74          name="SlaveTcpMexEndpoint" contract="IMetadataExchange" />
    8075        <host>
    8176          <baseAddresses>
     
    10095          name="ClientTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" />
    10196        <endpoint address="mex" binding="mexTcpBinding" bindingConfiguration=""
    102           name="ClientTcpMexEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" />
     97          name="ClientTcpMexEndpoint" contract="IMetadataExchange" />
    10398        <endpoint binding="wsHttpBinding" bindingConfiguration="HttpBinding"
    10499          name="ClientHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Common/3.3/HeuristicLab.Hive.Slave.Common-3.3.csproj

    r4296 r4320  
    133133    <None Include="Properties\AssemblyInfo.frame" />
    134134  </ItemGroup>
    135   <ItemGroup>
    136     <Folder Include="Interfaces\" />
    137   </ItemGroup>
     135  <ItemGroup />
    138136  <ItemGroup>
    139137    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/HeuristicLab.Hive.Slave.Console-3.3.csproj

    r4296 r4320  
    118118    <Compile Include="LogFileReader.cs" />
    119119    <Compile Include="Properties\AssemblyInfo.cs" />
     120    <Compile Include="Service References\SlaveConsoleService\Reference.cs">
     121      <AutoGen>True</AutoGen>
     122      <DesignTime>True</DesignTime>
     123      <DependentUpon>Reference.svcmap</DependentUpon>
     124    </Compile>
    120125    <EmbeddedResource Include="HiveSlaveConsole.resx">
    121126      <DependentUpon>HiveSlaveConsole.cs</DependentUpon>
     
    155160      <DependentUpon>Recurrence.cs</DependentUpon>
    156161    </Compile>
    157     <Compile Include="Service References\SlaveService\Reference.cs">
    158       <AutoGen>True</AutoGen>
    159       <DesignTime>True</DesignTime>
     162    <None Include="Service References\SlaveConsoleService\HeuristicLab.Calendar.xsd">
     163      <SubType>Designer</SubType>
     164    </None>
     165    <None Include="Service References\SlaveConsoleService\HeuristicLab.Hive.Slave.Common.xsd">
     166      <SubType>Designer</SubType>
     167    </None>
     168    <None Include="Service References\SlaveConsoleService\HeuristicLab.Hive.Slave.Console.SlaveConsoleService.ConnectionContainer.datasource">
    160169      <DependentUpon>Reference.svcmap</DependentUpon>
    161     </Compile>
     170    </None>
     171    <None Include="Service References\SlaveConsoleService\HeuristicLab.Hive.Slave.Console.SlaveConsoleService.StatusCommons.datasource">
     172      <DependentUpon>Reference.svcmap</DependentUpon>
     173    </None>
     174    <None Include="Service References\SlaveConsoleService\HeuristicLab.Hive.Slave.Core.SlaveConsoleService.xsd">
     175      <SubType>Designer</SubType>
     176    </None>
     177    <None Include="Service References\SlaveConsoleService\service.wsdl" />
     178    <None Include="Service References\SlaveConsoleService\service.xsd">
     179      <SubType>Designer</SubType>
     180    </None>
     181    <None Include="Service References\SlaveConsoleService\service1.xsd">
     182      <SubType>Designer</SubType>
     183    </None>
     184    <None Include="Service References\SlaveConsoleService\System.Drawing.xsd">
     185      <SubType>Designer</SubType>
     186    </None>
    162187  </ItemGroup>
    163188  <ItemGroup>
     
    172197  </ItemGroup>
    173198  <ItemGroup>
    174     <None Include="Service References\SlaveService\HeuristicLab.Calendar.xsd">
    175       <SubType>Designer</SubType>
    176     </None>
    177     <None Include="Service References\SlaveService\HeuristicLab.Hive.Slave.Common1.xsd">
    178       <SubType>Designer</SubType>
    179     </None>
    180     <None Include="Service References\SlaveService\HeuristicLab.Hive.Slave.Console.SlaveService.ConnectionContainer.datasource">
    181       <DependentUpon>Reference.svcmap</DependentUpon>
    182     </None>
    183     <None Include="Service References\SlaveService\HeuristicLab.Hive.Slave.Console.SlaveService.StatusCommons.datasource">
    184       <DependentUpon>Reference.svcmap</DependentUpon>
    185     </None>
    186     <None Include="Service References\SlaveService\HeuristicLab.Hive.Slave.Core.ClientConsoleService1.xsd">
    187       <SubType>Designer</SubType>
    188     </None>
    189     <None Include="Service References\SlaveService\HeuristicLab.Hive.Slave.Core.SlaveConsoleService.xsd" />
    190     <None Include="Service References\SlaveService\service.wsdl" />
    191     <None Include="Service References\SlaveService\service.xsd" />
    192     <None Include="Service References\SlaveService\service1.xsd" />
    193   </ItemGroup>
    194   <ItemGroup>
    195199    <WCFMetadata Include="Service References\" />
    196200  </ItemGroup>
    197201  <ItemGroup>
    198     <WCFMetadataStorage Include="Service References\SlaveService\" />
    199   </ItemGroup>
    200   <ItemGroup>
    201     <None Include="Service References\SlaveService\configuration91.svcinfo" />
    202   </ItemGroup>
    203   <ItemGroup>
    204     <None Include="Service References\SlaveService\configuration.svcinfo" />
    205   </ItemGroup>
    206   <ItemGroup>
    207     <None Include="Service References\SlaveService\Reference.svcmap">
     202    <None Include="Resources\schedule.jpg" />
     203  </ItemGroup>
     204  <ItemGroup>
     205    <None Include="Properties\DataSources\Calendar.Appointment.datasource" />
     206  </ItemGroup>
     207  <ItemGroup>
     208    <None Include="Resources\Disaster-warning-48.png" />
     209  </ItemGroup>
     210  <ItemGroup>
     211    <None Include="Resources\Global-network-48.png" />
     212  </ItemGroup>
     213  <ItemGroup>
     214    <None Include="Resources\exit-48.png" />
     215  </ItemGroup>
     216  <ItemGroup>
     217    <WCFMetadataStorage Include="Service References\SlaveConsoleService\" />
     218  </ItemGroup>
     219  <ItemGroup>
     220    <None Include="Service References\SlaveConsoleService\configuration91.svcinfo" />
     221  </ItemGroup>
     222  <ItemGroup>
     223    <None Include="Service References\SlaveConsoleService\configuration.svcinfo" />
     224  </ItemGroup>
     225  <ItemGroup>
     226    <None Include="Service References\SlaveConsoleService\Reference.svcmap">
    208227      <Generator>WCF Proxy Generator</Generator>
    209228      <LastGenOutput>Reference.cs</LastGenOutput>
    210229    </None>
    211   </ItemGroup>
    212   <ItemGroup>
    213     <None Include="Resources\schedule.jpg" />
    214   </ItemGroup>
    215   <ItemGroup>
    216     <None Include="Properties\DataSources\Calendar.Appointment.datasource" />
    217   </ItemGroup>
    218   <ItemGroup>
    219     <None Include="Resources\Disaster-warning-48.png" />
    220   </ItemGroup>
    221   <ItemGroup>
    222     <None Include="Resources\Global-network-48.png" />
    223   </ItemGroup>
    224   <ItemGroup>
    225     <None Include="Resources\exit-48.png" />
    226     <None Include="Service References\SlaveService\System.Drawing1.xsd" />
    227230  </ItemGroup>
    228231  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/HiveSlaveConsole.cs

    r4253 r4320  
    2222using System;
    2323using System.Collections.Generic;
    24 using System.Diagnostics;
    2524using System.Drawing;
    2625using System.Linq;
    2726using System.Net;
    28 using System.ServiceModel;
    2927using System.Windows.Forms;
    30 using HeuristicLab.Hive.Slave.Console.SlaveService;
     28using System.Xml.Serialization;
     29using HeuristicLab.Calendar;
     30using HeuristicLab.Hive.Slave.Console.SlaveConsoleService;
    3131using ZedGraph;
    32 using HeuristicLab.Hive.Contracts;
    33 using System.Xml.Serialization;
    34 using System.IO;
    35 using HeuristicLab.Calendar;
    3632
    3733namespace HeuristicLab.Hive.Slave.Console {
     
    5349
    5450    #region Declarations
    55 
    56     private const string ENDPOINTADRESS = "net.tcp://127.0.0.1:8000/SlaveConsole/SlaveConsoleCommunicator";
    57 
    5851    private static bool isfired = false;
    5952    //the logfilereader
     
    9487    private void ConnectToSlave() {
    9588      try {
    96         slaveCommunicator = new SlaveConsoleCommunicatorClient(WcfSettings.GetBinding(), new EndpointAddress(ENDPOINTADRESS));
     89        slaveCommunicator = new SlaveConsoleCommunicatorClient();
     90
    9791        slaveCommunicator.GetStatusInfosCompleted += new EventHandler<GetStatusInfosCompletedEventArgs>(slaveCommunicator_GetStatusInfosCompleted);
    9892        slaveCommunicator.GetCurrentConnectionCompleted += new EventHandler<GetCurrentConnectionCompletedEventArgs>(slaveCommunicator_GetCurrentConnectionCompleted);
     
    469463        ConnectionContainer curConnection = e.Result;
    470464        tbIPAdress.Text = curConnection.IPAdress;
    471         tbPort.Text = curConnection.Port.ToString();
    472465      } else {
    473466        ManageFatalException("Connection Error, check if Hive Slave is running!", "Connection Error", null);
     
    504497        UpdateGraph(sc);
    505498
    506         if (sc.Status == NetworkEnumWcfConnState.Connected || sc.Status == NetworkEnumWcfConnState.Loggedin) {
     499        if (sc.Status == NetworkEnumWcfConnState.Connected) {
    507500          btConnect.Enabled = false;
    508501          btnDisconnect.Enabled = true;
     
    546539    private void btConnect_Click(object sender, EventArgs e) {
    547540      IPAddress ipAdress;
    548       int port;
    549541      ConnectionContainer cc = new ConnectionContainer();
    550       if (IPAddress.TryParse(tbIPAdress.Text, out ipAdress) && int.TryParse(tbPort.Text, out port)) {
     542      if (IPAddress.TryParse(tbIPAdress.Text, out ipAdress)) {
    551543        cc.IPAdress = tbIPAdress.Text;
    552         cc.Port = port;
    553544        slaveCommunicator.SetConnectionAsync(cc);
    554545      } else {
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/HiveSlaveConsole.designer.cs

    r4253 r4320  
    5555      this.btnDisconnect = new System.Windows.Forms.Button();
    5656      this.btConnect = new System.Windows.Forms.Button();
    57       this.tbPort = new System.Windows.Forms.TextBox();
    5857      this.tbIPAdress = new System.Windows.Forms.TextBox();
    5958      this.lbServerIPCaption = new System.Windows.Forms.Label();
     
    167166      this.gbServerConnection.Controls.Add(this.btnDisconnect);
    168167      this.gbServerConnection.Controls.Add(this.btConnect);
    169       this.gbServerConnection.Controls.Add(this.tbPort);
    170168      this.gbServerConnection.Controls.Add(this.tbIPAdress);
    171169      this.gbServerConnection.Controls.Add(this.lbServerIPCaption);
     
    207205      this.btConnect.UseVisualStyleBackColor = true;
    208206      this.btConnect.Click += new System.EventHandler(this.btConnect_Click);
    209       //
    210       // tbPort
    211       //
    212       this.tbPort.Location = new System.Drawing.Point(74, 59);
    213       this.tbPort.Name = "tbPort";
    214       this.tbPort.Size = new System.Drawing.Size(65, 20);
    215       this.tbPort.TabIndex = 3;
    216       this.tbPort.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.Connection_KeyPress);
    217207      //
    218208      // tbIPAdress
     
    674664    private System.Windows.Forms.Button btnDisconnect;
    675665    private System.Windows.Forms.Button btConnect;
    676     private System.Windows.Forms.TextBox tbPort;
    677666    private System.Windows.Forms.TextBox tbIPAdress;
    678667    private System.Windows.Forms.Label lbServerIPCaption;
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/app.config

    r4253 r4320  
    11<?xml version="1.0" encoding="utf-8" ?>
    22<configuration>
    3     <configSections>
    4         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
    5             <section name="HeuristicLab.Hive.Slave.Console.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
    6         </sectionGroup>
    7     </configSections>
    8        <userSettings>
    9          <HeuristicLab.Hive.Slave.Console.Properties.Settings>
    10             <setting name="IpAdress" serializeAs="String">
    11                 <value>10.0.0.1</value>
    12             </setting>
    13         </HeuristicLab.Hive.Slave.Console.Properties.Settings>
    14     </userSettings>
    15        <system.serviceModel>
    16               <bindings>
    17                      <netTcpBinding>
    18                             <binding name="NetTcpBinding_ISlaveConsoleCommunicator" closeTimeout="00:01:00"
    19                                    openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
    20                                    transactionFlow="false" transferMode="Buffered" transactionProtocol="OleTransactions"
    21                                    hostNameComparisonMode="StrongWildcard" listenBacklog="10"
    22                                    maxBufferPoolSize="524288" maxBufferSize="65536" maxConnections="10"
    23                                    maxReceivedMessageSize="65536">
    24                                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
    25                                           maxBytesPerRead="4096" maxNameTableCharCount="16384" />
    26                                    <reliableSession ordered="true" inactivityTimeout="00:10:00"
    27                                           enabled="false" />
    28                                    <security mode="Transport">
    29                                           <transport clientCredentialType="Windows" protectionLevel="EncryptAndSign" />
    30                                           <message clientCredentialType="Windows" />
    31                                    </security>
    32                             </binding>
    33                      </netTcpBinding>
    34               </bindings>
    35               <client>
    36                      <endpoint address="net.tcp://127.0.0.1:8000/ClientConsole/ClientConsoleCommunicator"
    37                             binding="netTcpBinding" bindingConfiguration="NetTcpBinding_ISlaveConsoleCommunicator"
    38                             contract="SlaveService.ISlaveConsoleCommunicator" name="NetTcpBinding_ISlaveConsoleCommunicator">
    39                             <identity>
    40                                    <userPrincipalName value="S0920454044@hagenberg.fhooe.at" />
    41                             </identity>
    42                      </endpoint>
    43               </client>
    44        </system.serviceModel>
     3  <configSections>
     4    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
     5      <section name="HeuristicLab.Hive.Slave.Console.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     6    </sectionGroup>
     7  </configSections>
     8  <userSettings>
     9    <HeuristicLab.Hive.Slave.Console.Properties.Settings>
     10      <setting name="IpAdress" serializeAs="String">
     11        <value>10.0.0.1</value>
     12      </setting>
     13    </HeuristicLab.Hive.Slave.Console.Properties.Settings>
     14  </userSettings>
     15  <system.serviceModel>
     16    <bindings>
     17      <netTcpBinding>
     18        <binding name="SlaveConsoleTcpEndpoint" closeTimeout="00:01:00"
     19          openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
     20          transactionFlow="false" transferMode="Buffered" transactionProtocol="OleTransactions"
     21          hostNameComparisonMode="StrongWildcard" listenBacklog="10" maxBufferPoolSize="524288"
     22          maxBufferSize="65536" maxConnections="10" maxReceivedMessageSize="65536">
     23          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
     24            maxBytesPerRead="4096" maxNameTableCharCount="16384" />
     25          <reliableSession ordered="true" inactivityTimeout="00:10:00"
     26            enabled="false" />
     27          <security mode="None">
     28            <transport clientCredentialType="Windows" protectionLevel="EncryptAndSign" />
     29            <message clientCredentialType="Windows" />
     30          </security>
     31        </binding>
     32      </netTcpBinding>
     33    </bindings>
     34    <client>
     35      <endpoint address="net.tcp://localhost:8000/SlaveConsoleService"
     36        binding="netTcpBinding" bindingConfiguration="SlaveConsoleTcpEndpoint"
     37        contract="SlaveConsoleService.ISlaveConsoleCommunicator" name="SlaveConsoleTcpEndpoint" />
     38    </client>
     39  </system.serviceModel>
    4540</configuration>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/ConfigurationManager/ConfigManager.cs

    r4316 r4320  
    2626using HeuristicLab.Hive.Contracts.BusinessObjects;
    2727using HeuristicLab.Hive.Slave.ExecutionEngine;
    28 using HeuristicLab.Hive.Slave.Core.ClientConsoleService;
     28using HeuristicLab.Hive.Slave.Core.SlaveConsoleService;
    2929using HeuristicLab.Hive.Slave.Communication;
    3030using HeuristicLab.Hive.Slave.Core.Properties;
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/Core.cs

    r4316 r4320  
    3030using HeuristicLab.Hive.Slave.Common;
    3131using HeuristicLab.Hive.Slave.Communication;
    32 using HeuristicLab.Hive.Slave.Core.ClientConsoleService;
     32using HeuristicLab.Hive.Slave.Core.SlaveConsoleService;
    3333using HeuristicLab.Hive.Slave.Core.ConfigurationManager;
    3434using HeuristicLab.Hive.Slave.Core.JobStorage;
     
    6969      Logger.Info("Hive Slave started");
    7070      SlaveConsoleServer server = new SlaveConsoleServer();
    71       server.StartClientConsoleServer(new Uri("net.tcp://127.0.0.1:8000/SlaveConsole/"));
    72 
     71      server.StartClientConsoleServer();
     72     
    7373      ConfigManager manager = ConfigManager.Instance;
    7474      manager.Core = this;
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/HeuristicLab.Hive.Slave.Core-3.3.csproj

    r4296 r4320  
    1111    <RootNamespace>HeuristicLab.Hive.Slave.Core</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Hive.Slave.Core-3.3</AssemblyName>
     13    <ProjectTypeGuids>{3D9AD99F-2412-4246-B90B-4EAA41C64699};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    1314    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    1415    <FileAlignment>512</FileAlignment>
     
    175176    </ProjectReference>
    176177  </ItemGroup>
    177   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
     178  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
     179  <ProjectExtensions>
     180    <VisualStudio>
     181      <FlavorProperties GUID="{3D9AD99F-2412-4246-B90B-4EAA41C64699}">
     182        <WcfProjectProperties>
     183          <AutoStart>False</AutoStart>
     184        </WcfProjectProperties>
     185      </FlavorProperties>
     186    </VisualStudio>
     187  </ProjectExtensions>
    178188  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    179189       Other similar extension points exist, see Microsoft.Common.targets.
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/SlaveConsoleService/Interfaces/ISlaveConsoleCommunicator.cs

    r4260 r4320  
    2727using HeuristicLab.Calendar;
    2828
    29 namespace HeuristicLab.Hive.Slave.Core.ClientConsoleService.Interfaces {
     29namespace HeuristicLab.Hive.Slave.Core.SlaveConsoleService.Interfaces {
    3030  /// <summary>
    3131  /// Defines the interfaces for the Client Console
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/SlaveConsoleService/SlaveConsoleCommunicator.cs

    r4316 r4320  
    33using System.Linq;
    44using System.Text;
    5 using HeuristicLab.Hive.Slave.Core.ClientConsoleService.Interfaces;
     5using HeuristicLab.Hive.Slave.Core.SlaveConsoleService.Interfaces;
    66using HeuristicLab.Hive.Slave.Core.ConfigurationManager;
    77using HeuristicLab.Hive.Slave.Communication;
     
    1010using HeuristicLab.Calendar;
    1111
    12 namespace HeuristicLab.Hive.Slave.Core.ClientConsoleService {
     12namespace HeuristicLab.Hive.Slave.Core.SlaveConsoleService {
    1313  public class SlaveConsoleCommunicator: ISlaveConsoleCommunicator {
    1414    #region IClientConsoleCommunicator Members
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/SlaveConsoleService/SlaveConsoleServer.cs

    r4260 r4320  
    66using System.ServiceModel;
    77using HeuristicLab.PluginInfrastructure;
    8 using HeuristicLab.Hive.Slave.Core.ClientConsoleService.Interfaces;
     8using HeuristicLab.Hive.Slave.Core.SlaveConsoleService.Interfaces;
    99using HeuristicLab.Hive.Contracts;
    1010
    11 namespace HeuristicLab.Hive.Slave.Core.ClientConsoleService {
     11namespace HeuristicLab.Hive.Slave.Core.SlaveConsoleService {
    1212  public class SlaveConsoleServer {
    13 
    14     private bool AddMexEndpoint(ServiceHost serviceHost) {
    15       if (serviceHost != null) {
    16         ServiceMetadataBehavior behavior = new ServiceMetadataBehavior();
    17         serviceHost.Description.Behaviors.Add(behavior);
    18 
    19         return serviceHost.AddServiceEndpoint(typeof(IMetadataExchange), MetadataExchangeBindings.CreateMexTcpBinding(), "mex") != null;
    20       } else
    21         return false;
    22     }
    23 
    24     public ServiceHost StartClientConsoleServer(Uri uriTcp) {
    25       IEnumerable<ISlaveConsoleCommunicator> clientConsoleServerInstances = ApplicationManager.Manager.GetInstances<ISlaveConsoleCommunicator>();
    26 
    27       if (clientConsoleServerInstances.Count() > 0) {
    28         ServiceHost serviceHost = new ServiceHost(clientConsoleServerInstances.First().GetType(), uriTcp);
    29 
    30         serviceHost.AddServiceEndpoint(typeof(ISlaveConsoleCommunicator), WcfSettings.GetBinding(), "SlaveConsoleCommunicator");
    31 
    32         AddMexEndpoint(serviceHost);
    33 
    34         serviceHost.Open();
    35         return serviceHost;
    36       } else {
    37         return null;
    38       }
     13    public ServiceHost StartClientConsoleServer() {
     14      ServiceHost host = new ServiceHost(ApplicationManager.Manager.GetTypes(typeof(ISlaveConsoleCommunicator)).First());
     15      host.Open();
     16      return host;
    3917    }
    4018  }
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/SlaveConsoleService/TransferObjects/ConnectionContainer.cs

    r4316 r4320  
    2626using System.Runtime.Serialization;
    2727
    28 namespace HeuristicLab.Hive.Slave.Core.ClientConsoleService {
     28namespace HeuristicLab.Hive.Slave.Core.SlaveConsoleService {
    2929  [DataContract]
    3030  public class ConnectionContainer {
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/SlaveConsoleService/TransferObjects/JobStatus.cs

    r4260 r4320  
    2626using System.Runtime.Serialization;
    2727
    28 namespace HeuristicLab.Hive.Slave.Core.ClientConsoleService {
     28namespace HeuristicLab.Hive.Slave.Core.SlaveConsoleService {
    2929  [DataContract]
    3030  public class JobStatus {
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/SlaveConsoleService/TransferObjects/StatusCommons.cs

    r4260 r4320  
    2727using System.Runtime.Serialization;
    2828
    29 namespace HeuristicLab.Hive.Slave.Core.ClientConsoleService {
     29namespace HeuristicLab.Hive.Slave.Core.SlaveConsoleService {
    3030  /// <summary>
    3131  /// Various Status Information for the ClientConsole
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/app.config

    r4316 r4320  
    1 <?xml version="1.0" encoding="utf-8" ?>
     1<?xml version="1.0" encoding="utf-8" ?>
    22<configuration>
    3     <configSections>
    4         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
    5             <section name="HeuristicLab.Hive.Slave.Core.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
    6         </sectionGroup>
    7     </configSections>
    8     <userSettings>
    9       <HeuristicLab.Hive.Slave.Core.Properties.Settings>
    10         <setting name="ServerIP" serializeAs="String">
    11           <value />
    12         </setting>
    13         <setting name="Guid" serializeAs="String">
    14           <value>00000000-0000-0000-0000-000000000000</value>
    15         </setting>
    16       </HeuristicLab.Hive.Slave.Core.Properties.Settings>
    17     </userSettings>
     3  <configSections>
     4    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
     5      <section name="HeuristicLab.Hive.Slave.Core.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     6    </sectionGroup>
     7  </configSections>
     8  <userSettings>
     9    <HeuristicLab.Hive.Slave.Core.Properties.Settings>
     10      <setting name="ServerIP" serializeAs="String">
     11        <value />
     12      </setting>
     13      <setting name="Guid" serializeAs="String">
     14        <value>00000000-0000-0000-0000-000000000000</value>
     15      </setting>
     16    </HeuristicLab.Hive.Slave.Core.Properties.Settings>
     17  </userSettings>
     18  <system.serviceModel>
     19    <behaviors>
     20      <serviceBehaviors>
     21        <behavior name="SlaveConsoleServiceBehaviour">
     22          <serviceMetadata />
     23        </behavior>
     24      </serviceBehaviors>
     25    </behaviors>
     26    <bindings>
     27      <netTcpBinding>
     28        <binding name="SlaveConsoleTcpBinding">
     29          <security mode="None">
     30            <transport>
     31              <extendedProtectionPolicy policyEnforcement="Never" />
     32            </transport>
     33          </security>
     34        </binding>
     35      </netTcpBinding>
     36    </bindings>
     37    <services>
     38      <service behaviorConfiguration="SlaveConsoleServiceBehaviour"
     39        name="HeuristicLab.Hive.Slave.Core.SlaveConsoleService.SlaveConsoleCommunicator">
     40        <endpoint binding="netTcpBinding" bindingConfiguration="SlaveConsoleTcpBinding"
     41          name="SlaveConsoleTcpEndpoint" contract="HeuristicLab.Hive.Slave.Core.SlaveConsoleService.Interfaces.ISlaveConsoleCommunicator" />
     42        <endpoint address="mex" binding="mexTcpBinding" bindingConfiguration=""
     43          name="SlaveConsoleTcpMexBinding" contract="IMetadataExchange" />
     44        <host>
     45          <baseAddresses>
     46            <add baseAddress="net.tcp://localhost:8000/SlaveConsoleService" />
     47          </baseAddresses>
     48        </host>
     49      </service>
     50    </services>
     51  </system.serviceModel>
    1852</configuration>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/MergeConfigs.cmd

    r4305 r4320  
    77ConfigMerger "%SolutionDir%HeuristicLab.Hive.Slave.Core\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
    88ConfigMerger "%SolutionDir%HeuristicLab.Hive.Slave.Communication\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
     9ConfigMerger "%SolutionDir%HeuristicLab.Hive.Slave.Console\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
    910ConfigMerger "%SolutionDir%HeuristicLab.Hive.Tracing\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
    1011
Note: See TracChangeset for help on using the changeset viewer.