Free cookie consent management tool by TermsFeed Policy Generator

Changeset 4548


Ignore:
Timestamp:
10/04/10 01:43:23 (14 years ago)
Author:
swagner
Message:

Worked on OKB (#1174)

Location:
branches/OKB
Files:
4 added
1 deleted
14 edited
3 moved

Legend:

Unmodified
Added
Removed

  • branches/OKB/HeuristicLab.Clients.OKB-3.3/AdministratorMenuItem.cs

    r4492 r4548  
    3737
    3838    public override void Execute() {
    39       MainFormManager.MainForm.ShowContent(Administrator.Instance);
     39      MainFormManager.MainForm.ShowContent(OKB.Instance);
    4040    }
    4141  }

  • branches/OKB/HeuristicLab.Clients.OKB-3.3/HeuristicLab.Clients.OKB-3.3.csproj

    r4492 r4548  
    4747    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    4848    <Reference Include="HeuristicLab.Core.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     49    <Reference Include="HeuristicLab.Data-3.3">
     50      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
     51    </Reference>
    4952    <Reference Include="HeuristicLab.MainForm-3.3">
    5053      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm-3.3.dll</HintPath>
    … …  
    7376  </ItemGroup>
    7477  <ItemGroup>
    75     <Compile Include="Administrator.cs">
    76       <SubType>Code</SubType>
    77     </Compile>
    7878    <Compile Include="AdministratorMenuItem.cs" />
     79    <Compile Include="OKB.cs" />
     80    <Compile Include="OKBExperiment.cs" />
    7981    <Compile Include="HeuristicLabClientsOKBPlugin.cs" />
    8082    <Compile Include="Properties\AssemblyInfo.cs" />
    81     <Compile Include="ServiceClients\AdminServiceClient.cs" />
    8283    <Compile Include="ServiceClients\Algorithm.cs">
    8384      <SubType>Code</SubType>
    … …  
    8889    <Compile Include="ServiceClients\AuthenticationServiceClient.cs" />
    8990    <Compile Include="ServiceClients\AlgorithmData.cs" />
     91    <Compile Include="ServiceClients\OKBServiceClient.cs" />
    9092    <Compile Include="ServiceClients\ProblemData.cs" />
    9193    <Compile Include="ServiceClients\Problem.cs" />
    … …  
    132134    <Compile Include="Views\AlgorithmDataView.Designer.cs">
    133135      <DependentUpon>AlgorithmDataView.cs</DependentUpon>
     136    </Compile>
     137    <Compile Include="Views\OKBExperimentView.cs">
     138      <SubType>UserControl</SubType>
     139    </Compile>
     140    <Compile Include="Views\OKBExperimentView.Designer.cs">
     141      <DependentUpon>OKBExperimentView.cs</DependentUpon>
    134142    </Compile>
    135143    <Compile Include="Views\ProblemDataView.cs">

  • branches/OKB/HeuristicLab.Clients.OKB-3.3/HeuristicLabClientsOKBPlugin.cs.frame

    r4481 r4548  
    3434  [PluginDependency("HeuristicLab.Core", "3.3")]
    3535  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
     36  [PluginDependency("HeuristicLab.Data", "3.3")]
    3637  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    3738  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]

  • branches/OKB/HeuristicLab.Clients.OKB-3.3/OKB.cs

    r4547 r4548  
    3030
    3131namespace HeuristicLab.Clients.OKB {
    32   [Item("Administrator", "OKB administrator front-end.")]
    33   public sealed class Administrator : IContent {
    34     private static Administrator instance;
    35     public static Administrator Instance {
     32  [Item("OKB", "OKB front-end.")]
     33  public sealed class OKB : IContent {
     34    private static OKB instance;
     35    public static OKB Instance {
    3636      get {
    37         if (instance == null) instance = new Administrator();
     37        if (instance == null) instance = new OKB();
    3838        return instance;
    3939      }
    … …  
    7171    #endregion
    7272
    73     private Administrator() { }
     73    private OKB() { }
    7474
    7575    #region Refresh
    … …  
    320320
    321321    #region Helpers
    322     private void CallAdminService(Action<IAdminService> call) {
    323       AdminServiceClient client = ClientFactory.CreateClient<AdminServiceClient, IAdminService>();
     322    private void CallAdminService(Action<IOKBService> call) {
     323      OKBServiceClient client = ClientFactory.CreateClient<OKBServiceClient, IOKBService>();
    324324      try {
    325325        call(client);
    … …  
    334334      }
    335335    }
    336     private T CallAdminService<T>(Func<IAdminService, T> call) {
    337       AdminServiceClient client = ClientFactory.CreateClient<AdminServiceClient, IAdminService>();
     336    private T CallAdminService<T>(Func<IOKBService, T> call) {
     337      OKBServiceClient client = ClientFactory.CreateClient<OKBServiceClient, IOKBService>();
    338338      try {
    339339        return call(client);

  • branches/OKB/HeuristicLab.Clients.OKB-3.3/ServiceClients/GenerateServiceClients.cmd

    r4466 r4548  
    33echo.
    44echo *******************************************************************************************
    5 echo Generating AdminService client
     5echo Generating OKBService client
    66echo.
    77
    88svcutil.exe ^
    9   http://localhost:8732/Design_Time_Addresses/OKB-3.3/AdminService/mex ^
    10   /out:AdminServiceClient ^
     9  http://localhost:8732/Design_Time_Addresses/OKB-3.3/OKBService/mex ^
     10  /out:OKBServiceClient ^
    1111  /namespace:*,HeuristicLab.Clients.OKB ^
    1212  /targetClientVersion:Version35 ^
    … …  
    2424echo ---------------------------------------------------------------------------------------
    2525echo.
    26 echo Generation of AdminService client finished.
     26echo Generation of OKBService client finished.
    2727echo *******************************************************************************************
    2828echo.

  • branches/OKB/HeuristicLab.Clients.OKB-3.3/ServiceClients/OKBItem.cs

    r4492 r4548  
    8686
    8787    public void Store() {
    88       if (Administrator.Instance.Store(this))
     88      if (OKB.Instance.Store(this))
    8989        Modified = false;
    9090    }

  • branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AdministratorView.cs

    r4481 r4548  
    2727namespace HeuristicLab.Clients.OKB {
    2828  [View("OKB Administrator")]
    29   [Content(typeof(Administrator), true)]
     29  [Content(typeof(OKB), true)]
    3030  public sealed partial class AdministratorView : AsynchronousContentView {
    31     public new Administrator Content {
    32       get { return (Administrator)base.Content; }
     31    public new OKB Content {
     32      get { return (OKB)base.Content; }
    3333      set { base.Content = value; }
    3434    }

  • branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AlgorithmDataView.cs

    r4492 r4548  
    6060    protected override void OnInitialized(System.EventArgs e) {
    6161      base.OnInitialized(e);
    62       dataTypeComboBox.DataSource = Administrator.Instance.DataTypes.ToList();
     62      dataTypeComboBox.DataSource = OKB.Instance.DataTypes.ToList();
    6363      dataTypeComboBox.SelectedIndex = -1;
    6464    }
    … …  
    8080        noViewAvailableLabel.Visible = false;
    8181      } else {
    82         dataTypeComboBox.SelectedItem = Administrator.Instance.DataTypes.FirstOrDefault(d => d.Id == Content.DataTypeId);
     82        dataTypeComboBox.SelectedItem = OKB.Instance.DataTypes.FirstOrDefault(d => d.Id == Content.DataTypeId);
    8383
    8484        using (MemoryStream stream = new MemoryStream(Content.Data)) {
    … …  
    111111      switch (e.PropertyName) {
    112112        case "DataTypeId":
    113           dataTypeComboBox.SelectedItem = Administrator.Instance.DataTypes.FirstOrDefault(d => d.Id == Content.DataTypeId);
     113          dataTypeComboBox.SelectedItem = OKB.Instance.DataTypes.FirstOrDefault(d => d.Id == Content.DataTypeId);
    114114          break;
    115115      }
    … …  
    119119      BeginAsyncCall();
    120120      var call = new Action(delegate() {
    121         AlgorithmData data = Administrator.Instance.GetAlgorithmData(AlgorithmId);
     121        AlgorithmData data = OKB.Instance.GetAlgorithmData(AlgorithmId);
    122122        Content = data;
    123123      });
    … …  
    142142        }
    143143      }
    144       Administrator.Instance.UpdateAlgorithmData(Content);
     144      OKB.Instance.UpdateAlgorithmData(Content);
    145145    }
    146146    private void newDataButton_Click(object sender, EventArgs e) {
    … …  
    153153            if (Content == null) Content = new AlgorithmData { AlgorithmId = AlgorithmId };
    154154            viewHost.Content = (IContent)dialog.TypeSelector.CreateInstanceOfSelectedType();
    155             DataType dataType = Administrator.Instance.DataTypes.FirstOrDefault(d => d.Name == viewHost.Content.GetType().AssemblyQualifiedName);
     155            DataType dataType = OKB.Instance.DataTypes.FirstOrDefault(d => d.Name == viewHost.Content.GetType().AssemblyQualifiedName);
    156156            if (dataType == null) {
    157157              dataType = new DataType { Name = viewHost.Content.GetType().AssemblyQualifiedName, SqlName = "varbinary" };
    158               dataType.PlatformId = Administrator.Instance.Platforms.FirstOrDefault(p => p.Name == "HeuristicLab 3.3").Id;
     158              dataType.PlatformId = OKB.Instance.Platforms.FirstOrDefault(p => p.Name == "HeuristicLab 3.3").Id;
    159159              dataType.Store();
    160               Administrator.Instance.DataTypes.Add(dataType);
    161               dataTypeComboBox.DataSource = Administrator.Instance.DataTypes.OrderBy(d => d.Name).ToList();
     160              OKB.Instance.DataTypes.Add(dataType);
     161              dataTypeComboBox.DataSource = OKB.Instance.DataTypes.OrderBy(d => d.Name).ToList();
    162162            }
    163163            dataTypeComboBox.SelectedItem = dataType;
    … …  
    185185            viewHost.Content = algorithm;
    186186            noViewAvailableLabel.Visible = false;
    187             DataType dataType = Administrator.Instance.DataTypes.FirstOrDefault(d => d.Name == viewHost.Content.GetType().AssemblyQualifiedName);
     187            DataType dataType = OKB.Instance.DataTypes.FirstOrDefault(d => d.Name == viewHost.Content.GetType().AssemblyQualifiedName);
    188188            if (dataType == null) {
    189189              dataType = new DataType { Name = viewHost.Content.GetType().AssemblyQualifiedName, SqlName = "varbinary" };
    190               dataType.PlatformId = Administrator.Instance.Platforms.FirstOrDefault(p => p.Name == "HeuristicLab 3.3").Id;
     190              dataType.PlatformId = OKB.Instance.Platforms.FirstOrDefault(p => p.Name == "HeuristicLab 3.3").Id;
    191191              dataType.Store();
    192               Administrator.Instance.DataTypes.Add(dataType);
    193               dataTypeComboBox.DataSource = Administrator.Instance.DataTypes.OrderBy(d => d.Name).ToList();
     192              OKB.Instance.DataTypes.Add(dataType);
     193              dataTypeComboBox.DataSource = OKB.Instance.DataTypes.OrderBy(d => d.Name).ToList();
    194194            }
    195195            dataTypeComboBox.SelectedItem = dataType;

  • branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AlgorithmView.cs

    r4492 r4548  
    4242    protected override void OnInitialized(System.EventArgs e) {
    4343      base.OnInitialized(e);
    44       platformComboBox.DataSource = Administrator.Instance.Platforms.ToList();
    45       algorithmClassComboBox.DataSource = Administrator.Instance.AlgorithmClasses.ToList();
     44      platformComboBox.DataSource = OKB.Instance.Platforms.ToList();
     45      algorithmClassComboBox.DataSource = OKB.Instance.AlgorithmClasses.ToList();
    4646    }
    4747
    … …  
    5353        algorithmDataView.AlgorithmId = 0;
    5454      } else {
    55         platformComboBox.SelectedItem = Administrator.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
    56         algorithmClassComboBox.SelectedItem = Administrator.Instance.AlgorithmClasses.FirstOrDefault(a => a.Id == Content.AlgorithmClassId);
     55        platformComboBox.SelectedItem = OKB.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
     56        algorithmClassComboBox.SelectedItem = OKB.Instance.AlgorithmClasses.FirstOrDefault(a => a.Id == Content.AlgorithmClassId);
    5757        algorithmDataView.AlgorithmId = Content.Id;
    5858      }
    … …  
    7777          break;
    7878        case "PlatformId":
    79           platformComboBox.SelectedItem = Administrator.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
     79          platformComboBox.SelectedItem = OKB.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
    8080          break;
    8181        case "AlgorithmClassId":
    82           algorithmClassComboBox.SelectedItem = Administrator.Instance.AlgorithmClasses.FirstOrDefault(a => a.Id == Content.AlgorithmClassId);
     82          algorithmClassComboBox.SelectedItem = OKB.Instance.AlgorithmClasses.FirstOrDefault(a => a.Id == Content.AlgorithmClassId);
    8383          break;
    8484      }
    … …  
    9999
    100100    private void refreshUsersButton_Click(object sender, System.EventArgs e) {
    101       Guid[] ids = Administrator.Instance.GetAlgorithmUsers(Content.Id);
     101      Guid[] ids = OKB.Instance.GetAlgorithmUsers(Content.Id);
    102102      if (ids != null) {
    103         List<User> users = Administrator.Instance.Users.ToList();
     103        List<User> users = OKB.Instance.Users.ToList();
    104104        usersListBox.DataSource = users;
    105105        usersListBox.DisplayMember = "Name";
    … …  
    112112    }
    113113    private void storeUsersButton_Click(object sender, System.EventArgs e) {
    114       if (Administrator.Instance.UpdateAlgorithmUsers(Content.Id, usersListBox.SelectedItems.Cast<User>().Select(u => u.Id).ToArray()))
     114      if (OKB.Instance.UpdateAlgorithmUsers(Content.Id, usersListBox.SelectedItems.Cast<User>().Select(u => u.Id).ToArray()))
    115115        storeUsersButton.Enabled = false;
    116116    }

  • branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/DataTypeView.cs

    r4492 r4548  
    4141    protected override void OnInitialized(System.EventArgs e) {
    4242      base.OnInitialized(e);
    43       platformComboBox.DataSource = Administrator.Instance.Platforms.ToList();
     43      platformComboBox.DataSource = OKB.Instance.Platforms.ToList();
    4444    }
    4545
    … …  
    5757        nameTextBox.Text = Content.Name;
    5858        sqlNameComboBox.Text = Content.SqlName;
    59         platformComboBox.SelectedItem = Administrator.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
     59        platformComboBox.SelectedItem = OKB.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
    6060        Caption = Content.Name;
    6161      }
    … …  
    8080          break;
    8181        case "PlatformId":
    82           platformComboBox.SelectedItem = Administrator.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
     82          platformComboBox.SelectedItem = OKB.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
    8383          break;
    8484      }

  • branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/ProblemDataView.cs

    r4492 r4548  
    6060    protected override void OnInitialized(System.EventArgs e) {
    6161      base.OnInitialized(e);
    62       dataTypeComboBox.DataSource = Administrator.Instance.DataTypes.ToList();
     62      dataTypeComboBox.DataSource = OKB.Instance.DataTypes.ToList();
    6363      dataTypeComboBox.SelectedIndex = -1;
    6464    }
    … …  
    8080        noViewAvailableLabel.Visible = false;
    8181      } else {
    82         dataTypeComboBox.SelectedItem = Administrator.Instance.DataTypes.FirstOrDefault(d => d.Id == Content.DataTypeId);
     82        dataTypeComboBox.SelectedItem = OKB.Instance.DataTypes.FirstOrDefault(d => d.Id == Content.DataTypeId);
    8383
    8484        using (MemoryStream stream = new MemoryStream(Content.Data)) {
    … …  
    111111      switch (e.PropertyName) {
    112112        case "DataTypeId":
    113           dataTypeComboBox.SelectedItem = Administrator.Instance.DataTypes.FirstOrDefault(d => d.Id == Content.DataTypeId);
     113          dataTypeComboBox.SelectedItem = OKB.Instance.DataTypes.FirstOrDefault(d => d.Id == Content.DataTypeId);
    114114          break;
    115115      }
    … …  
    119119      BeginAsyncCall();
    120120      var call = new Action(delegate() {
    121         ProblemData data = Administrator.Instance.GetProblemData(ProblemId);
     121        ProblemData data = OKB.Instance.GetProblemData(ProblemId);
    122122        Content = data;
    123123      });
    … …  
    141141        }
    142142      }
    143       Administrator.Instance.UpdateProblemData(Content);
     143      OKB.Instance.UpdateProblemData(Content);
    144144    }
    145145    private void newDataButton_Click(object sender, EventArgs e) {
    … …  
    152152            if (Content == null) Content = new ProblemData { ProblemId = ProblemId };
    153153            viewHost.Content = (IContent)dialog.TypeSelector.CreateInstanceOfSelectedType();
    154             DataType dataType = Administrator.Instance.DataTypes.FirstOrDefault(d => d.Name == viewHost.Content.GetType().AssemblyQualifiedName);
     154            DataType dataType = OKB.Instance.DataTypes.FirstOrDefault(d => d.Name == viewHost.Content.GetType().AssemblyQualifiedName);
    155155            if (dataType == null) {
    156156              dataType = new DataType { Name = viewHost.Content.GetType().AssemblyQualifiedName, SqlName = "varbinary" };
    157               dataType.PlatformId = Administrator.Instance.Platforms.FirstOrDefault(p => p.Name == "HeuristicLab 3.3").Id;
     157              dataType.PlatformId = OKB.Instance.Platforms.FirstOrDefault(p => p.Name == "HeuristicLab 3.3").Id;
    158158              dataType.Store();
    159               Administrator.Instance.DataTypes.Add(dataType);
    160               dataTypeComboBox.DataSource = Administrator.Instance.DataTypes.OrderBy(d => d.Name).ToList();
     159              OKB.Instance.DataTypes.Add(dataType);
     160              dataTypeComboBox.DataSource = OKB.Instance.DataTypes.OrderBy(d => d.Name).ToList();
    161161            }
    162162            dataTypeComboBox.SelectedItem = dataType;
    … …  
    184184            viewHost.Content = problem;
    185185            noViewAvailableLabel.Visible = false;
    186             DataType dataType = Administrator.Instance.DataTypes.FirstOrDefault(d => d.Name == viewHost.Content.GetType().AssemblyQualifiedName);
     186            DataType dataType = OKB.Instance.DataTypes.FirstOrDefault(d => d.Name == viewHost.Content.GetType().AssemblyQualifiedName);
    187187            if (dataType == null) {
    188188              dataType = new DataType { Name = viewHost.Content.GetType().AssemblyQualifiedName, SqlName = "varbinary" };
    189               dataType.PlatformId = Administrator.Instance.Platforms.FirstOrDefault(p => p.Name == "HeuristicLab 3.3").Id;
     189              dataType.PlatformId = OKB.Instance.Platforms.FirstOrDefault(p => p.Name == "HeuristicLab 3.3").Id;
    190190              dataType.Store();
    191               Administrator.Instance.DataTypes.Add(dataType);
    192               dataTypeComboBox.DataSource = Administrator.Instance.DataTypes.OrderBy(d => d.Name).ToList();
     191              OKB.Instance.DataTypes.Add(dataType);
     192              dataTypeComboBox.DataSource = OKB.Instance.DataTypes.OrderBy(d => d.Name).ToList();
    193193            }
    194194            dataTypeComboBox.SelectedItem = dataType;

  • branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/ProblemView.cs

    r4492 r4548  
    4242    protected override void OnInitialized(System.EventArgs e) {
    4343      base.OnInitialized(e);
    44       platformComboBox.DataSource = Administrator.Instance.Platforms.ToList();
    45       problemClassComboBox.DataSource = Administrator.Instance.ProblemClasses.ToList();
     44      platformComboBox.DataSource = OKB.Instance.Platforms.ToList();
     45      problemClassComboBox.DataSource = OKB.Instance.ProblemClasses.ToList();
    4646    }
    4747
    … …  
    5353        problemDataView.ProblemId = 0;
    5454      } else {
    55         platformComboBox.SelectedItem = Administrator.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
    56         problemClassComboBox.SelectedItem = Administrator.Instance.ProblemClasses.FirstOrDefault(a => a.Id == Content.ProblemClassId);
     55        platformComboBox.SelectedItem = OKB.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
     56        problemClassComboBox.SelectedItem = OKB.Instance.ProblemClasses.FirstOrDefault(a => a.Id == Content.ProblemClassId);
    5757        problemDataView.ProblemId = Content.Id;
    5858      }
    … …  
    7777          break;
    7878        case "PlatformId":
    79           platformComboBox.SelectedItem = Administrator.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
     79          platformComboBox.SelectedItem = OKB.Instance.Platforms.FirstOrDefault(p => p.Id == Content.PlatformId);
    8080          break;
    8181        case "ProblemClassId":
    82           problemClassComboBox.SelectedItem = Administrator.Instance.ProblemClasses.FirstOrDefault(a => a.Id == Content.ProblemClassId);
     82          problemClassComboBox.SelectedItem = OKB.Instance.ProblemClasses.FirstOrDefault(a => a.Id == Content.ProblemClassId);
    8383          break;
    8484      }
    … …  
    9999
    100100    private void refreshUsersButton_Click(object sender, System.EventArgs e) {
    101       Guid[] ids = Administrator.Instance.GetProblemUsers(Content.Id);
     101      Guid[] ids = OKB.Instance.GetProblemUsers(Content.Id);
    102102      if (ids != null) {
    103         List<User> users = Administrator.Instance.Users.ToList();
     103        List<User> users = OKB.Instance.Users.ToList();
    104104        usersListBox.DataSource = users;
    105105        usersListBox.DisplayMember = "Name";
    … …  
    112112    }
    113113    private void storeUsersButton_Click(object sender, System.EventArgs e) {
    114       if (Administrator.Instance.UpdateProblemUsers(Content.Id, usersListBox.SelectedItems.Cast<User>().Select(u => u.Id).ToArray()))
     114      if (OKB.Instance.UpdateProblemUsers(Content.Id, usersListBox.SelectedItems.Cast<User>().Select(u => u.Id).ToArray()))
    115115        storeUsersButton.Enabled = false;
    116116    }

  • branches/OKB/HeuristicLab.Clients.OKB-3.3/app.config

    r4481 r4548  
    44        <bindings>
    55            <wsHttpBinding>
    6                 <binding name="WSHttpBinding_IAdminService" closeTimeout="00:01:00"
     6                <binding name="WSHttpBinding_IOKBService" closeTimeout="00:01:00"
    77                    openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
    88                    bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard"
    9                     maxBufferPoolSize="524288" maxReceivedMessageSize="200000000"
     9                    maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
    1010                    messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true"
    1111                    allowCookies="false">
    12                     <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="200000000"
    13                         maxBytesPerRead="200000000" maxNameTableCharCount="16384" />
     12                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
     13                        maxBytesPerRead="4096" maxNameTableCharCount="16384" />
    1414                    <reliableSession ordered="true" inactivityTimeout="00:10:00"
    1515                        enabled="false" />
    … …  
    4141        </bindings>
    4242        <client>
    43             <endpoint address="http://localhost:8732/Design_Time_Addresses/OKB-3.3/AdminService"
    44                 binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IAdminService"
    45                 contract="HeuristicLab.Clients.OKB.IAdminService" name="WSHttpBinding_IAdminService">
     43            <endpoint address="http://localhost:8732/Design_Time_Addresses/OKB-3.3/OKBService"
     44                binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IOKBService"
     45                contract="HeuristicLab.Clients.OKB.IOKBService" name="WSHttpBinding_IOKBService">
    4646                <identity>
    4747                    <certificate encodedValue="AwAAAAEAAAAUAAAAD/AlkYJw/OUhl6D/9w8mjJBh39kgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhAdEzTisaf2sEZxrqYZfYtCMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgyMDIyMzIwOFoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPkfCSLRX8/4F+Z4ys43yZ4MMzjB44cMakPz4Nri+mEB5n2z/0GFatCYzkI2f/nniWqVrBYjHkjsZy2EZioHu4wa99c1XEGJnFNDuNn6ESkfEyhyF4+OqKGnpK9HNrw7OWMuqn2oOh0iFd9fl6FTAm+Y0p3LP+38BuYzpCniqqdwIDAQABo0kwRzBFBgNVHQEEPjA8gBDvi8Rgio9v+mr58TiAvqF5oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghAdEzTisaf2sEZxrqYZfYtCMAkGBSsOAwIdBQADgYEANdGlvHKeUptfNu9I0wgA5qjmVB+JDldOAkrfM0R+4IcVQ06y5K7P07uxQAV7+rhnDLgLyFJunUHgzbfjsjFy7vjwtoieXA5j0AYlm4AHR7dHt4HVgkIMYt8XOCqMw5jjFX91xJ89tC7mM9zYR48N9T5QSeMGo+f+JzybeLWxnNs=" />

  • branches/OKB/HeuristicLab.Services.OKB/3.3/HeuristicLab.Services.OKB-3.3.csproj

    r4492 r4548  
    120120  </ItemGroup>
    121121  <ItemGroup>
    122     <Compile Include="AdminService.cs" />
    123122    <Compile Include="Convert.cs" />
    124123    <Compile Include="AuthenticationService.cs" />
    125124    <Compile Include="Interfaces\IAuthenticationService.cs" />
    126     <Compile Include="Interfaces\IAdminService.cs" />
     125    <Compile Include="Interfaces\IOKBService.cs" />
     126    <Compile Include="OKBService.cs" />
    127127    <Compile Include="Properties\AssemblyInfo.cs" />
    128128  </ItemGroup>

  • branches/OKB/HeuristicLab.Services.OKB/3.3/Interfaces/IOKBService.cs

    r4547 r4548  
    2828namespace HeuristicLab.Services.OKB {
    2929  /// <summary>
    30   /// Interface of the OKB administration service.
     30  /// Interface of the OKB service.
    3131  /// </summary>
    3232  [ServiceContract(ProtectionLevel = ProtectionLevel.EncryptAndSign)]
    33   public interface IAdminService {
     33  public interface IOKBService {
    3434    #region Platform Methods
    3535    [OperationContract]

  • branches/OKB/HeuristicLab.Services.OKB/3.3/OKBService.cs

    r4547 r4548  
    2828namespace HeuristicLab.Services.OKB {
    2929  /// <summary>
    30   /// Implementation of the OKB administration service (interface <see cref="IAdminService"/>).
     30  /// Implementation of the OKB service (interface <see cref="IOKBService"/>).
    3131  /// </summary>
    3232  [ServiceBehavior(IncludeExceptionDetailInFaults = true)]
    33   public class AdminService : IAdminService {
     33  public class OKBService : IOKBService {
    3434    #region Platform Methods
    3535    public DataTransfer.Platform GetPlatform(long id) {

  • branches/OKB/HeuristicLab.Services.OKB/3.3/app.config

    r4492 r4548  
    6767
    6868    <services>
    69       <service name="HeuristicLab.Services.OKB.AdminService" behaviorConfiguration="DefaultServiceBehavior">
     69      <service name="HeuristicLab.Services.OKB.OKBService" behaviorConfiguration="DefaultServiceBehavior">
    7070        <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="DefaultMexHttpBinding" contract="IMetadataExchange" />
    71         <endpoint binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding" contract="HeuristicLab.Services.OKB.IAdminService" />
     71        <endpoint binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding" contract="HeuristicLab.Services.OKB.IOKBService" />
    7272        <host>
    7373          <baseAddresses>
    74             <add baseAddress="http://localhost:8732/Design_Time_Addresses/OKB-3.3/AdminService" />
     74            <add baseAddress="http://localhost:8732/Design_Time_Addresses/OKB-3.3/OKBService" />
    7575          </baseAddresses>
    7676        </host>
Note: See TracChangeset for help on using the changeset viewer.