Changeset 4794


Ignore:
Timestamp:
11/15/10 13:43:07 (9 years ago)
Author:
cneumuel
Message:

#1260 configured ExperimentManager project to be buildable and compatible with services.heuristiclab.com

Location:
branches/HeuristicLab.Hive.ExperimentManager
Files:
10 added
3 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Hive.ExperimentManager/HeuristicLab.Hive.ExperimentManager.Views/3.3/HeuristicLab.Hive.ExperimentManager.Views-3.3.csproj

    r4760 r4794  
    9898      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
    9999    </Reference>
     100    <Reference Include="HeuristicLab.DataAccess-3.3">
     101      <HintPath>..\..\Bin\HeuristicLab.DataAccess-3.3.dll</HintPath>
     102    </Reference>
     103    <Reference Include="HeuristicLab.Hive.Contracts-3.3">
     104      <HintPath>..\..\Bin\HeuristicLab.Hive.Contracts-3.3.dll</HintPath>
     105    </Reference>
     106    <Reference Include="HeuristicLab.Hive.JobBase-3.3">
     107      <HintPath>..\..\Bin\HeuristicLab.Hive.JobBase-3.3.dll</HintPath>
     108    </Reference>
     109    <Reference Include="HeuristicLab.Hive.Tracing-3.3">
     110      <HintPath>..\..\Bin\HeuristicLab.Hive.Tracing-3.3.dll</HintPath>
     111    </Reference>
    100112    <Reference Include="HeuristicLab.MainForm-3.3">
    101113      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm-3.3.dll</HintPath>
     
    188200    <None Include="HeuristicLab.snk" />
    189201    <None Include="Properties\AssemblyInfo.frame" />
    190   </ItemGroup>
    191   <ItemGroup>
    192     <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
    193       <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
    194       <Name>HeuristicLab.DataAccess-3.3</Name>
    195     </ProjectReference>
    196     <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
    197       <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
    198       <Name>HeuristicLab.Hive.Contracts-3.3</Name>
    199     </ProjectReference>
     202    <None Include="UpdateLocalInstallation.cmd" />
     203  </ItemGroup>
     204  <ItemGroup>
    200205    <ProjectReference Include="..\..\HeuristicLab.Hive.ExperimentManager\3.3\HeuristicLab.Hive.ExperimentManager-3.3.csproj">
    201206      <Project>{A84C0A25-13D0-40A6-924F-53556D9691DC}</Project>
    202207      <Name>HeuristicLab.Hive.ExperimentManager-3.3</Name>
    203     </ProjectReference>
    204     <ProjectReference Include="..\..\HeuristicLab.Hive.JobBase\3.3\HeuristicLab.Hive.JobBase-3.3.csproj">
    205       <Project>{21187322-52DD-4243-80A4-A85F0263E63B}</Project>
    206       <Name>HeuristicLab.Hive.JobBase-3.3</Name>
    207208    </ProjectReference>
    208209  </ItemGroup>
     
    237238
    238239call PreBuildEvent.cmd</PreBuildEvent>
     240  </PropertyGroup>
     241  <PropertyGroup>
     242    <PostBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     243set ProjectDir=$(ProjectDir)
     244set SolutionDir=$(SolutionDir)
     245set Outdir=$(Outdir)
     246
     247call UpdateLocalInstallation.cmd</PostBuildEvent>
    239248  </PropertyGroup>
    240249  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • branches/HeuristicLab.Hive.ExperimentManager/HeuristicLab.Hive.ExperimentManager/3.3/HeuristicLab.Hive.ExperimentManager-3.3.csproj

    r4769 r4794  
    9595      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
    9696    </Reference>
     97    <Reference Include="HeuristicLab.DataAccess-3.3">
     98      <HintPath>..\..\Bin\HeuristicLab.DataAccess-3.3.dll</HintPath>
     99    </Reference>
     100    <Reference Include="HeuristicLab.Hive.Contracts-3.3">
     101      <HintPath>..\..\Bin\HeuristicLab.Hive.Contracts-3.3.dll</HintPath>
     102    </Reference>
     103    <Reference Include="HeuristicLab.Hive.JobBase-3.3">
     104      <HintPath>..\..\Bin\HeuristicLab.Hive.JobBase-3.3.dll</HintPath>
     105    </Reference>
     106    <Reference Include="HeuristicLab.Hive.Tracing-3.3">
     107      <HintPath>..\..\Bin\HeuristicLab.Hive.Tracing-3.3.dll</HintPath>
     108    </Reference>
    97109    <Reference Include="HeuristicLab.Optimization-3.3">
    98110      <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
     
    142154      <SubType>Designer</SubType>
    143155    </None>
     156    <None Include="HeuristicLab 3.3.exe.config">
     157      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     158    </None>
    144159    <None Include="Jobs.cd" />
    145160    <None Include="HeuristicLab.snk" />
     
    150165    </None>
    151166    <None Include="Tools\RecreateServiceConfig.bat" />
    152   </ItemGroup>
    153   <ItemGroup>
    154     <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
    155       <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
    156       <Name>HeuristicLab.DataAccess-3.3</Name>
    157     </ProjectReference>
    158     <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
    159       <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
    160       <Name>HeuristicLab.Hive.Contracts-3.3</Name>
    161     </ProjectReference>
    162     <ProjectReference Include="..\..\HeuristicLab.Hive.JobBase\3.3\HeuristicLab.Hive.JobBase-3.3.csproj">
    163       <Project>{21187322-52DD-4243-80A4-A85F0263E63B}</Project>
    164       <Name>HeuristicLab.Hive.JobBase-3.3</Name>
    165     </ProjectReference>
    166     <ProjectReference Include="..\..\HeuristicLab.Hive.Tracing\3.3\HeuristicLab.Hive.Tracing-3.3.csproj">
    167       <Project>{CDAD2510-299C-4FA2-B351-9D71A5AF20B7}</Project>
    168       <Name>HeuristicLab.Hive.Tracing-3.3</Name>
    169     </ProjectReference>
     167    <None Include="UpdateLocalInstallation.cmd" />
    170168  </ItemGroup>
    171169  <ItemGroup>
     
    181179call PreBuildEvent.cmd</PreBuildEvent>
    182180  </PropertyGroup>
     181  <PropertyGroup>
     182    <PostBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     183set ProjectDir=$(ProjectDir)
     184set SolutionDir=$(SolutionDir)
     185set Outdir=$(Outdir)
     186
     187call UpdateLocalInstallation.cmd
     188call MergeConfigs.cmd</PostBuildEvent>
     189  </PropertyGroup>
    183190  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    184191       Other similar extension points exist, see Microsoft.Common.targets.
  • branches/HeuristicLab.Hive.ExperimentManager/HeuristicLab.Hive.ExperimentManager/3.3/app.config

    r4760 r4794  
    1313      </setting>
    1414      <setting name="HiveUsername" serializeAs="String">
    15         <value>cneumuel</value>
     15        <value></value>
    1616      </setting>
    1717      <setting name="HivePassword" serializeAs="String">
     
    1919      </setting>
    2020    </HeuristicLab.Hive.ExperimentManager.Properties.Settings>
    21     <HeuristicLab.Hive.Experiment.Properties.Settings>
    22       <setting name="ResourceIds" serializeAs="String">
    23         <value>HEAL</value>
    24       </setting>
    25       <setting name="HiveUsername" serializeAs="String">
    26         <value>cneumuel</value>
    27       </setting>
    28       <setting name="HivePassword" serializeAs="String">
    29         <value />
    30       </setting>
    31     </HeuristicLab.Hive.Experiment.Properties.Settings>
    3221  </userSettings>
    3322  <system.serviceModel>
     
    5645    </bindings>
    5746    <client>
    58       <endpoint address="net.tcp://localhost:9001/Hive/ClientService.svc" behaviorConfiguration="ClientServiceBehaviour" binding="netTcpBinding" bindingConfiguration="ClientTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" name="ClientTcpStreamedEndpoint">
     47      <endpoint address="net.tcp://services.heuristiclab.com:8000/Hive-3.3/ClientService.svc" behaviorConfiguration="ClientServiceBehaviour" binding="netTcpBinding" bindingConfiguration="ClientTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" name="ClientTcpStreamedEndpoint">
    5948        <identity>
    60           <dns value="localhost"/>
     49          <dns value="services.heuristiclab.com"/>
    6150        </identity>
    6251      </endpoint>
    63       <endpoint address="http://localhost:9000/Hive/ClientService.svc" binding="wsHttpBinding" behaviorConfiguration="ClientServiceBehaviour" bindingConfiguration="ClientHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" name="ClientHttpEndpoint">
     52      <endpoint address="http://services.heuristiclab.com/Hive-3.3/ClientService.svc" binding="wsHttpBinding" behaviorConfiguration="ClientServiceBehaviour" bindingConfiguration="ClientHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" name="ClientHttpEndpoint">
    6453        <identity>
    65           <certificate encodedValue="AwAAAAEAAAAUAAAAfEKvcVixnJay+q4hCPFuO0JL5TQgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMTAxOTEwNTMxNVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXwC5TGcAffd/0oAWHtm0s6YXVXEgXgb1AYmBkkkhkKIFJG/e/Z0KSYbJepmSJD44W3oOAVm+x1DAsZxU79HahDYgWCuHLMm1TLpwSmYOQ0kV3pGHWHhiWV7h7oGLds/eqZ2EOpaNGryfEPnrA4VmxY91vV5/2BTeVSWG6F8lRKQIDAQABo0kwRzBFBgNVHQEEPjA8gBAR7kBnMRHO5gzThEqda0wWoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQADgYEAoPwEG4QTDXhlxERNDfsZmM2IhEpV42ppz1kEah2oYKDa/ElIMVtvqLv6flVtg18ENN/mEJWiHZ3NyP3qr2Pip+sh+/2WBiSbOaukES/CM7OJn9kJCImH7M/xqM8pxqY8IfgM6iBVrVj9uHqj3j2BBck+cYY8fKyh3CFifMIp6ac="/>
     54          <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>
    6655        </identity>
    6756      </endpoint>
Note: See TracChangeset for help on using the changeset viewer.