Free cookie consent management tool by TermsFeed Policy Generator

Changeset 6744


Ignore:
Timestamp:
09/12/11 20:17:10 (11 years ago)
Author:
ascheibe
Message:

#1233

  • renamed last couple of folders
  • fixed an installer bug
  • now with more license headers and less magic numbers
Location:
branches/HeuristicLab.Hive-3.4/sources
Files:
28 added
20 deleted
25 edited
2 copied
3 moved

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.3/HeuristicLabClientsHiveExperimentManagerPlugin.cs.frame

    r6700 r6744  
    2525  [Plugin("HeuristicLab.Clients.Hive.ExperimentManager", "3.3.5.$WCREV$")]
    2626  [PluginFile("HeuristicLab.Clients.Hive.ExperimentManager-3.3.dll", PluginFileType.Assembly)]
     27  [PluginDependency("HeuristicLab.Clients.Hive", "3.3")]
     28  [PluginDependency("HeuristicLab.Clients.Hive.Views", "3.3")]
     29  [PluginDependency("HeuristicLab.Collections", "3.3")]
     30  [PluginDependency("HeuristicLab.Common", "3.3")]
     31  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
     32  [PluginDependency("HeuristicLab.Core", "3.3")]
     33  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
     34  [PluginDependency("HeuristicLab.Data", "3.3")] 
     35  [PluginDependency("HeuristicLab.Hive", "3.3")]
     36  [PluginDependency("HeuristicLab.MainForm", "3.3")]
     37  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
     38  [PluginDependency("HeuristicLab.Optimization", "3.3")]
     39  [PluginDependency("HeuristicLab.Optimizer", "3.3")]
     40  [PluginDependency("HeuristicLab.Persistence", "3.3")]   
    2741  public class HeuristicLabClientsHiveExperimentManagerPlugin : PluginBase {
    2842  }
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/MainWindow.cs

    r6743 r6744  
    1919 */
    2020#endregion
    21 
    2221
    2322using System;
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.TrayIcon/3.3/Program.cs

    r6734 r6744  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System;
    223using System.Diagnostics;
    324using System.Management;
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.TrayIconSetup/HeuristicLab.Clients.Hive.Slave.TrayIconSetup.vdproj

    r6700 r6744  
    10771077            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_640A7525E7974E7BAE45D8D70EF04E26"
    10781078            {
    1079             "SourcePath" = "8:..\\HeuristicLab.Clients.Hive.Slave.SlaveWindowsServiceSetup\\hl_logo.jpg"
     1079            "SourcePath" = "8:hl_logo.jpg"
    10801080            "TargetName" = "8:hl_logo.jpg"
    10811081            "Tag" = "8:"
     
    14381438            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F010F086FC3D4C1EA55A80E7D9230283"
    14391439            {
    1440             "SourcePath" = "8:..\\HeuristicLab.Clients.Hive.Slave.SlaveWindowsServiceSetup\\HeuristicLab.ico"
     1440            "SourcePath" = "8:HeuristicLab.ico"
    14411441            "TargetName" = "8:HeuristicLab.ico"
    14421442            "Tag" = "8:"
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/WcfService.cs

    r6743 r6744  
    2222using System;
    2323using System.Collections.Generic;
    24 using HeuristicLab.Clients.Hive.SlaveCore.Properties;
    2524using HeuristicLab.Common;
    2625
     
    4342        if (instance == null) {
    4443          instance = new WcfService();
    45           ServiceLocator.Instance.Username = Settings.Default.SlaveUser;
    46           ServiceLocator.Instance.Password = Settings.Default.SlavePwd;
     44          ServiceLocator.Instance.Username = HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings.Default.SlaveUser;
     45          ServiceLocator.Instance.Password = HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings.Default.SlavePwd;
    4746        }
    4847        return instance;
     
    7877        HiveClient.TryAndRepeat(() => {
    7978          service.UpdateTaskData(task, taskData);
    80         }, Settings.Default.PluginDeletionRetries, "Could not upload jobdata.");
     79        }, HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings.Default.PluginDeletionRetries, "Could not upload jobdata.");
    8180        service.UpdateTaskState(task.Id, state, slaveId, null, exception);
    8281      });
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/app.config

    r6683 r6744  
    1010    </sectionGroup>
    1111  </configSections>
     12  <startup>
     13    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
     14  </startup>
    1215  <userSettings>
    1316    <HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
     
    3740      </setting>
    3841      <setting name="ClientsHiveSlaveCoreDll" serializeAs="String">
    39         <value>HeuristicLab.Clients.Hive.SlaveCore-3.4.dll</value>
     42        <value>HeuristicLab.Clients.Hive.SlaveCore-3.3.dll</value>
    4043      </setting>
    4144      <setting name="ClientsHiveDll" serializeAs="String">
    42         <value>HeuristicLab.Clients.Hive-3.4.dll</value>
     45        <value>HeuristicLab.Clients.Hive-3.3.dll</value>
    4346      </setting>
    4447      <setting name="HiveDll" serializeAs="String">
    45         <value>HeuristicLab.Hive-3.4.dll</value>
     48        <value>HeuristicLab.Hive-3.3.dll</value>
    4649      </setting>
    4750      <setting name="ClientsCommonDll" serializeAs="String">
     
    8083    </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
    8184  </userSettings>
    82  
     85  
    8386
    8487  <system.serviceModel>
     
    102105    <client>
    103106      <endpoint name="SlaveCommunicationServiceEndpoint" address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/>
    104       <endpoint address="http://services.heuristiclab.com/Hive-3.4/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService">
     107      <endpoint address="http://localhost/Hive-3.4/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService">
    105108        <identity>
    106           <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>
     109          <certificate encodedValue="AwAAAAEAAAAUAAAAQkazTmWcZqFuuREaov8jmDtOu4UgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhAVedIj+0w6jEdhZErAeemyMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTExMDkwNjA4NDUzOVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCiKeSwXFm0qxkuMFao9NHftClUYvX0jpiyKFthUnutfhB2FF3Ie8a8U15M+GBYSZOV5vXlEn3D30HsV/x6L9/UU1fiJndJd5lWI2/4mP2jra0qP0b8xyitHfRhePIfpDkufZqIOvOmT/DoFqMTK3joexzuEmAw5Ugil6fbOxELlwIDAQABo0kwRzBFBgNVHQEEPjA8gBCJmAWIXCTyTFXdjdnseED4oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghAVedIj+0w6jEdhZErAeemyMAkGBSsOAwIdBQADgYEACW9nLJnu1+OJg93AAKfWqkiETHcXUcULrPjMWJQsy5fkHY1qExKBGeUJHK0REvqQs3KRY3GqikMjlAnDmb/e9P1h+PynsRv7y2zAGCnKW4nryWVncWf1xJL9xvKNuH2aR4+Wdq9oo2m793+RXtA7YTSsr/OiiIdkQcjUGQtkaYo="/>
    107110        </identity>
    108111      </endpoint>
    109112    </client>
    110113  </system.serviceModel>
    111 
    112   <startup>
    113     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
    114   </startup>
    115114</configuration>
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Tests/Mocks/MockServiceLocator.cs

    r6717 r6744  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System;
    223using HeuristicLab.Services.Hive;
    324
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/GanttChart/GanttChart.cs

    r6373 r6744  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System;
    223using System.Collections.Generic;
    324using System.Drawing;
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveItemView.cs

    r6373 r6744  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System;
    223using System.ComponentModel;
    324using System.Windows.Forms;
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.3/TreeView/DeleteTaskTreeNodeAction.cs

    r6727 r6744  
    1 
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
    222using System.Drawing;
    323using HeuristicLab.Clients.Hive.Jobs;
    424using HeuristicLab.Core;
    525using HeuristicLab.Optimization;
     26
    627namespace HeuristicLab.Clients.Hive.Views.ExperimentManager.TreeView {
    728  public class DeleteTaskTreeNodeAction : IItemTreeNodeAction<HiveTask> {
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/Exceptions/ResourceNotFoundException.cs

    r5458 r6744  
    1 using System;
    2 using System.Collections.Generic;
    3 using System.Linq;
    4 using System.Text;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System;
    523
    624namespace HeuristicLab.Clients.Hive {
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj

    r6725 r6744  
    113113  <ItemGroup>
    114114    <Compile Include="HiveClient.cs" />
     115    <Compile Include="Settings.Designer.cs">
     116      <AutoGen>True</AutoGen>
     117      <DesignTimeSharedInput>True</DesignTimeSharedInput>
     118      <DependentUpon>Settings.settings</DependentUpon>
     119    </Compile>
    115120    <Compile Include="Tasks\ItemTask.cs" />
    116121    <Compile Include="RefreshableJob.cs" />
     
    174179    <None Include="HeuristicLab.snk" />
    175180    <None Include="ServiceClients\GenerateServiceClients.cmd" />
     181    <None Include="Settings.settings">
     182      <Generator>SettingsSingleFileGenerator</Generator>
     183      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     184    </None>
    176185  </ItemGroup>
    177186  <ItemGroup />
     
    193202set SolutionDir=$(SolutionDir)
    194203set Outdir=$(Outdir)
    195 
    196204call PreBuildEvent.cmd</PreBuildEvent>
    197205  </PropertyGroup>
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/HeuristicLabClientsHivePlugin.cs.frame

    r6701 r6744  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System;
    223using System.Collections.Generic;
    324using System.Linq;
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

    r6743 r6744  
    8484        this.IsAllowedPrivileged = ServiceLocator.Instance.CallHiveService((s) => s.IsAllowedPrivileged());
    8585
    86         var oldExperiments = jobs ?? new ItemCollection<RefreshableJob>();
     86        var oldJobs = jobs ?? new ItemCollection<RefreshableJob>();
    8787        jobs = new HiveItemCollection<RefreshableJob>();
    88         var experimentsLoaded = ServiceLocator.Instance.CallHiveService<IEnumerable<Job>>(s => s.GetJobs());
    89 
    90         foreach (var he in experimentsLoaded) {
    91           var job = oldExperiments.SingleOrDefault(x => x.Id == he.Id);
     88        var jobsLoaded = ServiceLocator.Instance.CallHiveService<IEnumerable<Job>>(s => s.GetJobs());
     89
     90        foreach (var j in jobsLoaded) {
     91          var job = oldJobs.SingleOrDefault(x => x.Id == j.Id);
    9292          if (job == null) {
    9393            // new
    94             jobs.Add(new RefreshableJob(he) { IsAllowedPrivileged = this.isAllowedPrivileged });
     94            jobs.Add(new RefreshableJob(j) { IsAllowedPrivileged = this.isAllowedPrivileged });
    9595          } else {
    9696            // update
    97             job.Job = he;
     97            job.Job = j;
    9898            job.IsAllowedPrivileged = this.isAllowedPrivileged;
    9999            jobs.Add(job);
     
    101101        }
    102102        // remove those which were not in the list of loaded hiveexperiments
    103         foreach (var experiment in oldExperiments) {
     103        foreach (var experiment in oldJobs) {
    104104          if (experiment.Id == Guid.Empty) {
    105105            // experiment not uploaded... keep
     
    236236
    237237    #region Upload Job
    238     private Semaphore jobUploadSemaphore = new Semaphore(4, 4); // todo: take magic number into config
     238    private Semaphore taskUploadSemaphore = new Semaphore(Settings.Default.MaxParallelUploads, Settings.Default.MaxParallelUploads);
    239239    private static object jobCountLocker = new object();
    240240    private static object pluginLocker = new object();
     
    258258        }
    259259
    260         // upload Task
    261         refreshableJob.Progress.Status = "Uploading Task...";
     260        // upload Job
     261        refreshableJob.Progress.Status = "Uploading Job...";
    262262        refreshableJob.Job.Id = ServiceLocator.Instance.CallHiveService((s) => s.AddJob(refreshableJob.Job));
    263263        bool isPrivileged = refreshableJob.Job.IsPrivileged;
     
    280280        if (refreshableJob.RefreshAutomatically) refreshableJob.StartResultPolling();
    281281
    282         // upload jobs
    283         refreshableJob.Progress.Status = "Uploading jobs...";
     282        // upload tasks
     283        refreshableJob.Progress.Status = "Uploading tasks...";
    284284
    285285        var tasks = new List<TS.Task>();
    286         foreach (HiveTask hiveJob in refreshableJob.HiveTasks) {
     286        foreach (HiveTask hiveTask in refreshableJob.HiveTasks) {
    287287          tasks.Add(TS.Task.Factory.StartNew((hj) => {
    288288            UploadTaskWithChildren(refreshableJob.Progress, (HiveTask)hj, null, resourceIds, jobCount, totalJobCount, configFilePlugin.Id, refreshableJob.Job.Id, refreshableJob.Log, refreshableJob.Job.IsPrivileged, cancellationToken);
    289           }, hiveJob)
     289          }, hiveTask)
    290290          .ContinueWith((x) => refreshableJob.Log.LogException(x.Exception), TaskContinuationOptions.OnlyOnFaulted));
    291291        }
     
    307307    /// </summary>
    308308    private static Plugin UploadConfigurationFile(IHiveService service, List<Plugin> onlinePlugins) {
    309       string exeFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "HeuristicLab 3.3.exe");
     309      string exeFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, Settings.Default.HLBinaryName);
    310310      string configFileName = Path.GetFileName(ConfigurationManager.OpenExeConfiguration(exeFilePath).FilePath);
    311311      string configFilePath = ConfigurationManager.OpenExeConfiguration(exeFilePath).FilePath;
     
    334334    /// </summary>
    335335    /// <param name="parentHiveTask">shall be null if its the root task</param>
    336     private void UploadTaskWithChildren(IProgress progress, HiveTask hiveTask, HiveTask parentHiveJob, IEnumerable<Guid> groups, int[] taskCount, int totalJobCount, Guid configPluginId, Guid jobId, ILog log, bool isPrivileged, CancellationToken cancellationToken) {
    337       jobUploadSemaphore.WaitOne();
     336    private void UploadTaskWithChildren(IProgress progress, HiveTask hiveTask, HiveTask parentHiveTask, IEnumerable<Guid> groups, int[] taskCount, int totalJobCount, Guid configPluginId, Guid jobId, ILog log, bool isPrivileged, CancellationToken cancellationToken) {
     337      taskUploadSemaphore.WaitOne();
    338338      bool semaphoreReleased = false;
    339339      try {
     
    342342          taskCount[0]++;
    343343        }
    344         TaskData jobData;
     344        TaskData taskData;
    345345        List<IPluginDescription> plugins;
    346346
     
    348348          hiveTask.Task.IsParentTask = true;
    349349          hiveTask.Task.FinishWhenChildJobsFinished = true;
    350           jobData = hiveTask.GetAsTaskData(true, out plugins);
     350          taskData = hiveTask.GetAsTaskData(true, out plugins);
    351351        } else {
    352352          hiveTask.Task.IsParentTask = false;
    353353          hiveTask.Task.FinishWhenChildJobsFinished = false;
    354           jobData = hiveTask.GetAsTaskData(false, out plugins);
     354          taskData = hiveTask.GetAsTaskData(false, out plugins);
    355355        }
    356356        cancellationToken.ThrowIfCancellationRequested();
     
    368368        hiveTask.Task.IsPrivileged = isPrivileged;
    369369
    370         log.LogMessage(string.Format("Uploading task ({0} kb, {1} objects)", jobData.Data.Count() / 1024, hiveTask.ItemTask.GetObjectGraphObjects().Count()));
     370        log.LogMessage(string.Format("Uploading task ({0} kb, {1} objects)", taskData.Data.Count() / 1024, hiveTask.ItemTask.GetObjectGraphObjects().Count()));
    371371        TryAndRepeat(() => {
    372372          if (!cancellationToken.IsCancellationRequested) {
    373             if (parentHiveJob != null) {
    374               hiveTask.Task.Id = ServiceLocator.Instance.CallHiveService((s) => s.AddChildTask(parentHiveJob.Task.Id, hiveTask.Task, jobData));
     373            if (parentHiveTask != null) {
     374              hiveTask.Task.Id = ServiceLocator.Instance.CallHiveService((s) => s.AddChildTask(parentHiveTask.Task.Id, hiveTask.Task, taskData));
    375375            } else {
    376               hiveTask.Task.Id = ServiceLocator.Instance.CallHiveService((s) => s.AddTask(hiveTask.Task, jobData, groups.ToList()));
     376              hiveTask.Task.Id = ServiceLocator.Instance.CallHiveService((s) => s.AddTask(hiveTask.Task, taskData, groups.ToList()));
    377377            }
    378378          }
     
    393393          .ContinueWith((x) => log.LogException(x.Exception), TaskContinuationOptions.OnlyOnFaulted));
    394394        }
    395         jobUploadSemaphore.Release(); semaphoreReleased = true; // the semaphore has to be release before waitall!
     395        taskUploadSemaphore.Release(); semaphoreReleased = true; // the semaphore has to be release before waitall!
    396396        try {
    397397          TS.Task.WaitAll(tasks.ToArray());
     
    402402      }
    403403      finally {
    404         if (!semaphoreReleased) jobUploadSemaphore.Release();
     404        if (!semaphoreReleased) taskUploadSemaphore.Release();
    405405      }
    406406    }
     
    418418
    419419        refreshableJob.Progress.Status = "Connecting to Server...";
    420         // fetch all Task objects to create the full tree of tree of HiveTask objects
    421         refreshableJob.Progress.Status = "Downloading list of jobs...";
     420        // fetch all task objects to create the full tree of tree of HiveTask objects
     421        refreshableJob.Progress.Status = "Downloading list of tasks...";
    422422        allTasks = ServiceLocator.Instance.CallHiveService(s => s.GetLightweightJobTasks(hiveExperiment.Id));
    423423        totalJobCount = allTasks.Count();
     
    428428        while (!downloader.IsFinished) {
    429429          refreshableJob.Progress.ProgressValue = downloader.FinishedCount / (double)totalJobCount;
    430           refreshableJob.Progress.Status = string.Format("Downloading/deserializing jobs... ({0}/{1} finished)", downloader.FinishedCount, totalJobCount);
     430          refreshableJob.Progress.Status = string.Format("Downloading/deserializing tasks... ({0}/{1} finished)", downloader.FinishedCount, totalJobCount);
    431431          Thread.Sleep(500);
    432432
     
    458458
    459459    private static void BuildHiveJobTree(HiveTask parentHiveJob, IEnumerable<LightweightTask> allJobs, IDictionary<Guid, HiveTask> allHiveJobs) {
    460       IEnumerable<LightweightTask> childJobs = from job in allJobs
    461                                                where job.ParentTaskId.HasValue && job.ParentTaskId.Value == parentHiveJob.Task.Id
    462                                                orderby job.DateCreated ascending
    463                                                select job;
    464       foreach (LightweightTask job in childJobs) {
    465         HiveTask childHiveJob = allHiveJobs[job.Id];
    466         parentHiveJob.AddChildHiveJob(childHiveJob);
    467         BuildHiveJobTree(childHiveJob, allJobs, allHiveJobs);
     460      IEnumerable<LightweightTask> childTasks = from job in allJobs
     461                                                where job.ParentTaskId.HasValue && job.ParentTaskId.Value == parentHiveJob.Task.Id
     462                                                orderby job.DateCreated ascending
     463                                                select job;
     464      foreach (LightweightTask task in childTasks) {
     465        HiveTask childHiveTask = allHiveJobs[task.Id];
     466        parentHiveJob.AddChildHiveJob(childHiveTask);
     467        BuildHiveJobTree(childHiveTask, allJobs, allHiveJobs);
    468468      }
    469469    }
     
    482482
    483483    public static ItemTask LoadItemJob(Guid jobId) {
    484       TaskData jobData = ServiceLocator.Instance.CallHiveService(s => s.GetTaskData(jobId));
     484      TaskData taskData = ServiceLocator.Instance.CallHiveService(s => s.GetTaskData(jobId));
    485485      try {
    486         return PersistenceUtil.Deserialize<ItemTask>(jobData.Data);
     486        return PersistenceUtil.Deserialize<ItemTask>(taskData.Data);
    487487      }
    488488      catch {
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/StateLogList.cs

    r6419 r6744  
    1 using System.Collections.Generic;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System.Collections.Generic;
    223using HeuristicLab.Common;
    324using HeuristicLab.Core;
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/StateLogListList.cs

    r6419 r6744  
    1 using System.Collections.Generic;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System.Collections.Generic;
    223using HeuristicLab.Common;
    324using HeuristicLab.Core;
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/Tasks/EngineTask.cs

    r6725 r6744  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System;
    223using System.Drawing;
    324using HeuristicLab.Common;
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/TreeView/IItemTree.cs

    r6384 r6744  
    1 using System.Collections.Generic;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System.Collections.Generic;
    223using HeuristicLab.Collections;
    324using HeuristicLab.Core;
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/app.config

    r6357 r6744  
    11<?xml version="1.0"?>
    22<configuration>
     3  <configSections>
     4    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
     5      <section name="HeuristicLab.Clients.Hive.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
     6    </sectionGroup>
     7  </configSections>
     8  <applicationSettings>
     9    <HeuristicLab.Clients.Hive.Settings>
     10      <setting name="MaxParallelUploads" serializeAs="String">
     11        <value>4</value>
     12      </setting>
     13      <setting name="HLBinaryName" serializeAs="String">
     14        <value>HeuristicLab 3.3.exe</value>
     15      </setting>
     16    </HeuristicLab.Clients.Hive.Settings>
     17  </applicationSettings>
    318  <system.serviceModel>
    419    <bindings>
     
    3348    </bindings>
    3449    <client>
    35       <endpoint address="http://services.heuristiclab.com/Hive-3.4/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_IHiveService" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService">
     50      <endpoint address="http://localhost/Hive-3.4/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_IHiveService" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService">
    3651        <identity>
    37           <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>
     52          <certificate encodedValue="AwAAAAEAAAAUAAAAQkazTmWcZqFuuREaov8jmDtOu4UgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhAVedIj+0w6jEdhZErAeemyMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTExMDkwNjA4NDUzOVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCiKeSwXFm0qxkuMFao9NHftClUYvX0jpiyKFthUnutfhB2FF3Ie8a8U15M+GBYSZOV5vXlEn3D30HsV/x6L9/UU1fiJndJd5lWI2/4mP2jra0qP0b8xyitHfRhePIfpDkufZqIOvOmT/DoFqMTK3joexzuEmAw5Ugil6fbOxELlwIDAQABo0kwRzBFBgNVHQEEPjA8gBCJmAWIXCTyTFXdjdnseED4oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghAVedIj+0w6jEdhZErAeemyMAkGBSsOAwIdBQADgYEACW9nLJnu1+OJg93AAKfWqkiETHcXUcULrPjMWJQsy5fkHY1qExKBGeUJHK0REvqQs3KRY3GqikMjlAnDmb/e9P1h+PynsRv7y2zAGCnKW4nryWVncWf1xJL9xvKNuH2aR4+Wdq9oo2m793+RXtA7YTSsr/OiiIdkQcjUGQtkaYo="/>
    3853        </identity>
    3954      </endpoint>
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/app_ascheibe.config

    r6168 r6744  
    11<?xml version="1.0"?>
    22<configuration>
     3  <configSections>
     4    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
     5      <section name="HeuristicLab.Clients.Hive.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
     6    </sectionGroup>
     7  </configSections>
     8  <applicationSettings>
     9    <HeuristicLab.Clients.Hive.Settings>
     10      <setting name="MaxParallelUploads" serializeAs="String">
     11        <value>4</value>
     12      </setting>
     13      <setting name="HLBinaryName" serializeAs="String">
     14        <value>HeuristicLab 3.3.exe</value>
     15      </setting>
     16    </HeuristicLab.Clients.Hive.Settings>
     17  </applicationSettings>
    318  <system.serviceModel>
    419    <bindings>
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/app_f005pc.config

    r6712 r6744  
    11<?xml version="1.0"?>
    22<configuration>
     3  <configSections>
     4    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
     5      <section name="HeuristicLab.Clients.Hive.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
     6    </sectionGroup>
     7  </configSections>
     8  <applicationSettings>
     9    <HeuristicLab.Clients.Hive.Settings>
     10      <setting name="MaxParallelUploads" serializeAs="String">
     11        <value>4</value>
     12      </setting>
     13      <setting name="HLBinaryName" serializeAs="String">
     14        <value>HeuristicLab 3.3.exe</value>
     15      </setting>
     16    </HeuristicLab.Clients.Hive.Settings>
     17  </applicationSettings>
    318  <system.serviceModel>
    419    <bindings>
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/app_services.config

    r6168 r6744  
    11<?xml version="1.0"?>
    22<configuration>
     3  <configSections>
     4    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
     5      <section name="HeuristicLab.Clients.Hive.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
     6    </sectionGroup>
     7  </configSections>
     8  <applicationSettings>
     9    <HeuristicLab.Clients.Hive.Settings>
     10      <setting name="MaxParallelUploads" serializeAs="String">
     11        <value>4</value>
     12      </setting>
     13      <setting name="HLBinaryName" serializeAs="String">
     14        <value>HeuristicLab 3.3.exe</value>
     15      </setting>
     16    </HeuristicLab.Clients.Hive.Settings>
     17  </applicationSettings>
    318  <system.serviceModel>
    419    <bindings>
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive 3.4.sln

    r6731 r6744  
    2929Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Hive-3.3", "HeuristicLab.Services.Hive\3.3\HeuristicLab.Services.Hive-3.3.csproj", "{CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}"
    3030EndProject
    31 Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Hive-3.4", "HeuristicLab.Services.Hive.Web\Hive-3.4\", "{0CA6706D-A569-45DE-A85C-4158891CC1BC}"
     31Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Hive-3.3", "HeuristicLab.Services.Hive.Web\Hive-3.3\", "{0CA6706D-A569-45DE-A85C-4158891CC1BC}"
    3232  ProjectSection(WebsiteProperties) = preProject
    3333    TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
    3434    ProjectReferences = "{CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}|HeuristicLab.Services.Hive-3.3.dll;{EC2C8109-6E1E-4C88-9A2B-908CFF2EF4AC}|HeuristicLab.Services.Hive.DataAccess-3.3.dll;{F98A1740-9AC9-4D36-A582-6A2D0D06978D}|HeuristicLab.Hive-3.3.dll;"
    35     Debug.AspNetCompiler.VirtualPath = "/Hive-3.4"
    36     Debug.AspNetCompiler.PhysicalPath = "HeuristicLab.Services.Hive.Web\Hive-3.4\"
    37     Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\Hive-3.4\"
     35    Debug.AspNetCompiler.VirtualPath = "/Hive-3.3"
     36    Debug.AspNetCompiler.PhysicalPath = "HeuristicLab.Services.Hive.Web\Hive-3.3\"
     37    Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\Hive-3.3\"
    3838    Debug.AspNetCompiler.Updateable = "true"
    3939    Debug.AspNetCompiler.ForceOverwrite = "true"
    4040    Debug.AspNetCompiler.FixedNames = "false"
    4141    Debug.AspNetCompiler.Debug = "True"
    42     Release.AspNetCompiler.VirtualPath = "/Hive-3.4"
    43     Release.AspNetCompiler.PhysicalPath = "HeuristicLab.Services.Hive.Web\Hive-3.4\"
    44     Release.AspNetCompiler.TargetPath = "PrecompiledWeb\Hive-3.4\"
     42    Release.AspNetCompiler.VirtualPath = "/Hive-3.3"
     43    Release.AspNetCompiler.PhysicalPath = "HeuristicLab.Services.Hive.Web\Hive-3.3\"
     44    Release.AspNetCompiler.TargetPath = "PrecompiledWeb\Hive-3.3\"
    4545    Release.AspNetCompiler.Updateable = "true"
    4646    Release.AspNetCompiler.ForceOverwrite = "true"
     
    4848    Release.AspNetCompiler.Debug = "False"
    4949    VWDPort = "4591"
    50     VWDVirtualPath = "/Hive-3.4"
     50    VWDVirtualPath = "/Hive-3.3"
    5151    DefaultWebSiteLanguage = "Visual C#"
    5252  EndProjectSection
     
    5454Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Hive.Tests-3.3", "HeuristicLab.Services.Hive.Tests\HeuristicLab.Services.Hive.Tests-3.3.csproj", "{17187EAC-5D8C-4B11-9CEA-D88F71B59658}"
    5555EndProject
    56 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Slave.WindowsService-3.3", "HeuristicLab.Clients.Hive.Slave.SlaveWindowsService\HeuristicLab.Clients.Hive.Slave.WindowsService-3.3.csproj", "{BA8001DE-E83C-4B1F-8B2E-2695C4222491}"
    57 EndProject
    58 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "HeuristicLab.Clients.Hive.Slave.WindowsServiceSetup-3.3", "HeuristicLab.Clients.Hive.Slave.SlaveWindowsServiceSetup\HeuristicLab.Clients.Hive.Slave.SlaveWindowsServiceSetup.vdproj", "{28711372-0255-4883-9BED-81E150D73880}"
    59 EndProject
    6056Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Tests-3.3", "HeuristicLab.Clients.Hive.Tests\HeuristicLab.Clients.Hive.Tests-3.3.csproj", "{8D40A723-139D-40E4-8BBA-4CB309A9E4B9}"
    6157EndProject
     
    9288Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Slave.App-3.3", "HeuristicLab.Clients.Hive.Slave.App\3.3\HeuristicLab.Clients.Hive.Slave.App-3.3.csproj", "{E3B93D5C-3B6B-4657-9B3E-F4297BAC0AA5}"
    9389EndProject
    94 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4", "HeuristicLab.Clients.Hive.Slave.ConsoleClient\HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4.csproj", "{464D70B8-2D91-485C-B622-22E4A4891C68}"
     90Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.3", "HeuristicLab.Clients.Hive.Slave.ConsoleClient\3.3\HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.3.csproj", "{464D70B8-2D91-485C-B622-22E4A4891C68}"
     91EndProject
     92Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Slave.WindowsService-3.3", "HeuristicLab.Clients.Hive.Slave.WindowsService\3.3\HeuristicLab.Clients.Hive.Slave.WindowsService-3.3.csproj", "{BA8001DE-E83C-4B1F-8B2E-2695C4222491}"
     93EndProject
     94Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "HeuristicLab.Clients.Hive.Slave.WindowsServiceSetup-3.3", "HeuristicLab.Clients.Hive.Slave.WindowsServiceSetup\HeuristicLab.Clients.Hive.Slave.WindowsServiceSetup.vdproj", "{D29F7B26-4528-43A8-92B7-1EB4623E0C88}"
    9595EndProject
    9696Global
     
    226226    {17187EAC-5D8C-4B11-9CEA-D88F71B59658}.Release|x64.ActiveCfg = Release|x86
    227227    {17187EAC-5D8C-4B11-9CEA-D88F71B59658}.Release|x86.ActiveCfg = Release|Any CPU
    228     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    229     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|Any CPU.Build.0 = Debug|Any CPU
    230     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
    231     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
    232     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|x64.ActiveCfg = Debug|x86
    233     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|x86.ActiveCfg = Debug|x86
    234     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|x86.Build.0 = Debug|x86
    235     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|Any CPU.ActiveCfg = Release|Any CPU
    236     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|Any CPU.Build.0 = Release|Any CPU
    237     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|Mixed Platforms.ActiveCfg = Release|x86
    238     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|Mixed Platforms.Build.0 = Release|x86
    239     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|x64.ActiveCfg = Release|x86
    240     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|x86.ActiveCfg = Release|x86
    241     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|x86.Build.0 = Release|x86
    242     {28711372-0255-4883-9BED-81E150D73880}.Debug|Any CPU.ActiveCfg = Debug
    243     {28711372-0255-4883-9BED-81E150D73880}.Debug|Any CPU.Build.0 = Debug
    244     {28711372-0255-4883-9BED-81E150D73880}.Debug|Mixed Platforms.ActiveCfg = Debug
    245     {28711372-0255-4883-9BED-81E150D73880}.Debug|Mixed Platforms.Build.0 = Debug
    246     {28711372-0255-4883-9BED-81E150D73880}.Debug|x64.ActiveCfg = Debug
    247     {28711372-0255-4883-9BED-81E150D73880}.Debug|x64.Build.0 = Debug
    248     {28711372-0255-4883-9BED-81E150D73880}.Debug|x86.ActiveCfg = Debug
    249     {28711372-0255-4883-9BED-81E150D73880}.Debug|x86.Build.0 = Debug
    250     {28711372-0255-4883-9BED-81E150D73880}.Release|Any CPU.ActiveCfg = Release
    251     {28711372-0255-4883-9BED-81E150D73880}.Release|Any CPU.Build.0 = Release
    252     {28711372-0255-4883-9BED-81E150D73880}.Release|Mixed Platforms.ActiveCfg = Release
    253     {28711372-0255-4883-9BED-81E150D73880}.Release|x64.ActiveCfg = Release
    254     {28711372-0255-4883-9BED-81E150D73880}.Release|x64.Build.0 = Release
    255     {28711372-0255-4883-9BED-81E150D73880}.Release|x86.ActiveCfg = Release
    256228    {8D40A723-139D-40E4-8BBA-4CB309A9E4B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    257229    {8D40A723-139D-40E4-8BBA-4CB309A9E4B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    418390    {464D70B8-2D91-485C-B622-22E4A4891C68}.Release|x86.ActiveCfg = Release|x86
    419391    {464D70B8-2D91-485C-B622-22E4A4891C68}.Release|x86.Build.0 = Release|x86
     392    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     393    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|Any CPU.Build.0 = Debug|Any CPU
     394    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
     395    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
     396    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|x64.ActiveCfg = Debug|x86
     397    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|x86.ActiveCfg = Debug|x86
     398    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|x86.Build.0 = Debug|x86
     399    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|Any CPU.ActiveCfg = Release|Any CPU
     400    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|Any CPU.Build.0 = Release|Any CPU
     401    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
     402    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|Mixed Platforms.Build.0 = Release|Any CPU
     403    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|x64.ActiveCfg = Release|x86
     404    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|x86.ActiveCfg = Release|x86
     405    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|x86.Build.0 = Release|x86
     406    {D29F7B26-4528-43A8-92B7-1EB4623E0C88}.Debug|Any CPU.ActiveCfg = Debug
     407    {D29F7B26-4528-43A8-92B7-1EB4623E0C88}.Debug|Any CPU.Build.0 = Debug
     408    {D29F7B26-4528-43A8-92B7-1EB4623E0C88}.Debug|Mixed Platforms.ActiveCfg = Debug
     409    {D29F7B26-4528-43A8-92B7-1EB4623E0C88}.Debug|Mixed Platforms.Build.0 = Debug
     410    {D29F7B26-4528-43A8-92B7-1EB4623E0C88}.Debug|x64.ActiveCfg = Debug
     411    {D29F7B26-4528-43A8-92B7-1EB4623E0C88}.Debug|x64.Build.0 = Debug
     412    {D29F7B26-4528-43A8-92B7-1EB4623E0C88}.Debug|x86.ActiveCfg = Debug
     413    {D29F7B26-4528-43A8-92B7-1EB4623E0C88}.Debug|x86.Build.0 = Debug
     414    {D29F7B26-4528-43A8-92B7-1EB4623E0C88}.Release|Any CPU.ActiveCfg = Release
     415    {D29F7B26-4528-43A8-92B7-1EB4623E0C88}.Release|Any CPU.Build.0 = Release
     416    {D29F7B26-4528-43A8-92B7-1EB4623E0C88}.Release|Mixed Platforms.ActiveCfg = Release
     417    {D29F7B26-4528-43A8-92B7-1EB4623E0C88}.Release|Mixed Platforms.Build.0 = Release
     418    {D29F7B26-4528-43A8-92B7-1EB4623E0C88}.Release|x64.ActiveCfg = Release
     419    {D29F7B26-4528-43A8-92B7-1EB4623E0C88}.Release|x64.Build.0 = Release
     420    {D29F7B26-4528-43A8-92B7-1EB4623E0C88}.Release|x86.ActiveCfg = Release
     421    {D29F7B26-4528-43A8-92B7-1EB4623E0C88}.Release|x86.Build.0 = Release
    420422  EndGlobalSection
    421423  GlobalSection(SolutionProperties) = preSolution
     
    425427    {F98A1740-9AC9-4D36-A582-6A2D0D06978D} = {70CE526B-B92C-4750-B3D3-A38C572042A8}
    426428    {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8} = {622F8E95-CDFC-4B4E-BBA7-3EE4E47DB52A}
    427     {BA8001DE-E83C-4B1F-8B2E-2695C4222491} = {622F8E95-CDFC-4B4E-BBA7-3EE4E47DB52A}
    428     {28711372-0255-4883-9BED-81E150D73880} = {622F8E95-CDFC-4B4E-BBA7-3EE4E47DB52A}
    429429    {989FE92B-484E-41EE-87E2-6A24AF0381D8} = {622F8E95-CDFC-4B4E-BBA7-3EE4E47DB52A}
    430430    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA} = {622F8E95-CDFC-4B4E-BBA7-3EE4E47DB52A}
     
    432432    {E3B93D5C-3B6B-4657-9B3E-F4297BAC0AA5} = {622F8E95-CDFC-4B4E-BBA7-3EE4E47DB52A}
    433433    {464D70B8-2D91-485C-B622-22E4A4891C68} = {622F8E95-CDFC-4B4E-BBA7-3EE4E47DB52A}
     434    {BA8001DE-E83C-4B1F-8B2E-2695C4222491} = {622F8E95-CDFC-4B4E-BBA7-3EE4E47DB52A}
     435    {D29F7B26-4528-43A8-92B7-1EB4623E0C88} = {622F8E95-CDFC-4B4E-BBA7-3EE4E47DB52A}
    434436    {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE} = {E69A1E5F-63F7-493F-BBA2-163D6E321D44}
    435437    {0CA6706D-A569-45DE-A85C-4158891CC1BC} = {E69A1E5F-63F7-493F-BBA2-163D6E321D44}
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.3/Tests/Program.cs

    r6725 r6744  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System;
    223using System.IO;
    324using System.Linq;
     
    3960
    4061      //var job2 = PersistenceUtil.Deserialize<OptimizerJob>(data);
    41      
     62
    4263      #region Credentials
    4364      ServiceLocator.Instance.Username = "cneumuel";
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/Manager/UserManager.cs

    r6463 r6744  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System;
    223using System.Web.Security;
    324
Note: See TracChangeset for help on using the changeset viewer.