Changeset 4296


Ignore:
Timestamp:
08/23/10 17:49:43 (12 years ago)
Author:
cneumuel
Message:

corrected assembly reference paths, added some missing files

Location:
branches/3.3-HiveMigration/sources/HeuristicLab.Hive
Files:
33 edited

Legend:

Unmodified
Added
Removed
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Calendar/3.3/HeuristicLab.Calendar-3.3.csproj

    r4171 r4296  
    7373  <ItemGroup>
    7474    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    75       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     75      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    7676    </Reference>
    7777    <Reference Include="System" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Calendar/3.3/Properties/AssemblyInfo.cs

    r4171 r4296  
    5858// [assembly: AssemblyVersion("1.0.*")]
    5959[assembly: AssemblyVersion("3.3.0.0")]
    60 [assembly: AssemblyFileVersion("3.3.0.4133")]
     60[assembly: AssemblyFileVersion("3.3.0.4171")]
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.DataAccess.ADOHelper/3.3/HeuristicLab.DataAccess.ADOHelper-3.3.csproj

    r4171 r4296  
    119119  <ItemGroup>
    120120    <Reference Include="HeuristicLab.Common-3.3">
    121       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     121      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
    122122    </Reference>
    123123    <Reference Include="HeuristicLab.Persistence-3.3">
    124       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
     124      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
    125125    </Reference>
    126126    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    127       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     127      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    128128    </Reference>
    129129    <Reference Include="System" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.DataAccess/3.3/HeuristicLab.DataAccess-3.3.csproj

    r4171 r4296  
    158158  <ItemGroup>
    159159    <Reference Include="HeuristicLab.Common-3.3">
    160       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     160      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
    161161    </Reference>
    162162    <Reference Include="HeuristicLab.Persistence-3.3">
    163       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
     163      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
    164164    </Reference>
    165165    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    166       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     166      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    167167    </Reference>
    168168    <Reference Include="System" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive 3.3.sln

    r4285 r4296  
    88    {CDAD2510-299C-4FA2-B351-9D71A5AF20B7} = {CDAD2510-299C-4FA2-B351-9D71A5AF20B7}
    99    {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE} = {AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}
    10     {55B89815-F3E7-4D09-9442-273F849141DD} = {55B89815-F3E7-4D09-9442-273F849141DD}
    1110    {4D5A2A16-66C2-431D-9AA3-BD3041E64B84} = {4D5A2A16-66C2-431D-9AA3-BD3041E64B84}
    1211    {21187322-52DD-4243-80A4-A85F0263E63B} = {21187322-52DD-4243-80A4-A85F0263E63B}
     
    7372EndProject
    7473Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab", "HeuristicLab", "{BD1DE6F6-A188-4D1F-9681-BA7104818370}"
    75 EndProject
    76 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab.Hive.Test", "HeuristicLab.Hive.Test", "{4F2D8149-D608-42B3-BB1C-6909BDA2B350}"
    77 EndProject
    78 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive.Server.Tests", "HeuristicLab.Hive.Server.Tests\HeuristicLab.Hive.Server.Tests.csproj", "{55B89815-F3E7-4D09-9442-273F849141DD}"
    7974EndProject
    8075Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Calendar-3.3", "HeuristicLab.Calendar\3.3\HeuristicLab.Calendar-3.3.csproj", "{D17A4D6A-4CAA-4470-8A19-F42463C021FD}"
     
    327322    {21187322-52DD-4243-80A4-A85F0263E63B}.Release|x86.ActiveCfg = Release|x86
    328323    {21187322-52DD-4243-80A4-A85F0263E63B}.Release|x86.Build.0 = Release|x86
    329     {55B89815-F3E7-4D09-9442-273F849141DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    330     {55B89815-F3E7-4D09-9442-273F849141DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
    331     {55B89815-F3E7-4D09-9442-273F849141DD}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
    332     {55B89815-F3E7-4D09-9442-273F849141DD}.Debug|Mixed Platforms.Build.0 = Debug|x86
    333     {55B89815-F3E7-4D09-9442-273F849141DD}.Debug|x64.ActiveCfg = Debug|x86
    334     {55B89815-F3E7-4D09-9442-273F849141DD}.Debug|x86.ActiveCfg = Debug|x86
    335     {55B89815-F3E7-4D09-9442-273F849141DD}.Debug|x86.Build.0 = Debug|x86
    336     {55B89815-F3E7-4D09-9442-273F849141DD}.Release|Any CPU.ActiveCfg = Release|x86
    337     {55B89815-F3E7-4D09-9442-273F849141DD}.Release|Mixed Platforms.ActiveCfg = Release|x86
    338     {55B89815-F3E7-4D09-9442-273F849141DD}.Release|Mixed Platforms.Build.0 = Release|x86
    339     {55B89815-F3E7-4D09-9442-273F849141DD}.Release|x64.ActiveCfg = Release|x86
    340     {55B89815-F3E7-4D09-9442-273F849141DD}.Release|x86.ActiveCfg = Release|x86
    341     {55B89815-F3E7-4D09-9442-273F849141DD}.Release|x86.Build.0 = Release|x86
    342324    {D17A4D6A-4CAA-4470-8A19-F42463C021FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    343325    {D17A4D6A-4CAA-4470-8A19-F42463C021FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    516498    {5010BD86-23B7-4F8C-888A-76D21AD5266A} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
    517499    {1605256A-1CB3-44AB-AAFF-577093EE5789} = {DC8C63A5-7B57-4B3A-A74A-6F42C7DD1668}
    518     {55B89815-F3E7-4D09-9442-273F849141DD} = {4F2D8149-D608-42B3-BB1C-6909BDA2B350}
    519500  EndGlobalSection
    520501EndGlobal
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/HeuristicLab.Hive.Contracts-3.3.csproj

    r4289 r4296  
    7777  <ItemGroup>
    7878    <Reference Include="HeuristicLab.Collections-3.3">
    79       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
     79      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
    8080    </Reference>
    8181    <Reference Include="HeuristicLab.Common-3.3">
    82       <HintPath>..\..\HeuristicLab.Hive.JobBase\3.3\bin\Debug\HeuristicLab.Common-3.3.dll</HintPath>
     82      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
    8383    </Reference>
    8484    <Reference Include="HeuristicLab.Core-3.3">
    85       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     85      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
    8686    </Reference>
    8787    <Reference Include="HeuristicLab.Persistence-3.3">
    88       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
     88      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
    8989    </Reference>
    9090    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    91       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     91      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    9292    </Reference>
    9393    <Reference Include="HeuristicLab.Tracing-3.3">
    94       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
     94      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
    9595    </Reference>
    9696    <Reference Include="System" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/HeuristicLab.Hive.Experiment.Views-3.3.csproj

    r4144 r4296  
    5656  <ItemGroup>
    5757    <Reference Include="HeuristicLab.Collections-3.3">
    58       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
     58      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
    5959    </Reference>
    6060    <Reference Include="HeuristicLab.Common-3.3">
    61       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     61      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
    6262    </Reference>
    6363    <Reference Include="HeuristicLab.Common.Resources-3.3">
    64       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     64      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>
    6565    </Reference>
    6666    <Reference Include="HeuristicLab.Core-3.3">
    67       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     67      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
    6868    </Reference>
    69     <Reference Include="HeuristicLab.Core.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     69    <Reference Include="HeuristicLab.Core.Views-3.3">
     70      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Core.Views-3.3.dll</HintPath>
     71    </Reference>
    7072    <Reference Include="HeuristicLab.Data-3.3">
    71       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
     73      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
    7274    </Reference>
    7375    <Reference Include="HeuristicLab.MainForm-3.3">
    74       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.MainForm-3.3.dll</HintPath>
     76      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm-3.3.dll</HintPath>
    7577    </Reference>
    7678    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3">
    77       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
     79      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
    7880    </Reference>
    7981    <Reference Include="HeuristicLab.Operators.Views-3.3">
    80       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Operators.Views-3.3.dll</HintPath>
     82      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Operators.Views-3.3.dll</HintPath>
    8183    </Reference>
    8284    <Reference Include="HeuristicLab.Optimization-3.3">
    83       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
     85      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
    8486    </Reference>
    8587    <Reference Include="HeuristicLab.Optimization.Views-3.3">
    86       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
     88      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
    8789    </Reference>
    8890    <Reference Include="HeuristicLab.Persistence-3.3">
    89       <SpecificVersion>False</SpecificVersion>
     91      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
    9092    </Reference>
    9193    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    92       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     94      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    9395    </Reference>
    9496    <Reference Include="System" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HeuristicLab.Hive.Experiment-3.3.csproj

    r4171 r4296  
    5656  <ItemGroup>
    5757    <Reference Include="HeuristicLab.Collections-3.3">
    58       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
     58      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
    5959    </Reference>
    6060    <Reference Include="HeuristicLab.Common-3.3">
    61       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     61      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
    6262    </Reference>
    6363    <Reference Include="HeuristicLab.Common.Resources-3.3">
    64       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     64      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>
    6565    </Reference>
    6666    <Reference Include="HeuristicLab.Core-3.3">
    67       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     67      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
    6868    </Reference>
    6969    <Reference Include="HeuristicLab.Data-3.3">
    70       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
    71     </Reference>
    72     <Reference Include="HeuristicLab.DataAccess-3.3">
    73       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.DataAccess-3.3.dll</HintPath>
     70      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
    7471    </Reference>
    7572    <Reference Include="HeuristicLab.Optimization-3.3">
    76       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
     73      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
    7774    </Reference>
    7875    <Reference Include="HeuristicLab.Persistence-3.3">
    79       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
     76      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
    8077    </Reference>
    8178    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    82       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     79      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    8380    </Reference>
    84     <Reference Include="HeuristicLab.Tracing-3.3" />
     81    <Reference Include="HeuristicLab.Tracing-3.3">
     82      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
     83    </Reference>
    8584    <Reference Include="System" />
    8685    <Reference Include="System.Core" />
     
    119118  </ItemGroup>
    120119  <ItemGroup>
     120    <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
     121      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
     122      <Name>HeuristicLab.DataAccess-3.3</Name>
     123    </ProjectReference>
    121124    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
    122125      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.JobBase/3.3/HeuristicLab.Hive.JobBase-3.3.csproj

    r4171 r4296  
    9191  </PropertyGroup>
    9292  <ItemGroup>
    93     <Reference Include="HeuristicLab.Collections-3.3" />
    94     <Reference Include="HeuristicLab.Common-3.3" />
    9593    <Reference Include="HeuristicLab.Core-3.3">
    96       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     94      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
    9795    </Reference>
    9896    <Reference Include="HeuristicLab.Persistence-3.3">
    99       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
     97      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
    10098    </Reference>
    10199    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    102       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     100      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    103101    </Reference>
    104102    <Reference Include="System" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HeuristicLab.Hive.Server.Console-3.3.csproj

    r4171 r4296  
    7979  <ItemGroup>
    8080    <Reference Include="HeuristicLab.Common-3.3">
    81       <HintPath>..\..\HeuristicLab.Hive.JobBase\3.3\bin\Debug\HeuristicLab.Common-3.3.dll</HintPath>
     81      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
    8282    </Reference>
    8383    <Reference Include="HeuristicLab.Core-3.3">
    84       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     84      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
    8585    </Reference>
    8686    <Reference Include="HeuristicLab.Persistence-3.3">
    87       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
     87      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
    8888    </Reference>
    8989    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    90       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     90      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    9191    </Reference>
    9292    <Reference Include="HeuristicLab.Tracing-3.3">
    93       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
     93      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
    9494    </Reference>
    9595    <Reference Include="System" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HiveServerConsole.cs

    r4263 r4296  
    8282        IPAddress ipAdress = IPAddress.Parse(tbIp.Text);
    8383        int port = int.Parse(tbPort.Text);
    84         ServiceLocator.Address = tbIp.Text.Replace(" ", "");
    85         ServiceLocator.Port = tbPort.Text;
    86         IServerConsoleFacade scf = ServiceLocator.GetServerConsoleFacade();
     84        IServerConsoleFacade scf;
    8785        Response resp;
    8886        try {
     
    9088          this.Cursor = Cursors.WaitCursor;
    9189          t.Start();
    92           resp = scf.Login(tbUserName.Text, tbPwd.Text);
     90
     91          ServiceLocator.Address = tbIp.Text.Replace(" ", "");
     92          ServiceLocator.Port = tbPort.Text;
     93          ServiceLocator.Username = tbUserName.Text;
     94          ServiceLocator.Password = tbPwd.Text;
     95          scf = ServiceLocator.GetServerConsoleFacade();
     96
     97          resp = scf.Login();
    9398          t.Abort();
    9499          this.Cursor = Cursors.Default;
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/ServiceLocator.cs

    r4267 r4296  
    1414    internal static string Address { get; set; }
    1515    internal static string Port { get; set; }
     16    internal static string Username { get; set; }
     17    // [chn] TODO: Don't store plaintext password in memory!
     18    internal static string Password { get; set; }
    1619
    1720    internal static ISlaveManager GetSlaveManager() {
     
    2427
    2528    internal static IServerConsoleFacade GetServerConsoleFacade() {
    26       if (serverConsoleFacade == null &&
    27         Address != String.Empty &&
    28         Port != String.Empty) {
     29      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"));
    2934
    3035        ChannelFactory<IServerConsoleFacade> factory =
    3136          new ChannelFactory<IServerConsoleFacade>(
    3237            WcfSettings.GetBinding(),
    33             new EndpointAddress("net.tcp://" + Address + ":" + Port + "/HiveServerConsole/ServerConsoleFacade"));
    34                          
     38            new EndpointAddress("http://" + Address + ":" + Port + "/HiveServerConsole"));
     39
     40        factory.Credentials.UserName.UserName = Username;
     41        factory.Credentials.UserName.Password = Password;
    3542        serverConsoleFacade = factory.CreateChannel();
    3643        ((ICommunicationObject)serverConsoleFacade).Faulted += ServiceLocator_Faulted;
    3744      }
    38      
    3945      return serverConsoleFacade;
    4046    }
     
    4955      serverConsoleFacade = null;
    5056    }
     57
    5158  }
    5259}
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Facades/ServerConsoleFacade.cs

    r4289 r4296  
    2727using HeuristicLab.Hive.Contracts.BusinessObjects;
    2828using HeuristicLab.Hive.Contracts;
    29 using HeuristicLab.Security.Contracts.Interfaces;
    3029using HeuristicLab.Hive.Server.Core.InternalInterfaces;
    3130using System.ServiceModel;
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/HeuristicLab.Hive.Server.Core-3.3.csproj

    r4289 r4296  
    7878  <ItemGroup>
    7979    <Reference Include="HeuristicLab.Collections-3.3">
    80       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
     80      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
    8181    </Reference>
    8282    <Reference Include="HeuristicLab.Common-3.3">
    83       <HintPath>..\..\HeuristicLab.Hive.JobBase\3.3\bin\Debug\HeuristicLab.Common-3.3.dll</HintPath>
     83      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
    8484    </Reference>
    8585    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    86       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     86      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    8787    </Reference>
    8888    <Reference Include="HeuristicLab.Tracing-3.3">
    89       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
     89      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
    9090    </Reference>
    9191    <Reference Include="System" />
     
    114114  </ItemGroup>
    115115  <ItemGroup>
    116     <Compile Include="Authorization\HivePermissions.cs" />
    117     <Compile Include="Authorization\PermissionCollection.cs" />
    118     <Compile Include="Authorization\PermissionContext.cs" />
    119     <Compile Include="Authorization\PermissionException.cs" />
    120     <Compile Include="Authorization\Policy.cs" />
    121     <Compile Include="Authorization\PolicyCollection.cs" />
    122116    <Compile Include="CreateHiveDatabaseApplication.cs" />
    123117    <Compile Include="SlaveCommunicator.cs" />
     
    127121    <Compile Include="DefaultScheduler.cs" />
    128122    <Compile Include="Facades\ExecutionEngineFacade.cs" />
    129     <Compile Include="Authorization\HivePermissionManager.cs" />
    130123    <Compile Include="HeuristicLabHiveServerCorePlugin.cs" />
    131124    <Compile Include="InternalInterfaces\IHivePermissionManager.cs" />
     
    150143    </None>
    151144    <None Include="HeuristicLab.snk" />
    152     <EmbeddedResource Include="Authorization\HivePermissionSet.xsd">
    153       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    154     </EmbeddedResource>
    155145    <None Include="Properties\AssemblyInfo.frame" />
    156146    <None Include="Properties\Settings.settings">
     
    158148      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
    159149    </None>
    160   </ItemGroup>
    161   <ItemGroup>
    162     <EmbeddedResource Include="Authorization\HivePermissionSet.xml">
    163       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    164     </EmbeddedResource>
    165   </ItemGroup>
    166   <ItemGroup>
    167     <EmbeddedResource Include="Authorization\HivePermissionPolicy.xml">
    168       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    169     </EmbeddedResource>
    170150  </ItemGroup>
    171151  <ItemGroup>
     
    186166      <Name>HeuristicLab.Hive.Server.LINQDataAccess-3.3</Name>
    187167    </ProjectReference>
    188     <ProjectReference Include="..\..\HeuristicLab.Security.Contracts\3.3\HeuristicLab.Security.Contracts-3.3.csproj">
    189       <Project>{D59E852C-F205-4647-8C05-EB9ED1CF44E9}</Project>
    190       <Name>HeuristicLab.Security.Contracts-3.3</Name>
    191     </ProjectReference>
     168  </ItemGroup>
     169  <ItemGroup>
     170    <Folder Include="Authorization\" />
    192171  </ItemGroup>
    193172  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/HeuristicLabHiveServerCorePlugin.cs

    r4171 r4296  
    3434  [PluginDependency("HeuristicLab.Hive.Server.DataAccess", "3.3")]
    3535  [PluginDependency("HeuristicLab.Hive.Server.LINQDataAccess", "3.3")]
    36   [PluginDependency("HeuristicLab.Security.Contracts", "3.3")]
    3736  [PluginDependency("HeuristicLab.Tracing", "3.3")]
    3837  public class HeuristicLabHiveServerCorePlugin : PluginBase {
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/ServiceLocator.cs

    r4254 r4296  
    2929using HeuristicLab.DataAccess.Interfaces;
    3030using System.Data.SqlClient;
    31 using HeuristicLab.Security.Contracts.Interfaces;
    3231
    3332namespace HeuristicLab.Hive.Server.Core {
     
    4847    private static IScheduler scheduler = null;
    4948
    50     private static IPermissionManager permManager = null;
     49    //private static IPermissionManager permManager = null;
    5150
    5251    private static IHivePermissionManager hivePermManager = null;
     
    134133    /// </summary>
    135134    /// <returns></returns>
    136     [MethodImpl(MethodImplOptions.Synchronized)]
    137     public static IPermissionManager GetPermissionManager() {
    138       if (permManager == null)
    139         permManager = ApplicationManager.Manager.GetInstances<IPermissionManager>().First();
    140       return permManager;
     135    //[MethodImpl(MethodImplOptions.Synchronized)]
     136    //public static IPermissionManager GetPermissionManager() {
     137    //  if (permManager == null)
     138    //    permManager = ApplicationManager.Manager.GetInstances<IPermissionManager>().First();
     139    //  return permManager;
    141140
    142     }
     141    //}
    143142
    144143    /// <summary>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.DataAccess/3.3/HeuristicLab.Hive.Server.DataAccess-3.3.csproj

    r4267 r4296  
    122122  <ItemGroup>
    123123    <Reference Include="HeuristicLab.Common-3.3">
    124       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     124      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
    125125    </Reference>
    126126    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    127       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     127      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    128128    </Reference>
    129129    <Reference Include="System" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/HeuristicLab.Hive.Server.LINQDataAccess-3.3.csproj

    r4267 r4296  
    7878  <ItemGroup>
    7979    <Reference Include="HeuristicLab.Common-3.3">
    80       <HintPath>..\..\HeuristicLab.Hive.JobBase\3.3\bin\Debug\HeuristicLab.Common-3.3.dll</HintPath>
     80      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
    8181    </Reference>
    8282    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    83       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     83      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    8484    </Reference>
    8585    <Reference Include="HeuristicLab.Tracing-3.3">
    86       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
     86      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
    8787    </Reference>
    8888    <Reference Include="System" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3/HeuristicLab.Hive.Server-3.3.csproj

    r4285 r4296  
    7979  <ItemGroup>
    8080    <Reference Include="HeuristicLab.Common.Resources-3.3">
    81       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     81      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>
    8282    </Reference>
    8383    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    84       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     84      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    8585    </Reference>
    8686    <Reference Include="HeuristicLab.Tracing-3.3">
    87       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
    88     </Reference>
    89     <Reference Include="Spring.Aop">
    90       <HintPath>..\..\HeuristicLab.ExtLibs\HeuristicLab.SpringNET\1.3.0\Spring.Aop.dll</HintPath>
    91     </Reference>
    92     <Reference Include="Spring.Core">
    93       <HintPath>..\..\HeuristicLab.ExtLibs\HeuristicLab.SpringNET\1.3.0\Spring.Core.dll</HintPath>
    94     </Reference>
    95     <Reference Include="Spring.Services">
    96       <HintPath>..\..\HeuristicLab.ExtLibs\HeuristicLab.SpringNET\1.3.0\Spring.Services.dll</HintPath>
     87      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
    9788    </Reference>
    9889    <Reference Include="System" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Common/3.3/HeuristicLab.Hive.Slave.Common-3.3.csproj

    r4253 r4296  
    9393  <ItemGroup>
    9494    <Reference Include="HeuristicLab.Common-3.3">
    95       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     95      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
    9696    </Reference>
    9797    <Reference Include="HeuristicLab.Core-3.3">
    98       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     98      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
    9999    </Reference>
    100100    <Reference Include="HeuristicLab.Persistence-3.3">
    101       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
     101      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
    102102    </Reference>
    103103    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    104       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     104      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    105105    </Reference>
    106106    <Reference Include="System" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/HeuristicLab.Hive.Slave.Communication-3.3.csproj

    r4289 r4296  
    7777  <ItemGroup>
    7878    <Reference Include="HeuristicLab.Common-3.3">
    79       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     79      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
    8080    </Reference>
    8181    <Reference Include="HeuristicLab.Core-3.3">
    82       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     82      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
    8383    </Reference>
    8484    <Reference Include="HeuristicLab.DataAccess-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    8585    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    86       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     86      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    8787    </Reference>
    8888    <Reference Include="HeuristicLab.Tracing-3.3">
    89       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
     89      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
    9090    </Reference>
    9191    <Reference Include="System" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/HeuristicLab.Hive.Slave.Console-3.3.csproj

    r4253 r4296  
    7878  </PropertyGroup>
    7979  <ItemGroup>
    80     <Reference Include="HeuristicLab.Calendar-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    8180    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    82       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     81      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    8382    </Reference>
    8483    <Reference Include="System" />
     
    163162  </ItemGroup>
    164163  <ItemGroup>
     164    <ProjectReference Include="..\..\HeuristicLab.Calendar\3.3\HeuristicLab.Calendar-3.3.csproj">
     165      <Project>{D17A4D6A-4CAA-4470-8A19-F42463C021FD}</Project>
     166      <Name>HeuristicLab.Calendar-3.3</Name>
     167    </ProjectReference>
    165168    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
    166169      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
     
    169172  </ItemGroup>
    170173  <ItemGroup>
    171     <None Include="Resources\Error.png" />
    172   </ItemGroup>
    173   <ItemGroup>
    174     <None Include="Resources\Info.png" />
    175174    <None Include="Service References\SlaveService\HeuristicLab.Calendar.xsd">
    176175      <SubType>Designer</SubType>
     
    216215  <ItemGroup>
    217216    <None Include="Properties\DataSources\Calendar.Appointment.datasource" />
    218     <None Include="Resources\shutdown-icon.png" />
    219217  </ItemGroup>
    220218  <ItemGroup>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/HeuristicLab.Hive.Slave.Core-3.3.csproj

    r4292 r4296  
    7676  </PropertyGroup>
    7777  <ItemGroup>
    78     <Reference Include="HeuristicLab.Calendar-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    7978    <Reference Include="HeuristicLab.Common-3.3">
    80       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     79      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
    8180    </Reference>
    82     <Reference Include="HeuristicLab.Core-3.3" />
    83     <Reference Include="HeuristicLab.DataAccess-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     81    <Reference Include="HeuristicLab.Core-3.3">
     82      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     83    </Reference>
    8484    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    85       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     85      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    8686    </Reference>
    8787    <Reference Include="HeuristicLab.Tracing-3.3">
    88       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
     88      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
    8989    </Reference>
    9090    <Reference Include="System" />
     
    146146  </ItemGroup>
    147147  <ItemGroup>
     148    <ProjectReference Include="..\..\HeuristicLab.Calendar\3.3\HeuristicLab.Calendar-3.3.csproj">
     149      <Project>{D17A4D6A-4CAA-4470-8A19-F42463C021FD}</Project>
     150      <Name>HeuristicLab.Calendar-3.3</Name>
     151    </ProjectReference>
     152    <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
     153      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
     154      <Name>HeuristicLab.DataAccess-3.3</Name>
     155    </ProjectReference>
    148156    <ProjectReference Include="..\..\HeuristicLab.Hive.Slave.Common\3.3\HeuristicLab.Hive.Slave.Common-3.3.csproj">
    149157      <Project>{89F4BC52-C174-481E-9BD2-3814171020E8}</Project>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.ExecutionEngine/3.3/HeuristicLab.Hive.Slave.ExecutionEngine-3.3.csproj

    r4253 r4296  
    7777  <ItemGroup>
    7878    <Reference Include="HeuristicLab.Common-3.3">
    79       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     79      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
    8080    </Reference>
    81     <Reference Include="HeuristicLab.Core-3.3" />
     81    <Reference Include="HeuristicLab.Core-3.3" >
     82      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     83    </Reference>
    8284    <Reference Include="HeuristicLab.Persistence-3.3">
    83       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
     85      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
    8486    </Reference>
    8587    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    86       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     88      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    8789    </Reference>
    8890    <Reference Include="System" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Tracing/3.3/HeuristicLab.Hive.Tracing-3.3.csproj

    r4171 r4296  
    3737    </Reference>
    3838    <Reference Include="HeuristicLab.Tracing-3.3">
    39       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
     39      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Tracing-3.3.dll</HintPath>
    4040    </Reference>
    4141    <Reference Include="log4net">
    42       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\log4net.dll</HintPath>
     42      <HintPath>C:\Program Files\HeuristicLab 3.3\log4net.dll</HintPath>
    4343    </Reference>
    4444    <Reference Include="System" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/CustomPostBuild.cmd

    r4107 r4296  
    1 set target=C:\Programme\HeuristicLab 3.3
     1set target=C:\Program Files\HeuristicLab 3.3
    22
    33;copy "HeuristicLab 3.3.exe" "%target%"
     
    66
    77FOR /F "skip=1 tokens=1-2 delims=: usebackq" %%G IN ("%ProjectDir%\Files.txt") DO copy "%SolutionDir%\%%G\%Outdir%\%%H" "%target%" >nul
    8 
    98
    109echo "Platform: %Platform%, architecture: %PROCESSOR_ARCHITECTURE%"
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/Files.txt

    r4285 r4296  
    1919
    2020HeuristicLab.Hive.Server\3.3:HeuristicLab.Hive.Server-3.3.dll
    21 ;HeuristicLab.Hive.Server.ADODataAccess\3.3:HeuristicLab.Hive.Server.ADODataAccess-3.3.dll
    2221HeuristicLab.Hive.Server.Console\3.3:HeuristicLab.Hive.Server.Console-3.3.dll
    23 HeuristicLab.Hive.Server.Core\3.3:Authorization\*.xml
    2422HeuristicLab.Hive.Server.Core\3.3:HeuristicLab.Hive.Contracts-3.3.dll
    2523HeuristicLab.Hive.Server.Core\3.3:HeuristicLab.Hive.Server.Core-3.3.dll
     
    3028HeuristicLab.Hive.Tracing\3.3:HeuristicLab.Hive.Tracing-3.3.dll
    3129HeuristicLab.Hive.Tracing\3.3:HeuristicLab.Hive.log4net.xml
    32 
    33 HeuristicLab.Security.ADODataAccess\3.3:HeuristicLab.Security.ADODataAccess-3.3.dll
    34 HeuristicLab.Security.Contracts\3.3:HeuristicLab.Security.Contracts-3.3.dll
    35 HeuristicLab.Security.Core\3.3:HeuristicLab.Security.Core-3.3.dll
    36 HeuristicLab.Security.DataAccess\3.3:HeuristicLab.Security.DataAccess-3.3.dll
    37 ;HeuristicLab.Security.Server\3.3:HeuristicLab.Security.Server-3.3.dll
    38 
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/HeuristicLab.Hive-3.3.csproj

    r4170 r4296  
    5252  <ItemGroup>
    5353    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    54       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     54      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    5555    </Reference>
    5656    <Reference Include="System" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Security.ADODataAccess/3.3/HeuristicLab.Security.ADODataAccess-3.3.csproj

    r4171 r4296  
    160160  <ItemGroup>
    161161    <Reference Include="HeuristicLab.Common-3.3">
    162       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     162      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
    163163    </Reference>
    164164    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    165       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     165      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    166166    </Reference>
    167167    <Reference Include="HeuristicLab.Security.DataAccess-3.3">
    168       <HintPath>..\..\HeuristicLab.Security.DataAccess\3.3\bin\Debug\HeuristicLab.Security.DataAccess-3.3.dll</HintPath>
     168      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Security.DataAccess-3.3.dll</HintPath>
    169169    </Reference>
    170170    <Reference Include="System" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Security.Contracts/3.3/HeuristicLab.Security.Contracts-3.3.csproj

    r4171 r4296  
    114114  <ItemGroup>
    115115    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    116       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     116      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    117117    </Reference>
    118118    <Reference Include="System" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Security.Core/3.3/HeuristicLab.Security.Core-3.3.csproj

    r4171 r4296  
    9292  <ItemGroup>
    9393    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    94       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     94      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    9595    </Reference>
    9696    <Reference Include="System" />
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Security.DataAccess/3.3/HeuristicLab.Security.DataAccess-3.3.csproj

    r4171 r4296  
    122122  <ItemGroup>
    123123    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    124       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     124      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    125125    </Reference>
    126126  </ItemGroup>
  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Security.Server/3.3/HeuristicLab.Security.Server-3.3.csproj

    r4171 r4296  
    9292  <ItemGroup>
    9393    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    94       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     94      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    9595    </Reference>
    9696    <Reference Include="System" />
Note: See TracChangeset for help on using the changeset viewer.