Changeset 4302


Ignore:
Timestamp:
08/24/10 15:31:35 (12 years ago)
Author:
cneumuel
Message:
  • made ServerConsole work with wsHttpBinding
  • applied role-base restrictions to all WCF-Services
  • made wcf-services work with certificates
  • renamed ExecutionEngineFacade to ClientFacade

(#1168)

Location:
branches/3.3-HiveMigration/sources/HeuristicLab.Hive
Files:
29 added
18 deleted
31 edited

Legend:

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

    r4296 r4302  
    5858// [assembly: AssemblyVersion("1.0.*")]
    5959[assembly: AssemblyVersion("3.3.0.0")]
    60 [assembly: AssemblyFileVersion("3.3.0.4171")]
     60[assembly: AssemblyFileVersion("3.3.0.4296")]
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive 3.3.sln

    r4296 r4302  
    8686EndProject
    8787Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Slave.Communication-3.3", "HeuristicLab.Hive.Slave.Communication\3.3\HeuristicLab.Hive.Slave.Communication-3.3.csproj", "{AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}"
     88  ProjectSection(ProjectDependencies) = postProject
     89    {898B31CF-81DC-453B-AEB3-BDF83197A7EE} = {898B31CF-81DC-453B-AEB3-BDF83197A7EE}
     90  EndProjectSection
    8891EndProject
    8992Project("{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}"
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/BusinessObjects/SlaveGroupDtoList.cs

    r4267 r4302  
    66using HeuristicLab.Common;
    77using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     8using System.Runtime.Serialization;
    89
    910namespace HeuristicLab.Hive.Contracts.BusinessObjects {
     11  [CollectionDataContract]
    1012  public class SlaveGroupDtoList : ObservableList<SlaveGroupDto>, IDeepCloneable {
    1113
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/HeuristicLab.Hive.Contracts-3.3.csproj

    r4296 r4302  
    140140    <Compile Include="MultiStream.cs" />
    141141    <Compile Include="Interfaces\ISlaveFacade.cs" />
    142     <Compile Include="Interfaces\IExecutionEngineFacade.cs" />
     142    <Compile Include="Interfaces\IClientFacade.cs" />
    143143    <Compile Include="ResponseObjects\ResponseObject.cs" />
    144144    <Compile Include="Interfaces\ISlaveManager.cs" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/HiveRoles.cs

    r4289 r4302  
    66namespace HeuristicLab.Hive.Contracts {
    77  public static class HiveRoles {
    8     public const string Administrator = "Administrator";
    9     public const string Slave = "Slave";
     8    public const string Administrator = "Hive.Administrator";
     9    public const string Slave = "Hive.Slave";
     10    public const string Client = "Hive.Client";
    1011  }
    1112}
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/WcfSettings.cs

    r4285 r4302  
    88using System.Security.Cryptography.X509Certificates;
    99using System.Net;
     10using System.ServiceModel.Description;
    1011
    1112namespace HeuristicLab.Hive.Contracts {
    1213  public static class WcfSettings {
     14    public const string SlaveServiceName = "SlaveService";
     15    public const string ServerConsoleServiceName = "ServerConsoleService";
     16    public const string ClientServiceName = "ClientService";
    1317
    14     public const string SERVERCERT = "HIVE-Server";
    15     public const int DEFAULTPORT = 9000;
     18    public const int DefaultPort = 9000;
    1619   
    1720    /// <summary>
     
    7477    /// <returns></returns>
    7578    public static IPAddress GetActiveIP() {
    76       //return System.Net.NetworkInformation.IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections()[0].LocalEndPoint.Address.ToString();
    77       IPAddress[] addresses;
    78       addresses = Dns.GetHostAddresses(Dns.GetHostName());
    79       int index = 0;
    80       if (System.Environment.OSVersion.Version.Major >= 6) {
    81         for (index = addresses.Length - 1; index >= 0; index--)
    82           if (addresses[index].AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
    83             break;
    84       }
    85       return addresses[index];
     79      //return IPAddress.Parse("127.0.0.1");
     80      return System.Net.NetworkInformation.IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections()[0].LocalEndPoint.Address;
     81      //IPAddress[] addresses;
     82      //addresses = Dns.GetHostAddresses(Dns.GetHostName());
     83      //int index = 0;
     84      //if (System.Environment.OSVersion.Version.Major >= 6) {
     85      //  for (index = addresses.Length - 1; index >= 0; index--)
     86      //    if (addresses[index].AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
     87      //      break;
     88      //}
     89      //return addresses[index];
    8690    }
    8791
     
    9195    /// <returns></returns>
    9296    public static int GetDefaultPort() {
    93       return DEFAULTPORT;
     97      return DefaultPort;
     98    }
     99   
     100    /// <summary>
     101    /// This method changes the endpoint-address while preserving the identity-certificate defined in the config file
     102    /// </summary>
     103    public static void SetEndpointAddress(ServiceEndpoint endpoint, string address) {
     104      EndpointAddressBuilder builder = new EndpointAddressBuilder(endpoint.Address);
     105      builder.Uri = new Uri(address);
     106      endpoint.Address = builder.ToEndpointAddress();
    94107    }
    95108  }
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs

    r4264 r4302  
    279279
    280280      Thread t = new Thread(() => {
    281         IExecutionEngineFacade executionEngineFacade = GetExecutionEngineFacade();
     281        IClientFacade clientFacade = GetClientFacade();
    282282
    283283        try {
     
    292292          foreach (IOptimizer optimizer in parentOptimizersByPendingOptimizer.Keys) {
    293293            SerializedJob serializedJob = CreateSerializedJob(optimizer);
    294             ResponseObject<JobDto> response = executionEngineFacade.AddJobWithGroupStrings(serializedJob, groups);
     294            ResponseObject<JobDto> response = clientFacade.AddJobWithGroupStrings(serializedJob, groups);
    295295            lock (pendingOptimizersByJobId) {
    296296              pendingOptimizersByJobId.Add(response.Obj.Id, optimizer);
     
    468468    private void FetchAndUpdateJob(Guid jobId) {
    469469      LogMessage(jobId, "FetchAndUpdateJob started");
    470       IExecutionEngineFacade executionEngineFacade = GetExecutionEngineFacade();
     470      IClientFacade clientFacade = GetClientFacade();
    471471      IOptimizer originalOptimizer;
    472472      lock (pendingOptimizersByJobId) {
     
    475475
    476476      fetchJobSemaphore.WaitOne();
    477       ResponseObject<SerializedJob> jobResponse = executionEngineFacade.GetLastSerializedResult(jobId, false, false);
     477      ResponseObject<SerializedJob> jobResponse = clientFacade.GetLastSerializedResult(jobId, false, false);
    478478      IJob restoredObject = XmlParser.Deserialize<IJob>(new MemoryStream(jobResponse.Obj.SerializedJobData));
    479479      IOptimizer restoredOptimizer = ((OptimizerJob)restoredObject).Optimizer;
     
    490490
    491491    public void AbortJob(Guid jobId) {
    492       IExecutionEngineFacade executionEngineFacade = GetExecutionEngineFacade();
    493       Response response = executionEngineFacade.AbortJob(jobId);
     492      IClientFacade clientFacade = GetClientFacade();
     493      Response response = clientFacade.AbortJob(jobId);
    494494      LogMessage(jobId, "Aborting Job: " + response.StatusMessage);
    495495    }
     
    554554        try {
    555555          do {
    556             IExecutionEngineFacade executionEngineFacade = GetExecutionEngineFacade();
     556            IClientFacade clientFacade = GetClientFacade();
    557557            IEnumerable<Guid> jobIdsToQuery = from job in JobItems
    558558                                              where job.State != JobState.Finished &&
     
    562562              LogMessage("Polling results for " + jobIdsToQuery.Count() + " jobs");
    563563              try {
    564                 ResponseObject<JobResultList> response = executionEngineFacade.GetJobResults(jobIdsToQuery);
     564                ResponseObject<JobResultList> response = clientFacade.GetJobResults(jobIdsToQuery);
    565565                if (response.StatusMessage == ResponseStatus.Ok) {
    566566                  JobResultList jobItemList = response.Obj;
     
    601601    public void RequestSnapshot(Guid jobId) {
    602602      Thread t = new Thread(() => {
    603         IExecutionEngineFacade executionEngineFacade = GetExecutionEngineFacade();
     603        IClientFacade clientFacade = GetClientFacade();
    604604        ResponseObject<SerializedJob> response;
    605605        int retryCount = 0;
    606606
    607         Response snapShotResponse = executionEngineFacade.RequestSnapshot(jobId);
     607        Response snapShotResponse = clientFacade.RequestSnapshot(jobId);
    608608        if (snapShotResponse.StatusMessage == ResponseStatus.RequestSnapshot_JobIsNotBeeingCalculated) {
    609609          // job already finished
    610610          Logger.Debug("HiveExperiment: Abort - GetLastResult(false)");
    611           response = executionEngineFacade.GetLastSerializedResult(jobId, false, false);
     611          response = clientFacade.GetLastSerializedResult(jobId, false, false);
    612612          Logger.Debug("HiveExperiment: Abort - Server: " + response.StatusMessage);
    613613        } else {
     
    617617            Thread.Sleep(snapshotPollingIntervalMs);
    618618            Logger.Debug("HiveExperiment: Abort - GetLastResult(true)");
    619             response = executionEngineFacade.GetLastSerializedResult(jobId, false, true);
     619            response = clientFacade.GetLastSerializedResult(jobId, false, true);
    620620            Logger.Debug("HiveExperiment: Abort - Server: " + response.StatusMessage);
    621621            retryCount++;
     
    876876
    877877    #region Helper Functions
    878     private IExecutionEngineFacade GetExecutionEngineFacade() {
    879       IExecutionEngineFacade executionEngineFacade = null;
     878    private IClientFacade GetClientFacade() {
     879      IClientFacade clientFacade = null;
    880880      do {
    881881        try {
    882           executionEngineFacade = ServiceLocator.CreateExecutionEngineFacade(ServerUrl);
     882          clientFacade = ServiceLocator.CreateClientFacade(ServerUrl);
    883883        } catch (EndpointNotFoundException exception) {
    884884          LogMessage("Could not connect to Server: " + exception.Message + ". Will try again in " + (resultPollingIntervalMs / 1000) + " sec.");
    885885          Thread.Sleep(resultPollingIntervalMs);
    886886        }
    887       } while (executionEngineFacade == null && this.ExecutionState != Core.ExecutionState.Stopped);
    888       return executionEngineFacade;
     887      } while (clientFacade == null && this.ExecutionState != Core.ExecutionState.Stopped);
     888      return clientFacade;
    889889    }
    890890
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/ServiceLocator.cs

    r4120 r4302  
    3030namespace HeuristicLab.Hive.Experiment {
    3131  internal class ServiceLocator {
    32     internal static IExecutionEngineFacade CreateExecutionEngineFacade(string url) {
    33       ChannelFactory<IExecutionEngineFacade> factory = new ChannelFactory<IExecutionEngineFacade>(
     32    internal static IClientFacade CreateClientFacade(string url) {
     33      ChannelFactory<IClientFacade> factory = new ChannelFactory<IClientFacade>(
    3434          WcfSettings.GetStreamedBinding(),
    3535          new EndpointAddress(url));
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/AddJobForm.cs

    r4267 r4302  
    4646    ResponseList<ProjectDto> projects = null;
    4747    IJobManager jobManager;
    48     ISlaveManager clientManager;
     48    ISlaveManager slaveManager;
    4949    ResponseList<SlaveGroupDto> clientGroups;
    5050
     
    6161    private void AddJob() {
    6262      try {
     63        jobManager = ServiceLocator.GetJobManager();
     64        projects = jobManager.GetAllProjects();
     65        slaveManager = ServiceLocator.GetSlaveManager();
     66        clientGroups = slaveManager.GetAllSlaveGroups();
     67        cbProject.Items.Add("none");
     68        cbProject.SelectedIndex = 0;
     69        foreach (ProjectDto project in projects.List) {
     70          cbProject.Items.Add(project.Name);
     71        }
    6372
    64       jobManager =
    65         ServiceLocator.GetJobManager();
    66       projects = jobManager.GetAllProjects();
    67       clientManager = ServiceLocator.GetSlaveManager();
    68       clientGroups = clientManager.GetAllSlaveGroups();
    69       cbProject.Items.Add("none");
    70       cbProject.SelectedIndex = 0;
    71       foreach (ProjectDto project in projects.List) {
    72         cbProject.Items.Add(project.Name);
    73       }
     73        AddSlaveGroups();
    7474
    75       AddSlaveGroups();
    76 
    77       foreach (KeyValuePair<Guid, string> kvp in clients) {
    78         lbGroupsOut.Items.Add(kvp.Value + " (" + kvp.Key + ")");
    79       }
     75        foreach (KeyValuePair<Guid, string> kvp in clients) {
     76          lbGroupsOut.Items.Add(kvp.Value + " (" + kvp.Key + ")");
     77        }
    8078      }
    8179      catch (FaultException fe) {
     
    8684
    8785    private void AddSlaveGroups() {
    88      foreach (SlaveGroupDto cg in clientGroups.List) {
    89        if (cg.Id != Guid.Empty)
    90        clients.Add(cg.Id, cg.Name);
     86      foreach (SlaveGroupDto cg in clientGroups.List) {
     87        if (cg.Id != Guid.Empty)
     88          clients.Add(cg.Id, cg.Name);
    9189        AddSlaveOrGroup(cg);
    9290      }
     
    9795        if (resource is SlaveGroupDto) {
    9896          if (resource.Id != Guid.Empty)
    99           clients.Add(resource.Id, resource.Name);
     97            clients.Add(resource.Id, resource.Name);
    10098          AddSlaveOrGroup(resource as SlaveGroupDto);
    10199        }
    102100      }
    103    
     101
    104102    }
    105103
     
    111109          for (int i = 0; i < numJobs; i++) {
    112110            JobDto job = new JobDto { State = JobState.Offline, CoresNeeded = 1 };
    113            
     111
    114112            // if project selected (0 -> none)
    115113            if (cbProject.SelectedIndex != 0) {
     
    181179        lbGroupsOut.Items.RemoveAt(lbGroupsOut.SelectedIndex);
    182180      }
    183  
     181
    184182    }
    185183
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HeuristicLab.Hive.Server.Console-3.3.csproj

    r4296 r4302  
    9898    </Reference>
    9999    <Reference Include="System.DirectoryServices" />
     100    <Reference Include="System.IdentityModel" />
     101    <Reference Include="System.Runtime.Serialization" />
    100102    <Reference Include="System.ServiceModel">
    101103      <RequiredTargetFramework>3.0</RequiredTargetFramework>
     
    214216      <DesignTime>True</DesignTime>
    215217    </Compile>
     218    <None Include="app.config" />
    216219    <None Include="HeuristicLab.snk" />
    217220    <None Include="Properties\AssemblyInfo.frame" />
     221    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.BusinessObjects.AppointmentDto.datasource" />
     222    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.BusinessObjects.JobDto.datasource" />
     223    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.BusinessObjects.JobResult.datasource" />
     224    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.BusinessObjects.ProjectDto.datasource" />
     225    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.BusinessObjects.SerializedJob.datasource" />
     226    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.BusinessObjects.SlaveDto.datasource" />
     227    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.BusinessObjects.SlaveGroupDto.datasource" />
     228    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.BusinessObjects.UpTimeStatisticsDto.datasource" />
     229    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.ResponseObjects.Response.datasource" />
    218230    <None Include="Properties\Settings.settings">
    219231      <Generator>SettingsSingleFileGenerator</Generator>
     
    232244    </Compile>
    233245    <Compile Include="ServiceLocator.cs" />
     246    <None Include="Tools\RecreateServiceConfig.bat" />
    234247  </ItemGroup>
    235248  <ItemGroup>
     
    250263      <Name>HeuristicLab.Hive.JobBase-3.3</Name>
    251264    </ProjectReference>
     265  </ItemGroup>
     266  <ItemGroup>
     267    <WCFMetadata Include="Service References\" />
    252268  </ItemGroup>
    253269  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HiveServerManagementConsole.cs

    r4267 r4302  
    7272    private JobDataFetcher jdfOffline = null;
    7373    private JobDataFetcher jdfCalculating = null;
    74    
    75      
     74
     75
    7676    #endregion
    7777
     
    109109
    110110    void jdf_NewDataAvailable(object sender, EventArgs e) {
    111       JobDataFetcher fetcher = (JobDataFetcher) sender;
     111      JobDataFetcher fetcher = (JobDataFetcher)sender;
    112112      if (fetcher.PollStates.Contains(JobState.Finished)) {
    113113        UpdateJobListView(fetcher, lv_finishedJobs, 0);
    114       } else if(fetcher.PollStates.Contains(JobState.Calculating)) {
     114      } else if (fetcher.PollStates.Contains(JobState.Calculating)) {
    115115        UpdateJobListView(fetcher, lv_calculatingJobs, 1);
    116116      } else if (fetcher.PollStates.Contains(JobState.Offline)) {
     
    134134    }
    135135
    136    
     136
    137137    private void Init() {
    138138
    139       jdfFinished = new JobDataFetcher(new JobState[] {JobState.Finished}, 50);
    140       jdfCalculating = new JobDataFetcher(new JobState[] {JobState.Calculating}, 50);
    141       jdfOffline = new JobDataFetcher(new JobState[] {JobState.Offline}, 50);
     139      jdfFinished = new JobDataFetcher(new JobState[] { JobState.Finished }, 50);
     140      jdfCalculating = new JobDataFetcher(new JobState[] { JobState.Calculating }, 50);
     141      jdfOffline = new JobDataFetcher(new JobState[] { JobState.Offline }, 50);
    142142
    143143      cmb_finishedJob_count.SelectedItem = "50";
    144144      cmb_offlineJob_count.SelectedItem = "50";
    145145      cmb_calculatingJob_count.SelectedItem = "50";
    146      
     146
    147147      calcToolStripAbortItem.Click += (s, e) => {
    148         if(lv_calculatingJobs.SelectedItems.Count > 0) {
    149           ServiceLocator.GetJobManager().AbortJob(((JobDto) lv_calculatingJobs.SelectedItems[0].Tag).Id);
     148        if (lv_calculatingJobs.SelectedItems.Count > 0) {
     149          ServiceLocator.GetJobManager().AbortJob(((JobDto)lv_calculatingJobs.SelectedItems[0].Tag).Id);
    150150        }
    151151      };
     
    170170      //adding group
    171171      menuItemDeleteGroup.Click += (s, e) => {
    172         ISlaveManager clientManager = ServiceLocator.GetSlaveManager();
     172        ISlaveManager slaveManager = ServiceLocator.GetSlaveManager();
    173173        if (tvClientControl.SelectedNode != null) {
    174           Response resp = clientManager.DeleteSlaveGroup(((SlaveGroupDto)tvClientControl.SelectedNode.Tag).Id);
     174          Response resp = slaveManager.DeleteSlaveGroup(((SlaveGroupDto)tvClientControl.SelectedNode.Tag).Id);
    175175          if (tvClientControl.SelectedNode == currentGroupNode) {
    176176            currentGroupNode = null;
     
    182182
    183183      menuItemOpenCalendar.Click += (s, e) => {
    184                                       if (tvClientControl.SelectedNode != null) {
    185                                         CgCalendar cal = new CgCalendar(((SlaveGroupDto)tvClientControl.SelectedNode.Tag).Id, ((SlaveGroupDto)tvClientControl.SelectedNode.Tag).Name);                                       
    186                                         cal.Show();
    187                                       }
    188                                     };
     184        if (tvClientControl.SelectedNode != null) {
     185          CgCalendar cal = new CgCalendar(((SlaveGroupDto)tvClientControl.SelectedNode.Tag).Id, ((SlaveGroupDto)tvClientControl.SelectedNode.Tag).Name);
     186          cal.Show();
     187        }
     188      };
    189189
    190190
     
    255255    /// <param name="clientgroupID">group of clients</param>
    256256    private void ChangeGroup(Dictionary<SlaveDto, Guid> clients, Guid clientgroupID) {
    257       ISlaveManager clientManager = ServiceLocator.GetSlaveManager();
     257      ISlaveManager slaveManager = ServiceLocator.GetSlaveManager();
    258258      foreach (KeyValuePair<SlaveDto, Guid> client in clients) {
    259259        if (client.Key.Id != Guid.Empty) {
    260           Response resp = clientManager.DeleteResourceFromGroup(client.Value, client.Key.Id);
    261         }
    262         clientManager.AddResourceToGroup(clientgroupID, client.Key);
     260          Response resp = slaveManager.DeleteResourceFromGroup(client.Value, client.Key.Id);
     261        }
     262        slaveManager.AddResourceToGroup(clientgroupID, client.Key);
    263263      }
    264264    }
     
    285285      ResponseList<JobDto> jobsOld = jobs;
    286286      try {
    287         IJobManager jobManager =
    288                 ServiceLocator.GetJobManager();
     287        IJobManager jobManager = ServiceLocator.GetJobManager();
    289288
    290289        jobs = jobManager.GetAllJobs();
     
    293292        CloneList(jobsOld, out jobsOldHelp);
    294293
    295         if(jobsOld != null && jobsOld.List != null && jobsOldHelp != null)
     294        if (jobsOld != null && jobsOld.List != null && jobsOldHelp != null)
    296295          GetDelta(jobsOld.List, jobsOldHelp);
    297296
     
    412411      ResponseObject<JobDto> response = ServiceLocator.GetJobManager().GetJobByIdWithDetails(currentJob.Id);
    413412
    414       if(response.StatusMessage != ResponseStatus.Ok || response.Obj == null)
     413      if (response.StatusMessage != ResponseStatus.Ok || response.Obj == null)
    415414        return;
    416415
     
    429428      lblJobName.Text = job.Id.ToString();
    430429      if (job.Percentage != null) {
    431         progressJob.Value = (int) (currentJob.Percentage*100);
    432         lblProgress.Text = (int) (currentJob.Percentage*100) + "% calculated";
     430        progressJob.Value = (int)(currentJob.Percentage * 100);
     431        lblProgress.Text = (int)(currentJob.Percentage * 100) + "% calculated";
    433432      }
    434433
     
    482481        if (job.State == JobState.Finished) {
    483482          lvi = null;
    484             lvi = new ListViewItem();
    485             lvi.Text = "Calculation ended:";
    486             lvi.SubItems.Add(job.DateFinished.ToString());
    487             lvJobDetails.Items.Add(lvi);
    488           }
    489         }
    490       }
     483          lvi = new ListViewItem();
     484          lvi.Text = "Calculation ended:";
     485          lvi.SubItems.Add(job.DateFinished.ToString());
     486          lvJobDetails.Items.Add(lvi);
     487        }
     488      }
     489    }
    491490
    492491    /// <summary>
     
    608607
    609608    private void OnLVJobControlClicked(object sender, EventArgs e) {
    610       JobListView jlv = (JobListView) sender;
     609      JobListView jlv = (JobListView)sender;
    611610      currentJob = (JobDto)jlv.SelectedItems[0].Tag;
    612611      JobClicked();
     
    614613
    615614    private void lvJobControl_MouseMove(object sender, MouseEventArgs e) {
    616       JobListView jlv = (JobListView) sender;
     615      JobListView jlv = (JobListView)sender;
    617616      if ((jlv.GetItemAt(e.X, e.Y) != null) &&
    618617        (jlv.GetItemAt(e.X, e.Y).ToolTipText != null)) {
     
    696695
    697696    private void addgroup_addGroupEvent(string name) {
    698       ISlaveManager clientManager = ServiceLocator.GetSlaveManager();
     697      ISlaveManager slaveManager = ServiceLocator.GetSlaveManager();
    699698
    700699      if (parentgroup != Guid.Empty) {
    701700        SlaveGroupDto cg = new SlaveGroupDto() { Name = name };
    702         ResponseObject<SlaveGroupDto> respcg = clientManager.AddSlaveGroup(cg);
    703         Response res = clientManager.AddResourceToGroup(parentgroup, respcg.Obj);
     701        ResponseObject<SlaveGroupDto> respcg = slaveManager.AddSlaveGroup(cg);
     702        Response res = slaveManager.AddResourceToGroup(parentgroup, respcg.Obj);
    704703        if (res != null && res.StatusMessage != ResponseStatus.Ok) {
    705704          MessageBox.Show(res.StatusMessage.ToString(), "Error adding Group", MessageBoxButtons.OK, MessageBoxIcon.Error);
     
    707706      } else {
    708707        SlaveGroupDto cg = new SlaveGroupDto() { Name = name };
    709         clientManager.AddSlaveGroup(cg);
     708        slaveManager.AddSlaveGroup(cg);
    710709      }
    711710      AddSlaves();
     
    783782    }
    784783
    785     private int CapacityRam(int noCores, int freeCores) {   
     784    private int CapacityRam(int noCores, int freeCores) {
    786785      if (noCores > 0) {
    787786        int capacity = ((noCores - freeCores) / noCores) * 100;
     
    865864
    866865    private void cmb_count_SelectedIndexChanged(object sender, EventArgs e) {
    867       ComboBox box = (ComboBox) sender;
     866      ComboBox box = (ComboBox)sender;
    868867      if (box.SelectedItem != null) {
    869868        int val;
     
    871870          if (box == cmb_offlineJob_count) {
    872871            jdfOffline.NrOfEntriesOnPage = val;
    873           }
    874           else if (box == cmb_finishedJob_count) {
     872          } else if (box == cmb_finishedJob_count) {
    875873            jdfFinished.NrOfEntriesOnPage = val;
    876           }
    877           else if (box == cmb_calculatingJob_count) {
     874          } else if (box == cmb_calculatingJob_count) {
    878875            jdfCalculating.NrOfEntriesOnPage = val;
    879876          }
     
    883880
    884881    private void lv_Jobs_SelectedIndexChanged(object sender, EventArgs e) {
    885       ListView lv = (ListView) sender;
    886       if(lv.SelectedItems.Count > 0) {
     882      ListView lv = (ListView)sender;
     883      if (lv.SelectedItems.Count > 0) {
    887884        foreach (ListViewItem lvi in lv.SelectedItems) {
    888           currentJob = (JobDto) lvi.Tag;
    889           JobClicked();         
     885          currentJob = (JobDto)lvi.Tag;
     886          JobClicked();
    890887        }
    891888      }
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/JobListView.cs

    r4264 r4302  
    1616    private ImageList ilSmallImgJob;
    1717
    18     public int NrOfEntriesOnPage { 
     18    public int NrOfEntriesOnPage {
    1919      get {
    2020        return jdf.NrOfEntriesOnPage;
    21       } 
     21      }
    2222      set {
    2323        jdf.NrOfEntriesOnPage = value;
     
    3838
    3939    private void JdfNewDataAvailable(object sender, EventArgs e) {
    40       JobDataFetcher datafetcher = (JobDataFetcher) sender;
     40      JobDataFetcher datafetcher = (JobDataFetcher)sender;
    4141      this.BeginUpdate();
    4242      if (datafetcher.PollStates.Contains(JobState.Finished)) {
     
    119119    private void InitializeCustomControls() {
    120120      menuItemAbortJob.Click += (s, e) => {
    121                                   IJobManager jobManager = ServiceLocator.GetJobManager();
    122                                   if (this.SelectedItems.Count == 1) {
    123                                     jobManager.AbortJob(((JobDto) (this.SelectedItems[0].Tag)).Id);
    124                                   }
    125                                 };
     121        IJobManager jobManager = ServiceLocator.GetJobManager();
     122        if (this.SelectedItems.Count == 1) {
     123          jobManager.AbortJob(((JobDto)(this.SelectedItems[0].Tag)).Id);
     124        }
     125      };
    126126
    127127      //adding context menu items for jobs
    128128      menuItemGetSnapshot.Click += (s, e) => {
    129                                      IJobManager jobManager = ServiceLocator.GetJobManager();
    130                                      if (this.SelectedItems.Count == 1) {
    131                                        jobManager.RequestSnapshot(((JobDto) (this.SelectedItems[0].Tag)).Id);
    132                                      }
    133                                    };
    134      
    135      
     129        IJobManager jobManager = ServiceLocator.GetJobManager();
     130        if (this.SelectedItems.Count == 1) {
     131          jobManager.RequestSnapshot(((JobDto)(this.SelectedItems[0].Tag)).Id);
     132        }
     133      };
    136134    }
    137135  }
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/ServiceLocator.cs

    r4296 r4302  
    44using System.Text;
    55
     6using System.ServiceModel;
    67using HeuristicLab.Hive.Contracts.Interfaces;
    7 using System.ServiceModel;
    88using HeuristicLab.Hive.Contracts;
     9using System.ServiceModel.Description;
    910
    1011namespace HeuristicLab.Hive.Server.ServerConsole {
     12
    1113  internal class ServiceLocator {
    1214    private static IServerConsoleFacade serverConsoleFacade = null;
     
    1517    internal static string Port { get; set; }
    1618    internal static string Username { get; set; }
    17     // [chn] TODO: Don't store plaintext password in memory!
    18     internal static string Password { get; set; }
     19    internal static string Password { get; set; } // [chn] TODO: Don't store plaintext password in memory!
    1920
    2021    internal static ISlaveManager GetSlaveManager() {
     
    2829    internal static IServerConsoleFacade GetServerConsoleFacade() {
    2930      if (serverConsoleFacade == null && Address != String.Empty && Port != String.Empty) {
    30         //ChannelFactory<IServerConsoleFacade> factory =
    31         //  new ChannelFactory<IServerConsoleFacade>(
    32         //    WcfSettings.GetBinding(),
    33         //    new EndpointAddress("net.tcp://" + Address + ":" + Port + "/HiveServerConsole/ServerConsoleFacade"));
    34 
    35         ChannelFactory<IServerConsoleFacade> factory =
    36           new ChannelFactory<IServerConsoleFacade>(
    37             WcfSettings.GetBinding(),
    38             new EndpointAddress("http://" + Address + ":" + Port + "/HiveServerConsole"));
     31        ChannelFactory<IServerConsoleFacade> factory = new ChannelFactory<IServerConsoleFacade>("ServerConsoleHttpEndpoint");
     32        WcfSettings.SetEndpointAddress(factory.Endpoint, string.Format("http://{0}:{1}/{2}", Address, Port, WcfSettings.ServerConsoleServiceName));
    3933
    4034        factory.Credentials.UserName.UserName = Username;
    4135        factory.Credentials.UserName.Password = Password;
    42         serverConsoleFacade = factory.CreateChannel();
    43         ((ICommunicationObject)serverConsoleFacade).Faulted += ServiceLocator_Faulted;
     36
     37        IServerConsoleFacade client = factory.CreateChannel();
     38
     39        ((ICommunicationObject)client).Faulted += ServiceLocator_Faulted;
     40        serverConsoleFacade = client;
    4441      }
    4542      return serverConsoleFacade;
     
    5552      serverConsoleFacade = null;
    5653    }
    57 
    5854  }
    5955}
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/ServerConsoleFacade.cs

    r4296 r4302  
    4747    private IJobManager jobManager = ServiceLocator.GetJobManager();
    4848
    49     private IHivePermissionManager secMan = ServiceLocator.GetHivePermissionManager();
    50 
    5149    private IContextFactory contextFactory = ServiceLocator.GetContextFactory();
    5250
     
    5654    }
    5755
    58     [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    5956    public Response Login() {
    6057      Response resp = new Response();
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/SlaveFacade.cs

    r4289 r4302  
    4141  [ServiceBehavior(InstanceContextMode = InstanceContextMode.PerCall, ConcurrencyMode = ConcurrencyMode.Multiple)]
    4242  public class SlaveFacade : ISlaveFacade {
     43    private ISlaveCommunicator slaveCommunicator = ServiceLocator.GetSlaveCommunicator();
     44    private IContextFactory contextFactory = ServiceLocator.GetContextFactory();
    4345
    4446    public SlaveFacade() {
    4547    }
    4648
    47     private ISlaveCommunicator slaveCommunicator = ServiceLocator.GetSlaveCommunicator();
    48 
    49     private IContextFactory contextFactory = ServiceLocator.GetContextFactory();
    50 
    5149    #region ISlaveCommunicator Members
    5250
     51    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    5352    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    5453    public Response Login(Guid slaveId) {
     
    5857    }
    5958
     59    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    6060    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    6161    public ResponseHeartBeat ProcessHeartBeat(HeartBeatData hbData) {
     
    6565    }
    6666
     67    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    6768    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    68     public ResponseObject<JobDto> GetJob(Guid clientId) {
     69    public ResponseObject<JobDto> GetJob(Guid slaveId) {
    6970      using (contextFactory.GetContext()) {
    70         return slaveCommunicator.GetJob(clientId);
     71        return slaveCommunicator.GetJob(slaveId);
    7172      }
    7273    }
    7374
     75    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    7476    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    75     public ResponseResultReceived StoreFinishedJobResult(Guid clientId, Guid jobId, byte[] result, double percentage, string exception) {
     77    public ResponseResultReceived StoreFinishedJobResult(Guid slaveId, Guid jobId, byte[] result, double percentage, string exception) {
    7678      using (contextFactory.GetContext()) {
    77         return slaveCommunicator.StoreFinishedJobResult(clientId, jobId, result, percentage, exception);
     79        return slaveCommunicator.StoreFinishedJobResult(slaveId, jobId, result, percentage, exception);
    7880      }
    7981    }
    8082
     83    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    8184    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    82     public Response Logout(Guid clientId) {
     85    public Response Logout(Guid slaveId) {
    8386      using (contextFactory.GetContext()) {
    84         return slaveCommunicator.Logout(clientId);
     87        return slaveCommunicator.Logout(slaveId);
    8588      }
    8689    }
    8790
     91    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    8892    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    8993    public Response IsJobStillNeeded(Guid jobId) {
     
    9397    }
    9498
     99    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    95100    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    96101    public ResponseList<CachedHivePluginInfoDto> GetPlugins(List<HivePluginInfoDto> pluginList) {
     
    98103    }
    99104
     105    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    100106    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    101     public ResponseResultReceived ProcessSnapshot(Guid clientId, Guid jobId, byte[] result, double percentage, string exception) {
     107    public ResponseResultReceived ProcessSnapshot(Guid slaveId, Guid jobId, byte[] result, double percentage, string exception) {
    102108      using (contextFactory.GetContext()) {
    103         return slaveCommunicator.ProcessSnapshot(clientId, jobId, result, percentage, exception);
     109        return slaveCommunicator.ProcessSnapshot(slaveId, jobId, result, percentage, exception);
    104110      }
    105111    }
    106112
     113    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    107114    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    108     public ResponseCalendar GetCalendar(Guid clientId) {
     115    public ResponseCalendar GetCalendar(Guid slaveId) {
    109116      using (contextFactory.GetContext()) {
    110         return slaveCommunicator.GetCalendar(clientId);
     117        return slaveCommunicator.GetCalendar(slaveId);
    111118      }
    112119    }
    113120
     121    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    114122    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    115     public Response SetCalendarStatus(Guid clientId, CalendarState state) {
     123    public Response SetCalendarStatus(Guid slaveId, CalendarState state) {
    116124      using (contextFactory.GetContext()) {
    117         return slaveCommunicator.SetCalendarStatus(clientId, state);
     125        return slaveCommunicator.SetCalendarStatus(slaveId, state);
    118126      }
    119127    }
     
    125133    /// Do not use automatic transactions here
    126134    /// </summary>
     135    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    127136    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    128     public Stream GetStreamedJob(Guid clientId) {
     137    public Stream GetStreamedJob(Guid slaveId) {
    129138      using (contextFactory.GetContext(false)) {
    130139        MultiStream stream = new MultiStream();
     
    132141        ResponseObject<JobDto> job = null;
    133142
    134         job = ServiceLocator.GetSlaveCommunicator().GetJob(clientId);
     143        job = ServiceLocator.GetSlaveCommunicator().GetJob(slaveId);
    135144
    136145        //first send response
     
    145154        }
    146155
    147         OperationContext clientContext = OperationContext.Current;
    148         clientContext.OperationCompleted += new EventHandler(delegate(object sender, EventArgs args) {
     156        OperationContext slaveContext = OperationContext.Current;
     157        slaveContext.OperationCompleted += new EventHandler(delegate(object sender, EventArgs args) {
    149158          if (stream != null) {
    150159            stream.Dispose();
     
    156165    }
    157166
     167    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    158168    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    159169    public Stream GetStreamedPlugins(List<HivePluginInfoDto> pluginList) {
     
    161171    }
    162172
     173    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    163174    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    164175    public ResponseResultReceived StoreFinishedJobResultStreamed(Stream stream) {
     
    168179    }
    169180
     181    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
    170182    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
    171183    public ResponseResultReceived ProcessSnapshotStreamed(Stream stream) {
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/HeuristicLab.Hive.Server.Core-3.3.csproj

    r4296 r4302  
    120120    <Compile Include="DaoLocator.cs" />
    121121    <Compile Include="DefaultScheduler.cs" />
    122     <Compile Include="Facades\ExecutionEngineFacade.cs" />
     122    <Compile Include="Facades\ClientFacade.cs" />
    123123    <Compile Include="HeuristicLabHiveServerCorePlugin.cs" />
    124124    <Compile Include="InternalInterfaces\IHivePermissionManager.cs" />
     
    131131    <Compile Include="Facades\ServerConsoleFacade.cs" />
    132132    <Compile Include="ServiceLocator.cs" />
    133     <Compile Include="Properties\Settings.Designer.cs">
    134       <AutoGen>True</AutoGen>
    135       <DesignTimeSharedInput>True</DesignTimeSharedInput>
    136       <DependentUpon>Settings.settings</DependentUpon>
    137     </Compile>
    138133    <Compile Include="Settings.cs" />
    139134  </ItemGroup>
     
    144139    <None Include="HeuristicLab.snk" />
    145140    <None Include="Properties\AssemblyInfo.frame" />
    146     <None Include="Properties\Settings.settings">
    147       <Generator>PublicSettingsSingleFileGenerator</Generator>
    148       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
    149     </None>
    150141  </ItemGroup>
    151142  <ItemGroup>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/ServiceLocator.cs

    r4296 r4302  
    102102
    103103    /// <summary>
    104     /// Gets the db session factory
    105     /// </summary>
    106     /// <returns></returns>
    107     [MethodImpl(MethodImplOptions.Synchronized)]
    108     public static ISessionFactory GetSessionFactory() {
    109       if (sessionFactory == null) {
    110         sessionFactory = ApplicationManager.Manager.GetInstances<ISessionFactory>().First();
    111         sessionFactory.DbConnectionType = typeof(SqlConnection);
    112         sessionFactory.DbConnectionString = HeuristicLab.Hive.Server.Core.Properties.Settings.Default.HiveServerConnectionString;
    113       }
    114 
    115       return sessionFactory;
    116     }
    117 
    118     /// <summary>
    119104    /// Gets the scheduler
    120105    /// </summary>
     
    141126    //}
    142127
    143     /// <summary>
    144     /// Gets the permission manager
    145     /// </summary>
    146     /// <returns></returns>
    147     [MethodImpl(MethodImplOptions.Synchronized)]
    148     public static IHivePermissionManager GetHivePermissionManager() {
    149       if (hivePermManager == null)
    150         hivePermManager = ApplicationManager.Manager.GetInstances<IHivePermissionManager>().First();
    151       return hivePermManager;
     128    ///// <summary>
     129    ///// Gets the permission manager
     130    ///// </summary>
     131    ///// <returns></returns>
     132    //[MethodImpl(MethodImplOptions.Synchronized)]
     133    //public static IHivePermissionManager GetHivePermissionManager() {
     134    //  if (hivePermManager == null)
     135    //    hivePermManager = ApplicationManager.Manager.GetInstances<IHivePermissionManager>().First();
     136    //  return hivePermManager;
    152137
    153     }
     138    //}
    154139
    155140    /// <summary>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/app.config

    r4289 r4302  
    33  <connectionStrings>
    44    <add name="HeuristicLab.Authentication"
    5          connectionString="data source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
     5         connectionString="data source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
    66  </connectionStrings>
    77
     
    3838    </bindings>
    3939    <behaviors>
    40      
    4140      <serviceBehaviors>
    4241        <behavior name="ServiceBehaviour">
     
    5049              membershipProviderName="AspNetSqlMembershipProvider" />
    5150          </serviceCredentials>
     51          <serviceSecurityAudit auditLogLocation="Application" suppressAuditFailure="false"
     52            messageAuthenticationAuditLevel="SuccessOrFailure" />
    5253        </behavior>
    5354      </serviceBehaviors>
    5455    </behaviors>
    5556    <services>
    56      
    5757      <service behaviorConfiguration="ServiceBehaviour" name="HeuristicLab.Hive.Server.Core.SlaveFacade">
    58         <endpoint address="http://locahost:9000/HiveServer" binding="wsHttpBinding"
    59           bindingConfiguration="HttpBinding" name="HiveServerHttpEndpoint"
     58        <endpoint address="http://localhost:9000/SlaveService" binding="wsHttpBinding"
     59          bindingConfiguration="HttpBinding" name="SlaveHttpEndpoint"
    6060          contract="HeuristicLab.Hive.Contracts.Interfaces.ISlaveFacade" />
    61         <endpoint address="http://locahost:9000/HiveServer/mex" binding="mexHttpBinding"
    62           name="HiveServerMexEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.ISlaveFacade" />
     61        <endpoint address="mex" binding="mexHttpBinding" name="SlaveMexEndpoint"
     62          contract="HeuristicLab.Hive.Contracts.Interfaces.ISlaveFacade" />
     63        <host>
     64          <baseAddresses>
     65            <add baseAddress="http://localhost:9000/SlaveService" />
     66          </baseAddresses>
     67        </host>
    6368      </service>
    6469      <service behaviorConfiguration="ServiceBehaviour" name="HeuristicLab.Hive.Server.Core.ServerConsoleFacade">
    65         <endpoint address="http://locahost:9000/HiveServerConsole" binding="wsHttpBinding"
    66           bindingConfiguration="HttpBinding" name="ServerConsoleHttpEndpoint"
     70        <endpoint address="http://localhost:9000/ServerConsoleService"
     71          binding="wsHttpBinding" bindingConfiguration="HttpBinding" name="ServerConsoleHttpEndpoint"
    6772          contract="HeuristicLab.Hive.Contracts.Interfaces.IServerConsoleFacade" />
    68         <endpoint address="http://locahost:9000/HiveServerConsole/mex"
    69           binding="mexHttpBinding" name="ServerConsoleMexEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IServerConsoleFacade" />
     73        <endpoint address="mex" binding="mexHttpBinding" name="ServerConsoleMexEndpoint"
     74          contract="HeuristicLab.Hive.Contracts.Interfaces.IServerConsoleFacade" />
     75        <host>
     76          <baseAddresses>
     77            <add baseAddress="http://localhost:9000/ServerConsoleService" />
     78          </baseAddresses>
     79        </host>
    7080      </service>
    71       <service behaviorConfiguration="ServiceBehaviour" name="HeuristicLab.Hive.Server.Core.ExecutionEngineFacade">
    72         <endpoint address="http://locahost:9000/ExecutionEngine" binding="wsHttpBinding"
    73           bindingConfiguration="HttpBinding" name="ExecutionEngineHttpEndpoint"
    74           contract="HeuristicLab.Hive.Contracts.Interfaces.IExecutionEngineFacade" />
    75         <endpoint address="http://locahost:9000/ExecutionEngine/mex"
    76           binding="mexHttpBinding" name="ExecutionEngineMexEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IExecutionEngineFacade" />
     81      <service behaviorConfiguration="ServiceBehaviour" name="HeuristicLab.Hive.Server.Core.ClientFacade">
     82        <endpoint address="http://localhost:9000/ClientService" binding="wsHttpBinding"
     83          bindingConfiguration="HttpBinding" name="ClientHttpEndpoint"
     84          contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" />
     85        <endpoint address="mex" binding="mexHttpBinding" name="ClientMexEndpoint"
     86          contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" />
     87        <host>
     88          <baseAddresses>
     89            <add baseAddress="http://localhost:9000/ClientService" />
     90          </baseAddresses>
     91        </host>
    7792      </service>
    7893    </services>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/Properties/Settings.Designer.cs

    r4170 r4302  
    2727        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    2828        [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
    29         [global::System.Configuration.DefaultSettingValueAttribute("Data Source=127.0.0.1;Initial Catalog=HeuristicLab.Hive;Integrated Security=True;" +
     29        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=localhost;Initial Catalog=HeuristicLab.Hive;Integrated Security=True;" +
    3030            "")]
    3131        public string HeuristicLab_Hive_LinqConnectionString {
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/Properties/Settings.settings

    r4170 r4302  
    66      <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
    77&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
    8   &lt;ConnectionString&gt;Data Source=127.0.0.1;Initial Catalog=HeuristicLab.Hive;Integrated Security=True;&lt;/ConnectionString&gt;
     8  &lt;ConnectionString&gt;Data Source=localhost;Initial Catalog=HeuristicLab.Hive;Integrated Security=True;&lt;/ConnectionString&gt;
    99  &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
    1010&lt;/SerializableConnectionString&gt;</DesignTimeValue>
    11       <Value Profile="(Default)">Data Source=127.0.0.1;Initial Catalog=HeuristicLab.Hive;Integrated Security=True;</Value>
     11      <Value Profile="(Default)">Data Source=localhost;Initial Catalog=HeuristicLab.Hive;Integrated Security=True;</Value>
    1212    </Setting>
    1313  </Settings>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/app.config

    r4170 r4302  
    55    <connectionStrings>
    66        <add name="HeuristicLab.Hive.Server.LINQDataAccess.Properties.Settings.HeuristicLab_Hive_LinqConnectionString"
    7             connectionString="Data Source=127.0.0.1;Initial Catalog=HeuristicLab.Hive;Integrated Security=True;"
     7            connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive;Integrated Security=True;"
    88            providerName="System.Data.SqlClient" />
    99    </connectionStrings>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3/HeuristicLabHiveServerApplication.cs

    r4285 r4302  
    3333
    3434namespace HeuristicLab.Hive.Server {
    35   [Application("Hive Server", "Server application for the distributed hive engine.", true)]
     35  [Application("Hive Server", "Server application for the distributed hive engine.", false)]
    3636  public class HeuristicLabHiveServerApplication : ApplicationBase {
    37     public const string STR_SlaveCommunicator = "HiveServer";
    38     public const string STR_ServerConsoleFacade = "ServerConsoleFacade";
    39     public const string STR_ExecutionEngineFacade = "ExecutionEngineFacade";
    4037    Dictionary<string, Uri> baseAddrDict = new Dictionary<string, Uri>();
    4138
    4239    public override void Run() {
    43       ServiceHost slaveHost = new ServiceHost(ApplicationManager.Manager.GetTypes(typeof(ISlaveFacade)).First(), GetUri(STR_SlaveCommunicator));
    44       slaveHost.Open();
     40      ILifecycleManager lifecycleManager = null;
     41      ServiceHost slaveServiceHost = null;
     42      ServiceHost serverConsoleServiceHost = null;
     43      ServiceHost clientServiceHost = null;
     44      try {
     45        slaveServiceHost = new ServiceHost(ApplicationManager.Manager.GetTypes(typeof(ISlaveFacade)).First(), GetUri(WcfSettings.SlaveServiceName));
     46        slaveServiceHost.Open();
    4547
    46       ServiceHost serverConsoleHost = new ServiceHost(ApplicationManager.Manager.GetTypes(typeof(IServerConsoleFacade)).First(), GetUri(STR_ServerConsoleFacade));
    47       serverConsoleHost.Open();
     48        serverConsoleServiceHost = new ServiceHost(ApplicationManager.Manager.GetTypes(typeof(IServerConsoleFacade)).First(), GetUri(WcfSettings.ServerConsoleServiceName));
     49        serverConsoleServiceHost.Open();
    4850
    49       ServiceHost executionEngineHost = new ServiceHost(ApplicationManager.Manager.GetTypes(typeof(IExecutionEngineFacade)).First(), GetUri(STR_ExecutionEngineFacade));
    50       executionEngineHost.Open();
     51        clientServiceHost = new ServiceHost(ApplicationManager.Manager.GetTypes(typeof(IClientFacade)).First(), GetUri(WcfSettings.ClientServiceName));
     52        clientServiceHost.Open();
    5153
    52       ILifecycleManager lifecycleManager = ServiceLocator.GetLifecycleManager();
    53       lifecycleManager.Init();
     54        lifecycleManager = ServiceLocator.GetLifecycleManager();
     55        lifecycleManager.Init();
    5456
    55       Form mainForm = new MainForm(baseAddrDict);
    56       Application.Run();
     57        Form mainForm = new MainForm(baseAddrDict);
     58        Application.Run();
     59      }
     60      catch (AddressAccessDeniedException ex) {
     61        throw new Exception("Unable to start WCF-Services due to missing rights. Run the following command as administrator: \"netsh http add urlacl url=http://+" + WcfSettings.DefaultPort + "/ user=MYMACHINE\\UserName\". See inner exception for more details.", ex);
     62      }
     63      finally {
     64        if (slaveServiceHost != null && slaveServiceHost.State == CommunicationState.Opened)
     65          slaveServiceHost.Close();
     66        if (serverConsoleServiceHost != null && serverConsoleServiceHost.State == CommunicationState.Opened)
     67          serverConsoleServiceHost.Close();
     68        if (clientServiceHost != null && clientServiceHost.State == CommunicationState.Opened)
     69          clientServiceHost.Close();
    5770
    58       slaveHost.Close();
    59       serverConsoleHost.Close();
    60       executionEngineHost.Close();
    61 
    62       lifecycleManager.Shutdown();
     71        if(lifecycleManager != null)
     72          lifecycleManager.Shutdown();
     73      }
    6374    }
    6475
    6576    private Uri GetUri(string serviceName) {
    6677      string ipAddress = WcfSettings.GetActiveIP().ToString();
    67       string port = WcfSettings.DEFAULTPORT.ToString();
     78      string port = WcfSettings.DefaultPort.ToString();
    6879      Uri uriHttp = new Uri("http://" + ipAddress + ":" + port + "/" + serviceName + "/");
    6980      baseAddrDict.Add(serviceName, uriHttp);
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3/MainForm.cs

    r4267 r4302  
    77using System.Text;
    88using System.Windows.Forms;
     9using HeuristicLab.Hive.Contracts;
    910
    1011namespace HeuristicLab.Hive.Server {
     
    1516      Uri uri;
    1617      StringBuilder servicesTxt = new StringBuilder();
    17       addresses.TryGetValue(HeuristicLabHiveServerApplication.STR_SlaveCommunicator, out uri);
     18      addresses.TryGetValue(WcfSettings.SlaveServiceName, out uri);
    1819      if (uri != null)
    1920        servicesTxt.AppendLine(String.Format("Server Slave: {0}", uri));
    20       addresses.TryGetValue(HeuristicLabHiveServerApplication.STR_ServerConsoleFacade, out uri);
     21      addresses.TryGetValue(WcfSettings.ServerConsoleServiceName, out uri);
    2122      if (uri != null)
    2223        servicesTxt.AppendLine(String.Format("Server Console: {0}", uri));
    23       addresses.TryGetValue(HeuristicLabHiveServerApplication.STR_ExecutionEngineFacade, out uri);
     24      addresses.TryGetValue(WcfSettings.ClientServiceName, out uri);
    2425      if (uri != null)
    2526        servicesTxt.AppendLine(String.Format("Execution Engine: {0}", uri));
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/HeuristicLab.Hive.Slave.Communication-3.3.csproj

    r4296 r4302  
    130130    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.ResponseObjects.ResponseResultReceived.datasource" />
    131131    <None Include="Properties\DataSources\HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto.datasource" />
    132     <None Include="Service References\ServerService\item.wsdl" />
    133     <None Include="Service References\ServerService\item4.xsd">
    134       <SubType>Designer</SubType>
    135     </None>
    136     <None Include="Service References\ServerService\item5.xsd">
    137       <SubType>Designer</SubType>
    138     </None>
    139     <None Include="Service References\ServerService\item6.xsd">
    140       <SubType>Designer</SubType>
    141     </None>
    142     <None Include="Service References\ServerService\item7.xsd">
    143       <SubType>Designer</SubType>
    144     </None>
    145     <None Include="Service References\ServerService\item8.xsd">
    146       <SubType>Designer</SubType>
    147     </None>
    148     <None Include="Service References\ServerService\item9.xsd">
    149       <SubType>Designer</SubType>
    150     </None>
    151     <None Include="Service References\ServerService\SlaveFacade.wsdl" />
    152     <None Include="Service References\ServerService\SlaveFacade1.wsdl" />
     132    <None Include="Service References\ServerService\SlaveFacade2.wsdl" />
     133    <None Include="Service References\ServerService\SlaveService.wsdl" />
     134    <None Include="Service References\ServerService\SlaveService.xsd">
     135      <SubType>Designer</SubType>
     136    </None>
     137    <None Include="Service References\ServerService\SlaveService1.xsd">
     138      <SubType>Designer</SubType>
     139    </None>
     140    <None Include="Service References\ServerService\SlaveService2.xsd">
     141      <SubType>Designer</SubType>
     142    </None>
     143    <None Include="Service References\ServerService\SlaveService3.xsd">
     144      <SubType>Designer</SubType>
     145    </None>
     146    <None Include="Service References\ServerService\SlaveService4.xsd">
     147      <SubType>Designer</SubType>
     148    </None>
     149    <None Include="Service References\ServerService\SlaveService5.xsd">
     150      <SubType>Designer</SubType>
     151    </None>
     152    <None Include="Service References\ServerService\SlaveService6.xsd">
     153      <SubType>Designer</SubType>
     154    </None>
     155    <None Include="Service References\ServerService\SlaveService7.xsd">
     156      <SubType>Designer</SubType>
     157    </None>
     158    <None Include="Service References\ServerService\SlaveService8.xsd">
     159      <SubType>Designer</SubType>
     160    </None>
     161    <None Include="Service References\ServerService\SlaveService9.xsd">
     162      <SubType>Designer</SubType>
     163    </None>
    153164  </ItemGroup>
    154165  <ItemGroup>
     
    183194    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.ResponseSerializedJob.datasource" />
    184195    <None Include="Service References\ServerService\HeuristicLab.PluginInfrastructure.xsd" />
    185     <None Include="Service References\ServerService\item.xsd">
    186       <SubType>Designer</SubType>
    187     </None>
    188     <None Include="Service References\ServerService\item1.xsd">
    189       <SubType>Designer</SubType>
    190     </None>
    191     <None Include="Service References\ServerService\item2.xsd">
    192       <SubType>Designer</SubType>
    193     </None>
    194     <None Include="Service References\ServerService\item3.xsd">
    195       <SubType>Designer</SubType>
    196     </None>
    197196    <None Include="Service References\ServerService\Reference.svcmap">
    198197      <Generator>WCF Proxy Generator</Generator>
    199198      <LastGenOutput>Reference.cs</LastGenOutput>
    200199    </None>
     200  </ItemGroup>
     201  <ItemGroup>
     202    <None Include="Service References\ServerService\SlaveService.disco" />
    201203  </ItemGroup>
    202204  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/Service References/ServerService/Reference.svcmap

    r4289 r4302  
    1919  </ClientOptions>
    2020  <MetadataSources>
    21     <MetadataSource Address="http://localhost:9000/HiveServer/?wsdl" Protocol="http" SourceId="1" />
     21    <MetadataSource Address="http://localhost:9000/SlaveService" Protocol="http" SourceId="1" />
    2222  </MetadataSources>
    2323  <Metadata>
    24     <MetadataFile FileName="item.xsd" MetadataType="Schema" ID="1f132f85-5d71-4006-8218-3bdb3fe32ffc" SourceId="1" SourceUrl="http://10.42.1.154:9000/HiveServer/?xsd=xsd5" />
    25     <MetadataFile FileName="item1.xsd" MetadataType="Schema" ID="ea85f1ee-08d6-4910-a054-d30cdb322106" SourceId="1" SourceUrl="http://10.42.1.154:9000/HiveServer/?xsd=xsd2" />
    26     <MetadataFile FileName="item2.xsd" MetadataType="Schema" ID="b5c574de-3d49-4d68-8f1c-c1a0244779bc" SourceId="1" SourceUrl="http://10.42.1.154:9000/HiveServer/?xsd=xsd3" />
    27     <MetadataFile FileName="item3.xsd" MetadataType="Schema" ID="a39965a2-4d42-4e88-a8de-1114c054cb66" SourceId="1" SourceUrl="http://10.42.1.154:9000/HiveServer/?xsd=xsd0" />
    28     <MetadataFile FileName="SlaveFacade.wsdl" MetadataType="Wsdl" ID="4ac3f569-85b3-4eb9-b83d-d45b26b95816" SourceId="1" SourceUrl="http://10.42.1.154:9000/HiveServer/?wsdl" />
    29     <MetadataFile FileName="SlaveFacade1.wsdl" MetadataType="Wsdl" ID="986ab965-33b4-47e2-a951-d4833e1aa4fb" SourceId="1" SourceUrl="http://localhost:9000/HiveServer/?wsdl" />
    30     <MetadataFile FileName="item4.xsd" MetadataType="Schema" ID="b211d581-95d2-43a0-b821-bf02d4e52af3" SourceId="1" SourceUrl="http://10.42.1.154:9000/HiveServer/?xsd=xsd8" />
    31     <MetadataFile FileName="item.wsdl" MetadataType="Wsdl" ID="839f1b8c-ed69-4451-8893-3938771d8ab3" SourceId="1" SourceUrl="http://10.42.1.154:9000/HiveServer/?wsdl=wsdl0" />
    32     <MetadataFile FileName="item5.xsd" MetadataType="Schema" ID="8e561029-a13e-49f8-a98e-636d5c7427ae" SourceId="1" SourceUrl="http://10.42.1.154:9000/HiveServer/?xsd=xsd6" />
    33     <MetadataFile FileName="item6.xsd" MetadataType="Schema" ID="bd062912-a070-412e-9dcd-73432cf8426e" SourceId="1" SourceUrl="http://10.42.1.154:9000/HiveServer/?xsd=xsd4" />
    34     <MetadataFile FileName="item7.xsd" MetadataType="Schema" ID="1cdaf6ef-8bef-4ad2-8168-913b06c24fdc" SourceId="1" SourceUrl="http://10.42.1.154:9000/HiveServer/?xsd=xsd1" />
    35     <MetadataFile FileName="item8.xsd" MetadataType="Schema" ID="a2d96d65-9efa-49e1-84f0-cfaf8c16e189" SourceId="1" SourceUrl="http://10.42.1.154:9000/HiveServer/?xsd=xsd9" />
    36     <MetadataFile FileName="item9.xsd" MetadataType="Schema" ID="ffc1d57e-8446-4668-9781-7af5e6627e35" SourceId="1" SourceUrl="http://10.42.1.154:9000/HiveServer/?xsd=xsd7" />
     24    <MetadataFile FileName="SlaveService.xsd" MetadataType="Schema" ID="ad12de51-4d68-4ee4-a3ab-e339abdc896a" SourceId="1" SourceUrl="http://localhost:9000/SlaveService?xsd=xsd5" />
     25    <MetadataFile FileName="SlaveService.disco" MetadataType="Disco" ID="223d6dfd-54ff-4b80-a369-ed57172563fb" SourceId="1" SourceUrl="http://localhost:9000/SlaveService?disco" />
     26    <MetadataFile FileName="SlaveService1.xsd" MetadataType="Schema" ID="9c12d12e-7739-454c-a187-8ecf228fd2ad" SourceId="1" SourceUrl="http://localhost:9000/SlaveService?xsd=xsd7" />
     27    <MetadataFile FileName="SlaveService2.xsd" MetadataType="Schema" ID="3309432b-5384-4a87-9eeb-839ca851dd8c" SourceId="1" SourceUrl="http://localhost:9000/SlaveService?xsd=xsd1" />
     28    <MetadataFile FileName="SlaveFacade2.wsdl" MetadataType="Wsdl" ID="0b251d3c-de25-450a-b35b-b8f0cf00bb39" SourceId="1" SourceUrl="http://localhost:9000/SlaveService?wsdl" />
     29    <MetadataFile FileName="SlaveService3.xsd" MetadataType="Schema" ID="9aa5a266-9c8c-4c52-8936-5e1b13f7458a" SourceId="1" SourceUrl="http://localhost:9000/SlaveService?xsd=xsd9" />
     30    <MetadataFile FileName="SlaveService4.xsd" MetadataType="Schema" ID="6f3d7de8-5643-4e60-84e1-ae3722441b1b" SourceId="1" SourceUrl="http://localhost:9000/SlaveService?xsd=xsd4" />
     31    <MetadataFile FileName="SlaveService5.xsd" MetadataType="Schema" ID="515a90bf-5e53-4b84-ad21-f205b4edc5e6" SourceId="1" SourceUrl="http://localhost:9000/SlaveService?xsd=xsd8" />
     32    <MetadataFile FileName="SlaveService6.xsd" MetadataType="Schema" ID="92985ee1-b27d-46bb-a6ba-a2ae6d536c27" SourceId="1" SourceUrl="http://localhost:9000/SlaveService?xsd=xsd6" />
     33    <MetadataFile FileName="SlaveService7.xsd" MetadataType="Schema" ID="c0c98431-982a-4022-b14f-e18b354f5c90" SourceId="1" SourceUrl="http://localhost:9000/SlaveService?xsd=xsd0" />
     34    <MetadataFile FileName="SlaveService8.xsd" MetadataType="Schema" ID="7c74d961-3c14-47c6-83c2-2a3a3c643192" SourceId="1" SourceUrl="http://localhost:9000/SlaveService?xsd=xsd3" />
     35    <MetadataFile FileName="SlaveService.wsdl" MetadataType="Wsdl" ID="a0f9ea1a-65fa-434b-8353-f5798bef14b2" SourceId="1" SourceUrl="http://localhost:9000/SlaveService?wsdl=wsdl0" />
     36    <MetadataFile FileName="SlaveService9.xsd" MetadataType="Schema" ID="b7d739c8-3f28-41aa-99df-49345e2c4677" SourceId="1" SourceUrl="http://localhost:9000/SlaveService?xsd=xsd2" />
    3737  </Metadata>
    3838  <Extensions>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/Service References/ServerService/configuration.svcinfo

    r4289 r4302  
    33  <behaviors />
    44  <bindings>
    5     <binding digest="System.ServiceModel.Configuration.WSHttpBindingElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data hostNameComparisonMode=&quot;StrongWildcard&quot; messageEncoding=&quot;Text&quot; name=&quot;HiveServerHttpEndpoint&quot; textEncoding=&quot;utf-8&quot; transactionFlow=&quot;false&quot;&gt;&lt;readerQuotas maxArrayLength=&quot;16384&quot; maxBytesPerRead=&quot;4096&quot; maxDepth=&quot;32&quot; maxNameTableCharCount=&quot;16384&quot; maxStringContentLength=&quot;8192&quot; /&gt;&lt;reliableSession enabled=&quot;false&quot; inactivityTimeout=&quot;00:10:00&quot; ordered=&quot;true&quot; /&gt;&lt;security mode=&quot;Message&quot;&gt;&lt;message algorithmSuite=&quot;Default&quot; clientCredentialType=&quot;UserName&quot; negotiateServiceCredential=&quot;true&quot; /&gt;&lt;transport clientCredentialType=&quot;Windows&quot; proxyCredentialType=&quot;None&quot; realm=&quot;&quot; /&gt;&lt;/security&gt;&lt;/Data&gt;" bindingType="wsHttpBinding" name="HiveServerHttpEndpoint" />
    6     <binding digest="System.ServiceModel.Configuration.WSHttpBindingElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data hostNameComparisonMode=&quot;StrongWildcard&quot; messageEncoding=&quot;Text&quot; name=&quot;HiveServerMexEndpoint&quot; textEncoding=&quot;utf-8&quot; transactionFlow=&quot;false&quot;&gt;&lt;readerQuotas maxArrayLength=&quot;16384&quot; maxBytesPerRead=&quot;4096&quot; maxDepth=&quot;32&quot; maxNameTableCharCount=&quot;16384&quot; maxStringContentLength=&quot;8192&quot; /&gt;&lt;reliableSession enabled=&quot;false&quot; inactivityTimeout=&quot;00:10:00&quot; ordered=&quot;true&quot; /&gt;&lt;security mode=&quot;None&quot;&gt;&lt;message clientCredentialType=&quot;Windows&quot; negotiateServiceCredential=&quot;true&quot; /&gt;&lt;transport clientCredentialType=&quot;Windows&quot; proxyCredentialType=&quot;None&quot; realm=&quot;&quot; /&gt;&lt;/security&gt;&lt;/Data&gt;" bindingType="wsHttpBinding" name="HiveServerMexEndpoint" />
     5    <binding digest="System.ServiceModel.Configuration.WSHttpBindingElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data hostNameComparisonMode=&quot;StrongWildcard&quot; messageEncoding=&quot;Text&quot; name=&quot;SlaveHttpEndpoint&quot; textEncoding=&quot;utf-8&quot; transactionFlow=&quot;false&quot;&gt;&lt;readerQuotas maxArrayLength=&quot;16384&quot; maxBytesPerRead=&quot;4096&quot; maxDepth=&quot;32&quot; maxNameTableCharCount=&quot;16384&quot; maxStringContentLength=&quot;8192&quot; /&gt;&lt;reliableSession enabled=&quot;false&quot; inactivityTimeout=&quot;00:10:00&quot; ordered=&quot;true&quot; /&gt;&lt;security mode=&quot;Message&quot;&gt;&lt;message algorithmSuite=&quot;Default&quot; clientCredentialType=&quot;UserName&quot; negotiateServiceCredential=&quot;true&quot; /&gt;&lt;transport clientCredentialType=&quot;Windows&quot; proxyCredentialType=&quot;None&quot; realm=&quot;&quot; /&gt;&lt;/security&gt;&lt;/Data&gt;" bindingType="wsHttpBinding" name="SlaveHttpEndpoint" />
     6    <binding digest="System.ServiceModel.Configuration.WSHttpBindingElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data hostNameComparisonMode=&quot;StrongWildcard&quot; messageEncoding=&quot;Text&quot; name=&quot;SlaveMexEndpoint&quot; textEncoding=&quot;utf-8&quot; transactionFlow=&quot;false&quot;&gt;&lt;readerQuotas maxArrayLength=&quot;16384&quot; maxBytesPerRead=&quot;4096&quot; maxDepth=&quot;32&quot; maxNameTableCharCount=&quot;16384&quot; maxStringContentLength=&quot;8192&quot; /&gt;&lt;reliableSession enabled=&quot;false&quot; inactivityTimeout=&quot;00:10:00&quot; ordered=&quot;true&quot; /&gt;&lt;security mode=&quot;None&quot;&gt;&lt;message clientCredentialType=&quot;Windows&quot; negotiateServiceCredential=&quot;true&quot; /&gt;&lt;transport clientCredentialType=&quot;Windows&quot; proxyCredentialType=&quot;None&quot; realm=&quot;&quot; /&gt;&lt;/security&gt;&lt;/Data&gt;" bindingType="wsHttpBinding" name="SlaveMexEndpoint" />
    77  </bindings>
    88  <endpoints>
    9     <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://locahost:9000/HiveServer&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;HiveServerHttpEndpoint&quot; contract=&quot;ServerService.ISlaveFacade&quot; name=&quot;HiveServerHttpEndpoint&quot;&gt;&lt;identity&gt;&lt;certificate encodedValue=&quot;AwAAAAEAAAAUAAAA4QJkDsJnu5jp/5aQDiSkiQDPSVEgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhBFnjD18vBlk0IUiwe/MNVgMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgxOTE1MjY1OVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCygr8DcV8b8CZ/bvEuP2essVfS4oq1WmXY/jlzMyW//DKbskPVaW59DQptuQ3P+MwGj+hSKs6YoK7Ep1IM8azoMWcjwwVSxXdvqNzxxzUXnS8OdfdyZhU3U67kUBNRho6BgxkvFd7gSwauJG2Tb60URKTLP9wRRWJ1zZyPVW1ZJwIDAQABo0kwRzBFBgNVHQEEPjA8gBBuCekVsY8ufYENfOWWH+KqoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghBFnjD18vBlk0IUiwe/MNVgMAkGBSsOAwIdBQADgYEADtktV+UcOj22rUDZ9OASk5TKjp7iMQV3IEDqLA8bdfH+xQBNzcKWFwyCMiuMx5DJkTbp3m/QDoAzk/9bj2EDlfvArMtkZxzsUw+Owjz6GD8gjUVDUfXN68Ax3R5CSrpn4ybqTXTwav8pz11TYv37DKeGRiJUhx1G9xXL48ks5hI=&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://locahost:9000/HiveServer&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;HiveServerHttpEndpoint&quot; contract=&quot;ServerService.ISlaveFacade&quot; name=&quot;HiveServerHttpEndpoint&quot;&gt;&lt;identity&gt;&lt;certificate encodedValue=&quot;AwAAAAEAAAAUAAAA4QJkDsJnu5jp/5aQDiSkiQDPSVEgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhBFnjD18vBlk0IUiwe/MNVgMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgxOTE1MjY1OVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCygr8DcV8b8CZ/bvEuP2essVfS4oq1WmXY/jlzMyW//DKbskPVaW59DQptuQ3P+MwGj+hSKs6YoK7Ep1IM8azoMWcjwwVSxXdvqNzxxzUXnS8OdfdyZhU3U67kUBNRho6BgxkvFd7gSwauJG2Tb60URKTLP9wRRWJ1zZyPVW1ZJwIDAQABo0kwRzBFBgNVHQEEPjA8gBBuCekVsY8ufYENfOWWH+KqoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghBFnjD18vBlk0IUiwe/MNVgMAkGBSsOAwIdBQADgYEADtktV+UcOj22rUDZ9OASk5TKjp7iMQV3IEDqLA8bdfH+xQBNzcKWFwyCMiuMx5DJkTbp3m/QDoAzk/9bj2EDlfvArMtkZxzsUw+Owjz6GD8gjUVDUfXN68Ax3R5CSrpn4ybqTXTwav8pz11TYv37DKeGRiJUhx1G9xXL48ks5hI=&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" contractName="ServerService.ISlaveFacade" name="HiveServerHttpEndpoint" />
    10     <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://locahost:9000/HiveServer/mex&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;HiveServerMexEndpoint&quot; contract=&quot;ServerService.ISlaveFacade&quot; name=&quot;HiveServerMexEndpoint&quot; /&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://locahost:9000/HiveServer/mex&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;HiveServerMexEndpoint&quot; contract=&quot;ServerService.ISlaveFacade&quot; name=&quot;HiveServerMexEndpoint&quot; /&gt;" contractName="ServerService.ISlaveFacade" name="HiveServerMexEndpoint" />
    11     <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://locahost:9000/HiveServer&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;HiveServerHttpEndpoint&quot; contract=&quot;ServerService.ISlaveFacade&quot; name=&quot;HiveServerHttpEndpoint1&quot;&gt;&lt;identity&gt;&lt;certificate encodedValue=&quot;AwAAAAEAAAAUAAAA4QJkDsJnu5jp/5aQDiSkiQDPSVEgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhBFnjD18vBlk0IUiwe/MNVgMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgxOTE1MjY1OVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCygr8DcV8b8CZ/bvEuP2essVfS4oq1WmXY/jlzMyW//DKbskPVaW59DQptuQ3P+MwGj+hSKs6YoK7Ep1IM8azoMWcjwwVSxXdvqNzxxzUXnS8OdfdyZhU3U67kUBNRho6BgxkvFd7gSwauJG2Tb60URKTLP9wRRWJ1zZyPVW1ZJwIDAQABo0kwRzBFBgNVHQEEPjA8gBBuCekVsY8ufYENfOWWH+KqoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghBFnjD18vBlk0IUiwe/MNVgMAkGBSsOAwIdBQADgYEADtktV+UcOj22rUDZ9OASk5TKjp7iMQV3IEDqLA8bdfH+xQBNzcKWFwyCMiuMx5DJkTbp3m/QDoAzk/9bj2EDlfvArMtkZxzsUw+Owjz6GD8gjUVDUfXN68Ax3R5CSrpn4ybqTXTwav8pz11TYv37DKeGRiJUhx1G9xXL48ks5hI=&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://locahost:9000/HiveServer&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;HiveServerHttpEndpoint&quot; contract=&quot;ServerService.ISlaveFacade&quot; name=&quot;HiveServerHttpEndpoint1&quot;&gt;&lt;identity&gt;&lt;certificate encodedValue=&quot;AwAAAAEAAAAUAAAA4QJkDsJnu5jp/5aQDiSkiQDPSVEgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhBFnjD18vBlk0IUiwe/MNVgMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgxOTE1MjY1OVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCygr8DcV8b8CZ/bvEuP2essVfS4oq1WmXY/jlzMyW//DKbskPVaW59DQptuQ3P+MwGj+hSKs6YoK7Ep1IM8azoMWcjwwVSxXdvqNzxxzUXnS8OdfdyZhU3U67kUBNRho6BgxkvFd7gSwauJG2Tb60URKTLP9wRRWJ1zZyPVW1ZJwIDAQABo0kwRzBFBgNVHQEEPjA8gBBuCekVsY8ufYENfOWWH+KqoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghBFnjD18vBlk0IUiwe/MNVgMAkGBSsOAwIdBQADgYEADtktV+UcOj22rUDZ9OASk5TKjp7iMQV3IEDqLA8bdfH+xQBNzcKWFwyCMiuMx5DJkTbp3m/QDoAzk/9bj2EDlfvArMtkZxzsUw+Owjz6GD8gjUVDUfXN68Ax3R5CSrpn4ybqTXTwav8pz11TYv37DKeGRiJUhx1G9xXL48ks5hI=&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" contractName="ServerService.ISlaveFacade" name="HiveServerHttpEndpoint1" />
    12     <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://locahost:9000/HiveServer/mex&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;HiveServerMexEndpoint&quot; contract=&quot;ServerService.ISlaveFacade&quot; name=&quot;HiveServerMexEndpoint1&quot; /&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://locahost:9000/HiveServer/mex&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;HiveServerMexEndpoint&quot; contract=&quot;ServerService.ISlaveFacade&quot; name=&quot;HiveServerMexEndpoint1&quot; /&gt;" contractName="ServerService.ISlaveFacade" name="HiveServerMexEndpoint1" />
     9    <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://localhost:9000/SlaveService&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;SlaveHttpEndpoint&quot; contract=&quot;ServerService.ISlaveFacade&quot; name=&quot;SlaveHttpEndpoint&quot;&gt;&lt;identity&gt;&lt;certificate encodedValue=&quot;AwAAAAEAAAAUAAAAeBLH/0jWrlsW42fIC8VIIdAE6PUgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgyMzE1NTg0OFoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmOgweB6X4Ss6W2xb2hg1x61cjD2T7SO0ckkzmtqRhC2UWly9dBnonFJmg9RjN0y6l2tZhVzNhq8DgCkn3hPg5GL3XIwYX4PsXwNmeT6i+7s6rGbESuaEMvYOAQJSJ+MTgBvXCwo2g5nFHIBqP4W4aU2eybxP7H4cm1rQpoYHHjQIDAQABo0kwRzBFBgNVHQEEPjA8gBASDhO/IE7Ff7PpkCVF8oUpoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQADgYEAhxAzm3JTV7j51jti5P7izTEs7+8534kQloeAJDwlKolkd4ZMkf0BiexC2Vt1KsnxUjrK0HbbITzazkvkAmKi7dP+4G+3SrWag5lS4NcoPjTQy16T3zC9E6yafRaZp1/pxjC3Ap44qwq4Kjl2mEjeHHsdie/h4loowTqC9FlLbgo=&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://localhost:9000/SlaveService&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;SlaveHttpEndpoint&quot; contract=&quot;ServerService.ISlaveFacade&quot; name=&quot;SlaveHttpEndpoint&quot;&gt;&lt;identity&gt;&lt;certificate encodedValue=&quot;AwAAAAEAAAAUAAAAeBLH/0jWrlsW42fIC8VIIdAE6PUgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgyMzE1NTg0OFoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmOgweB6X4Ss6W2xb2hg1x61cjD2T7SO0ckkzmtqRhC2UWly9dBnonFJmg9RjN0y6l2tZhVzNhq8DgCkn3hPg5GL3XIwYX4PsXwNmeT6i+7s6rGbESuaEMvYOAQJSJ+MTgBvXCwo2g5nFHIBqP4W4aU2eybxP7H4cm1rQpoYHHjQIDAQABo0kwRzBFBgNVHQEEPjA8gBASDhO/IE7Ff7PpkCVF8oUpoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQADgYEAhxAzm3JTV7j51jti5P7izTEs7+8534kQloeAJDwlKolkd4ZMkf0BiexC2Vt1KsnxUjrK0HbbITzazkvkAmKi7dP+4G+3SrWag5lS4NcoPjTQy16T3zC9E6yafRaZp1/pxjC3Ap44qwq4Kjl2mEjeHHsdie/h4loowTqC9FlLbgo=&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" contractName="ServerService.ISlaveFacade" name="SlaveHttpEndpoint" />
     10    <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://localhost:9000/SlaveService/mex&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;SlaveMexEndpoint&quot; contract=&quot;ServerService.ISlaveFacade&quot; name=&quot;SlaveMexEndpoint&quot; /&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://localhost:9000/SlaveService/mex&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;SlaveMexEndpoint&quot; contract=&quot;ServerService.ISlaveFacade&quot; name=&quot;SlaveMexEndpoint&quot; /&gt;" contractName="ServerService.ISlaveFacade" name="SlaveMexEndpoint" />
    1311  </endpoints>
    1412</configurationSnapshot>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/Service References/ServerService/configuration91.svcinfo

    r4289 r4302  
    11<?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="o8ZS9awKXcz0ujwq5Vo1wgS5duk=">
     2<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="66V1tFjdUquXKbknQuFbi1xe5ec=">
    33  <bindingConfigurations>
    4     <bindingConfiguration bindingType="wsHttpBinding" name="HiveServerHttpEndpoint">
     4    <bindingConfiguration bindingType="wsHttpBinding" name="SlaveHttpEndpoint">
    55      <properties>
    66        <property path="/name" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    7           <serializedValue>HiveServerHttpEndpoint</serializedValue>
     7          <serializedValue>SlaveHttpEndpoint</serializedValue>
    88        </property>
    99        <property path="/closeTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     
    126126      </properties>
    127127    </bindingConfiguration>
    128     <bindingConfiguration bindingType="wsHttpBinding" name="HiveServerMexEndpoint">
     128    <bindingConfiguration bindingType="wsHttpBinding" name="SlaveMexEndpoint">
    129129      <properties>
    130130        <property path="/name" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    131           <serializedValue>HiveServerMexEndpoint</serializedValue>
     131          <serializedValue>SlaveMexEndpoint</serializedValue>
    132132        </property>
    133133        <property path="/closeTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     
    252252  </bindingConfigurations>
    253253  <endpoints>
    254     <endpoint name="HiveServerHttpEndpoint" contract="ServerService.ISlaveFacade" bindingType="wsHttpBinding" address="http://locahost:9000/HiveServer" bindingConfiguration="HiveServerHttpEndpoint">
     254    <endpoint name="SlaveHttpEndpoint" contract="ServerService.ISlaveFacade" bindingType="wsHttpBinding" address="http://localhost:9000/SlaveService" bindingConfiguration="SlaveHttpEndpoint">
    255255      <properties>
    256256        <property path="/address" isComplexType="false" isExplicitlyDefined="true" clrType="System.Uri, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    257           <serializedValue>http://locahost:9000/HiveServer</serializedValue>
     257          <serializedValue>http://localhost:9000/SlaveService</serializedValue>
    258258        </property>
    259259        <property path="/behaviorConfiguration" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     
    264264        </property>
    265265        <property path="/bindingConfiguration" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    266           <serializedValue>HiveServerHttpEndpoint</serializedValue>
     266          <serializedValue>SlaveHttpEndpoint</serializedValue>
    267267        </property>
    268268        <property path="/contract" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     
    306306        </property>
    307307        <property path="/identity/certificate/encodedValue" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    308           <serializedValue>AwAAAAEAAAAUAAAA4QJkDsJnu5jp/5aQDiSkiQDPSVEgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhBFnjD18vBlk0IUiwe/MNVgMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgxOTE1MjY1OVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCygr8DcV8b8CZ/bvEuP2essVfS4oq1WmXY/jlzMyW//DKbskPVaW59DQptuQ3P+MwGj+hSKs6YoK7Ep1IM8azoMWcjwwVSxXdvqNzxxzUXnS8OdfdyZhU3U67kUBNRho6BgxkvFd7gSwauJG2Tb60URKTLP9wRRWJ1zZyPVW1ZJwIDAQABo0kwRzBFBgNVHQEEPjA8gBBuCekVsY8ufYENfOWWH+KqoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghBFnjD18vBlk0IUiwe/MNVgMAkGBSsOAwIdBQADgYEADtktV+UcOj22rUDZ9OASk5TKjp7iMQV3IEDqLA8bdfH+xQBNzcKWFwyCMiuMx5DJkTbp3m/QDoAzk/9bj2EDlfvArMtkZxzsUw+Owjz6GD8gjUVDUfXN68Ax3R5CSrpn4ybqTXTwav8pz11TYv37DKeGRiJUhx1G9xXL48ks5hI=</serializedValue>
     308          <serializedValue>AwAAAAEAAAAUAAAAeBLH/0jWrlsW42fIC8VIIdAE6PUgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgyMzE1NTg0OFoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmOgweB6X4Ss6W2xb2hg1x61cjD2T7SO0ckkzmtqRhC2UWly9dBnonFJmg9RjN0y6l2tZhVzNhq8DgCkn3hPg5GL3XIwYX4PsXwNmeT6i+7s6rGbESuaEMvYOAQJSJ+MTgBvXCwo2g5nFHIBqP4W4aU2eybxP7H4cm1rQpoYHHjQIDAQABo0kwRzBFBgNVHQEEPjA8gBASDhO/IE7Ff7PpkCVF8oUpoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQADgYEAhxAzm3JTV7j51jti5P7izTEs7+8534kQloeAJDwlKolkd4ZMkf0BiexC2Vt1KsnxUjrK0HbbITzazkvkAmKi7dP+4G+3SrWag5lS4NcoPjTQy16T3zC9E6yafRaZp1/pxjC3Ap44qwq4Kjl2mEjeHHsdie/h4loowTqC9FlLbgo=</serializedValue>
    309309        </property>
    310310        <property path="/identity/certificateReference" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.CertificateReferenceElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     
    327327        </property>
    328328        <property path="/name" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    329           <serializedValue>HiveServerHttpEndpoint</serializedValue>
     329          <serializedValue>SlaveHttpEndpoint</serializedValue>
    330330        </property>
    331331        <property path="/kind" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     
    337337      </properties>
    338338    </endpoint>
    339     <endpoint name="HiveServerMexEndpoint" contract="ServerService.ISlaveFacade" bindingType="wsHttpBinding" address="http://locahost:9000/HiveServer/mex" bindingConfiguration="HiveServerMexEndpoint">
     339    <endpoint name="SlaveMexEndpoint" contract="ServerService.ISlaveFacade" bindingType="wsHttpBinding" address="http://localhost:9000/SlaveService/mex" bindingConfiguration="SlaveMexEndpoint">
    340340      <properties>
    341341        <property path="/address" isComplexType="false" isExplicitlyDefined="true" clrType="System.Uri, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    342           <serializedValue>http://locahost:9000/HiveServer/mex</serializedValue>
     342          <serializedValue>http://localhost:9000/SlaveService/mex</serializedValue>
    343343        </property>
    344344        <property path="/behaviorConfiguration" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     
    349349        </property>
    350350        <property path="/bindingConfiguration" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    351           <serializedValue>HiveServerMexEndpoint</serializedValue>
     351          <serializedValue>SlaveMexEndpoint</serializedValue>
    352352        </property>
    353353        <property path="/contract" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     
    412412        </property>
    413413        <property path="/name" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    414           <serializedValue>HiveServerMexEndpoint</serializedValue>
    415         </property>
    416         <property path="/kind" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    417           <serializedValue />
    418         </property>
    419         <property path="/endpointConfiguration" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    420           <serializedValue />
    421         </property>
    422       </properties>
    423     </endpoint>
    424     <endpoint name="HiveServerHttpEndpoint1" contract="ServerService.ISlaveFacade" bindingType="wsHttpBinding" address="http://locahost:9000/HiveServer" bindingConfiguration="HiveServerHttpEndpoint">
    425       <properties>
    426         <property path="/address" isComplexType="false" isExplicitlyDefined="true" clrType="System.Uri, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    427           <serializedValue>http://locahost:9000/HiveServer</serializedValue>
    428         </property>
    429         <property path="/behaviorConfiguration" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    430           <serializedValue />
    431         </property>
    432         <property path="/binding" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    433           <serializedValue>wsHttpBinding</serializedValue>
    434         </property>
    435         <property path="/bindingConfiguration" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    436           <serializedValue>HiveServerHttpEndpoint</serializedValue>
    437         </property>
    438         <property path="/contract" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    439           <serializedValue>ServerService.ISlaveFacade</serializedValue>
    440         </property>
    441         <property path="/headers" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.AddressHeaderCollectionElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    442           <serializedValue>System.ServiceModel.Configuration.AddressHeaderCollectionElement</serializedValue>
    443         </property>
    444         <property path="/headers/headers" isComplexType="false" isExplicitlyDefined="true" clrType="System.ServiceModel.Channels.AddressHeaderCollection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    445           <serializedValue>&lt;Header /&gt;</serializedValue>
    446         </property>
    447         <property path="/identity" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.IdentityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    448           <serializedValue>System.ServiceModel.Configuration.IdentityElement</serializedValue>
    449         </property>
    450         <property path="/identity/userPrincipalName" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.UserPrincipalNameElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    451           <serializedValue>System.ServiceModel.Configuration.UserPrincipalNameElement</serializedValue>
    452         </property>
    453         <property path="/identity/userPrincipalName/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    454           <serializedValue />
    455         </property>
    456         <property path="/identity/servicePrincipalName" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.ServicePrincipalNameElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    457           <serializedValue>System.ServiceModel.Configuration.ServicePrincipalNameElement</serializedValue>
    458         </property>
    459         <property path="/identity/servicePrincipalName/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    460           <serializedValue />
    461         </property>
    462         <property path="/identity/dns" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.DnsElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    463           <serializedValue>System.ServiceModel.Configuration.DnsElement</serializedValue>
    464         </property>
    465         <property path="/identity/dns/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    466           <serializedValue />
    467         </property>
    468         <property path="/identity/rsa" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.RsaElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    469           <serializedValue>System.ServiceModel.Configuration.RsaElement</serializedValue>
    470         </property>
    471         <property path="/identity/rsa/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    472           <serializedValue />
    473         </property>
    474         <property path="/identity/certificate" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.CertificateElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    475           <serializedValue>System.ServiceModel.Configuration.CertificateElement</serializedValue>
    476         </property>
    477         <property path="/identity/certificate/encodedValue" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    478           <serializedValue>AwAAAAEAAAAUAAAA4QJkDsJnu5jp/5aQDiSkiQDPSVEgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhBFnjD18vBlk0IUiwe/MNVgMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgxOTE1MjY1OVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCygr8DcV8b8CZ/bvEuP2essVfS4oq1WmXY/jlzMyW//DKbskPVaW59DQptuQ3P+MwGj+hSKs6YoK7Ep1IM8azoMWcjwwVSxXdvqNzxxzUXnS8OdfdyZhU3U67kUBNRho6BgxkvFd7gSwauJG2Tb60URKTLP9wRRWJ1zZyPVW1ZJwIDAQABo0kwRzBFBgNVHQEEPjA8gBBuCekVsY8ufYENfOWWH+KqoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghBFnjD18vBlk0IUiwe/MNVgMAkGBSsOAwIdBQADgYEADtktV+UcOj22rUDZ9OASk5TKjp7iMQV3IEDqLA8bdfH+xQBNzcKWFwyCMiuMx5DJkTbp3m/QDoAzk/9bj2EDlfvArMtkZxzsUw+Owjz6GD8gjUVDUfXN68Ax3R5CSrpn4ybqTXTwav8pz11TYv37DKeGRiJUhx1G9xXL48ks5hI=</serializedValue>
    479         </property>
    480         <property path="/identity/certificateReference" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.CertificateReferenceElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    481           <serializedValue>System.ServiceModel.Configuration.CertificateReferenceElement</serializedValue>
    482         </property>
    483         <property path="/identity/certificateReference/storeName" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Cryptography.X509Certificates.StoreName, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    484           <serializedValue>My</serializedValue>
    485         </property>
    486         <property path="/identity/certificateReference/storeLocation" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Cryptography.X509Certificates.StoreLocation, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    487           <serializedValue>LocalMachine</serializedValue>
    488         </property>
    489         <property path="/identity/certificateReference/x509FindType" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Cryptography.X509Certificates.X509FindType, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    490           <serializedValue>FindBySubjectDistinguishedName</serializedValue>
    491         </property>
    492         <property path="/identity/certificateReference/findValue" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    493           <serializedValue />
    494         </property>
    495         <property path="/identity/certificateReference/isChainIncluded" isComplexType="false" isExplicitlyDefined="false" clrType="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    496           <serializedValue>False</serializedValue>
    497         </property>
    498         <property path="/name" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    499           <serializedValue>HiveServerHttpEndpoint1</serializedValue>
    500         </property>
    501         <property path="/kind" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    502           <serializedValue />
    503         </property>
    504         <property path="/endpointConfiguration" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    505           <serializedValue />
    506         </property>
    507       </properties>
    508     </endpoint>
    509     <endpoint name="HiveServerMexEndpoint1" contract="ServerService.ISlaveFacade" bindingType="wsHttpBinding" address="http://locahost:9000/HiveServer/mex" bindingConfiguration="HiveServerMexEndpoint">
    510       <properties>
    511         <property path="/address" isComplexType="false" isExplicitlyDefined="true" clrType="System.Uri, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    512           <serializedValue>http://locahost:9000/HiveServer/mex</serializedValue>
    513         </property>
    514         <property path="/behaviorConfiguration" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    515           <serializedValue />
    516         </property>
    517         <property path="/binding" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    518           <serializedValue>wsHttpBinding</serializedValue>
    519         </property>
    520         <property path="/bindingConfiguration" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    521           <serializedValue>HiveServerMexEndpoint</serializedValue>
    522         </property>
    523         <property path="/contract" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    524           <serializedValue>ServerService.ISlaveFacade</serializedValue>
    525         </property>
    526         <property path="/headers" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.AddressHeaderCollectionElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    527           <serializedValue>System.ServiceModel.Configuration.AddressHeaderCollectionElement</serializedValue>
    528         </property>
    529         <property path="/headers/headers" isComplexType="false" isExplicitlyDefined="true" clrType="System.ServiceModel.Channels.AddressHeaderCollection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    530           <serializedValue>&lt;Header /&gt;</serializedValue>
    531         </property>
    532         <property path="/identity" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.IdentityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    533           <serializedValue>System.ServiceModel.Configuration.IdentityElement</serializedValue>
    534         </property>
    535         <property path="/identity/userPrincipalName" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.UserPrincipalNameElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    536           <serializedValue>System.ServiceModel.Configuration.UserPrincipalNameElement</serializedValue>
    537         </property>
    538         <property path="/identity/userPrincipalName/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    539           <serializedValue />
    540         </property>
    541         <property path="/identity/servicePrincipalName" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.ServicePrincipalNameElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    542           <serializedValue>System.ServiceModel.Configuration.ServicePrincipalNameElement</serializedValue>
    543         </property>
    544         <property path="/identity/servicePrincipalName/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    545           <serializedValue />
    546         </property>
    547         <property path="/identity/dns" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.DnsElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    548           <serializedValue>System.ServiceModel.Configuration.DnsElement</serializedValue>
    549         </property>
    550         <property path="/identity/dns/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    551           <serializedValue />
    552         </property>
    553         <property path="/identity/rsa" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.RsaElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    554           <serializedValue>System.ServiceModel.Configuration.RsaElement</serializedValue>
    555         </property>
    556         <property path="/identity/rsa/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    557           <serializedValue />
    558         </property>
    559         <property path="/identity/certificate" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.CertificateElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    560           <serializedValue>System.ServiceModel.Configuration.CertificateElement</serializedValue>
    561         </property>
    562         <property path="/identity/certificate/encodedValue" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    563           <serializedValue />
    564         </property>
    565         <property path="/identity/certificateReference" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.CertificateReferenceElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    566           <serializedValue>System.ServiceModel.Configuration.CertificateReferenceElement</serializedValue>
    567         </property>
    568         <property path="/identity/certificateReference/storeName" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Cryptography.X509Certificates.StoreName, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    569           <serializedValue>My</serializedValue>
    570         </property>
    571         <property path="/identity/certificateReference/storeLocation" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Cryptography.X509Certificates.StoreLocation, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    572           <serializedValue>LocalMachine</serializedValue>
    573         </property>
    574         <property path="/identity/certificateReference/x509FindType" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Cryptography.X509Certificates.X509FindType, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    575           <serializedValue>FindBySubjectDistinguishedName</serializedValue>
    576         </property>
    577         <property path="/identity/certificateReference/findValue" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    578           <serializedValue />
    579         </property>
    580         <property path="/identity/certificateReference/isChainIncluded" isComplexType="false" isExplicitlyDefined="false" clrType="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    581           <serializedValue>False</serializedValue>
    582         </property>
    583         <property path="/name" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    584           <serializedValue>HiveServerMexEndpoint1</serializedValue>
     414          <serializedValue>SlaveMexEndpoint</serializedValue>
    585415        </property>
    586416        <property path="/kind" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/WcfService.cs

    r4289 r4302  
    9090
    9191        Logger.Debug("Creating the new connection proxy");
    92         proxy = new SlaveFacadeClient(
    93           HeuristicLab.Hive.Contracts.WcfSettings.GetStreamedBinding(),
    94           new EndpointAddress("net.tcp://" + ServerIP + ":" + ServerPort + "/HiveServer/SlaveCommunicator")
    95         );
     92        proxy = CreateSlaveFacadeClient();
    9693        Logger.Debug("Created the new connection proxy");
    9794
     
    122119        HandleNetworkError(ex);
    123120      }
     121    }
     122
     123    private SlaveFacadeClient CreateSlaveFacadeClient() {
     124      //return new SlaveFacadeClient(
     125      //  HeuristicLab.Hive.Contracts.WcfSettings.GetStreamedBinding(),
     126      //  new EndpointAddress("net.tcp://" + ServerIP + ":" + ServerPort + "/HiveServer/SlaveCommunicator")
     127      //);
     128      SlaveFacadeClient client = new SlaveFacadeClient("SlaveHttpEndpoint");
     129      WcfSettings.SetEndpointAddress(client.Endpoint, string.Format("http://{0}:{1}/{2}", ServerIP, ServerPort, WcfSettings.SlaveServiceName));
     130      return client;
    124131    }
    125132
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/app.config

    r4289 r4302  
    44        <bindings>
    55            <wsHttpBinding>
    6                 <binding name="HiveServerHttpEndpoint" closeTimeout="00:01:00"
    7                     openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
    8                     bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard"
     6                <binding name="SlaveHttpEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00"
     7                    receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false"
     8                    transactionFlow="false" hostNameComparisonMode="StrongWildcard"
    99                    maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
    1010                    messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true"
     
    2121                    </security>
    2222                </binding>
    23                 <binding name="HiveServerMexEndpoint" closeTimeout="00:01:00"
    24                     openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
    25                     bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard"
     23                <binding name="SlaveMexEndpoint" closeTimeout="00:01:00" openTimeout="00:01:00"
     24                    receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false"
     25                    transactionFlow="false" hostNameComparisonMode="StrongWildcard"
    2626                    maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
    2727                    messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true"
     
    4040        </bindings>
    4141        <client>
    42             <endpoint address="http://locahost:9000/HiveServer" binding="wsHttpBinding"
    43                 bindingConfiguration="HiveServerHttpEndpoint" contract="ServerService.ISlaveFacade"
    44                 name="HiveServerHttpEndpoint">
     42            <endpoint address="http://localhost:9000/SlaveService" binding="wsHttpBinding"
     43                bindingConfiguration="SlaveHttpEndpoint" contract="ServerService.ISlaveFacade"
     44                name="SlaveHttpEndpoint">
    4545                <identity>
    46                     <certificate encodedValue="AwAAAAEAAAAUAAAA4QJkDsJnu5jp/5aQDiSkiQDPSVEgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhBFnjD18vBlk0IUiwe/MNVgMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgxOTE1MjY1OVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCygr8DcV8b8CZ/bvEuP2essVfS4oq1WmXY/jlzMyW//DKbskPVaW59DQptuQ3P+MwGj+hSKs6YoK7Ep1IM8azoMWcjwwVSxXdvqNzxxzUXnS8OdfdyZhU3U67kUBNRho6BgxkvFd7gSwauJG2Tb60URKTLP9wRRWJ1zZyPVW1ZJwIDAQABo0kwRzBFBgNVHQEEPjA8gBBuCekVsY8ufYENfOWWH+KqoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghBFnjD18vBlk0IUiwe/MNVgMAkGBSsOAwIdBQADgYEADtktV+UcOj22rUDZ9OASk5TKjp7iMQV3IEDqLA8bdfH+xQBNzcKWFwyCMiuMx5DJkTbp3m/QDoAzk/9bj2EDlfvArMtkZxzsUw+Owjz6GD8gjUVDUfXN68Ax3R5CSrpn4ybqTXTwav8pz11TYv37DKeGRiJUhx1G9xXL48ks5hI=" />
     46                    <certificate encodedValue="AwAAAAEAAAAUAAAAeBLH/0jWrlsW42fIC8VIIdAE6PUgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgyMzE1NTg0OFoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmOgweB6X4Ss6W2xb2hg1x61cjD2T7SO0ckkzmtqRhC2UWly9dBnonFJmg9RjN0y6l2tZhVzNhq8DgCkn3hPg5GL3XIwYX4PsXwNmeT6i+7s6rGbESuaEMvYOAQJSJ+MTgBvXCwo2g5nFHIBqP4W4aU2eybxP7H4cm1rQpoYHHjQIDAQABo0kwRzBFBgNVHQEEPjA8gBASDhO/IE7Ff7PpkCVF8oUpoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghDez3CoJIIitEZ5xwVqLJn6MAkGBSsOAwIdBQADgYEAhxAzm3JTV7j51jti5P7izTEs7+8534kQloeAJDwlKolkd4ZMkf0BiexC2Vt1KsnxUjrK0HbbITzazkvkAmKi7dP+4G+3SrWag5lS4NcoPjTQy16T3zC9E6yafRaZp1/pxjC3Ap44qwq4Kjl2mEjeHHsdie/h4loowTqC9FlLbgo=" />
    4747                </identity>
    4848            </endpoint>
    49             <endpoint address="http://locahost:9000/HiveServer/mex" binding="wsHttpBinding"
    50                 bindingConfiguration="HiveServerMexEndpoint" contract="ServerService.ISlaveFacade"
    51                 name="HiveServerMexEndpoint" />
    52             <endpoint address="http://locahost:9000/HiveServer" binding="wsHttpBinding"
    53                 bindingConfiguration="HiveServerHttpEndpoint" contract="ServerService.ISlaveFacade"
    54                 name="HiveServerHttpEndpoint1">
    55                 <identity>
    56                     <certificate encodedValue="AwAAAAEAAAAUAAAA4QJkDsJnu5jp/5aQDiSkiQDPSVEgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhBFnjD18vBlk0IUiwe/MNVgMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgxOTE1MjY1OVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCygr8DcV8b8CZ/bvEuP2essVfS4oq1WmXY/jlzMyW//DKbskPVaW59DQptuQ3P+MwGj+hSKs6YoK7Ep1IM8azoMWcjwwVSxXdvqNzxxzUXnS8OdfdyZhU3U67kUBNRho6BgxkvFd7gSwauJG2Tb60URKTLP9wRRWJ1zZyPVW1ZJwIDAQABo0kwRzBFBgNVHQEEPjA8gBBuCekVsY8ufYENfOWWH+KqoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghBFnjD18vBlk0IUiwe/MNVgMAkGBSsOAwIdBQADgYEADtktV+UcOj22rUDZ9OASk5TKjp7iMQV3IEDqLA8bdfH+xQBNzcKWFwyCMiuMx5DJkTbp3m/QDoAzk/9bj2EDlfvArMtkZxzsUw+Owjz6GD8gjUVDUfXN68Ax3R5CSrpn4ybqTXTwav8pz11TYv37DKeGRiJUhx1G9xXL48ks5hI=" />
    57                 </identity>
    58             </endpoint>
    59             <endpoint address="http://locahost:9000/HiveServer/mex" binding="wsHttpBinding"
    60                 bindingConfiguration="HiveServerMexEndpoint" contract="ServerService.ISlaveFacade"
    61                 name="HiveServerMexEndpoint1" />
     49            <endpoint address="http://localhost:9000/SlaveService/mex" binding="wsHttpBinding"
     50                bindingConfiguration="SlaveMexEndpoint" contract="ServerService.ISlaveFacade"
     51                name="SlaveMexEndpoint" />
    6252        </client>
    6353    </system.serviceModel>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/HeuristicLab.Hive-3.3.csproj

    r4296 r4302  
    6767  <ItemGroup />
    6868  <ItemGroup>
    69     <None Include="app.config" />
     69    <None Include="HeuristicLab.Hive-3.3.dll.config">
     70      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     71    </None>
    7072    <None Include="CopyAssemblies.cmd" />
    7173    <None Include="CustomPostBuild.cmd" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/MergeConfigs.cmd

    r4285 r4302  
    33ConfigMerger "%SolutionDir%HeuristicLab.Hive.Experiment\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
    44ConfigMerger "%SolutionDir%HeuristicLab.Hive.Server.Core\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
     5ConfigMerger "%SolutionDir%HeuristicLab.Hive.Server.Console\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
    56ConfigMerger "%SolutionDir%HeuristicLab.Hive.Server.LINQDataAccess\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
    67ConfigMerger "%SolutionDir%HeuristicLab.Hive.Slave.Core\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
Note: See TracChangeset for help on using the changeset viewer.