Changeset 4794

Timestamp:

11/15/10 13:43:07 (14 years ago)

Author:

cneumuel

Message:

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

Location:

branches/HeuristicLab.Hive.ExperimentManager

Files:

• Bin (added)
• Bin/HeuristicLab.DataAccess-3.3.dll (added)
• Bin/HeuristicLab.Hive.Contracts-3.3.dll (added)
• Bin/HeuristicLab.Hive.JobBase-3.3.dll (added)
• Bin/HeuristicLab.Hive.Tracing-3.3.dll (added)
• HeuristicLab 3.3.vsmdi (deleted)
• HeuristicLab.Hive 3.3.sln (deleted)
• HeuristicLab.Hive.ExperimentManager 3.3.sln (added)
• HeuristicLab.Hive.ExperimentManager.Views/3.3/HeuristicLab.Hive.ExperimentManager.Views-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Hive.ExperimentManager.Views/3.3/UpdateLocalInstallation.cmd (added)
• HeuristicLab.Hive.ExperimentManager/3.3/HeuristicLab 3.3.exe.config (added)
• HeuristicLab.Hive.ExperimentManager/3.3/HeuristicLab.Hive.ExperimentManager-3.3.csproj (modified) (4 diffs)
• HeuristicLab.Hive.ExperimentManager/3.3/UpdateLocalInstallation.cmd (added)
• HeuristicLab.Hive.ExperimentManager/3.3/app.config (modified) (3 diffs)
• LocalTestRun.testrunconfig (deleted)
• MergeConfigs.cmd (added)

branches/HeuristicLab.Hive.ExperimentManager/HeuristicLab.Hive.ExperimentManager.Views/3.3/HeuristicLab.Hive.ExperimentManager.Views-3.3.csproj

@@ -98 +98 @@
       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.DataAccess-3.3">
+      <HintPath>..\..\Bin\HeuristicLab.DataAccess-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Hive.Contracts-3.3">
+      <HintPath>..\..\Bin\HeuristicLab.Hive.Contracts-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Hive.JobBase-3.3">
+      <HintPath>..\..\Bin\HeuristicLab.Hive.JobBase-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Hive.Tracing-3.3">
+      <HintPath>..\..\Bin\HeuristicLab.Hive.Tracing-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.MainForm-3.3">
       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm-3.3.dll</HintPath>
@@ -188 +200 @@
     <None Include="HeuristicLab.snk" />
     <None Include="Properties\AssemblyInfo.frame" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
-      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
-      <Name>HeuristicLab.DataAccess-3.3</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
-      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
-      <Name>HeuristicLab.Hive.Contracts-3.3</Name>
-    </ProjectReference>
+    <None Include="UpdateLocalInstallation.cmd" />
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include="..\..\HeuristicLab.Hive.ExperimentManager\3.3\HeuristicLab.Hive.ExperimentManager-3.3.csproj">
       <Project>{A84C0A25-13D0-40A6-924F-53556D9691DC}</Project>
       <Name>HeuristicLab.Hive.ExperimentManager-3.3</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Hive.JobBase\3.3\HeuristicLab.Hive.JobBase-3.3.csproj">
-      <Project>{21187322-52DD-4243-80A4-A85F0263E63B}</Project>
-      <Name>HeuristicLab.Hive.JobBase-3.3</Name>
     </ProjectReference>
   </ItemGroup>
@@ -237 +238 @@
 
 call PreBuildEvent.cmd</PreBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+set ProjectDir=$(ProjectDir)
+set SolutionDir=$(SolutionDir)
+set Outdir=$(Outdir)
+
+call UpdateLocalInstallation.cmd</PostBuildEvent>
   </PropertyGroup>
   <!-- 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

@@ -95 +95 @@
       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.DataAccess-3.3">
+      <HintPath>..\..\Bin\HeuristicLab.DataAccess-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Hive.Contracts-3.3">
+      <HintPath>..\..\Bin\HeuristicLab.Hive.Contracts-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Hive.JobBase-3.3">
+      <HintPath>..\..\Bin\HeuristicLab.Hive.JobBase-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Hive.Tracing-3.3">
+      <HintPath>..\..\Bin\HeuristicLab.Hive.Tracing-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.Optimization-3.3">
       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
@@ -142 +154 @@
       <SubType>Designer</SubType>
     </None>
+    <None Include="HeuristicLab 3.3.exe.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Jobs.cd" />
     <None Include="HeuristicLab.snk" />
@@ -150 +165 @@
     </None>
     <None Include="Tools\RecreateServiceConfig.bat" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
-      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
-      <Name>HeuristicLab.DataAccess-3.3</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
-      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
-      <Name>HeuristicLab.Hive.Contracts-3.3</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Hive.JobBase\3.3\HeuristicLab.Hive.JobBase-3.3.csproj">
-      <Project>{21187322-52DD-4243-80A4-A85F0263E63B}</Project>
-      <Name>HeuristicLab.Hive.JobBase-3.3</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Hive.Tracing\3.3\HeuristicLab.Hive.Tracing-3.3.csproj">
-      <Project>{CDAD2510-299C-4FA2-B351-9D71A5AF20B7}</Project>
-      <Name>HeuristicLab.Hive.Tracing-3.3</Name>
-    </ProjectReference>
+    <None Include="UpdateLocalInstallation.cmd" />
   </ItemGroup>
   <ItemGroup>
@@ -181 +179 @@
 call PreBuildEvent.cmd</PreBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+set ProjectDir=$(ProjectDir)
+set SolutionDir=$(SolutionDir)
+set Outdir=$(Outdir)
+
+call UpdateLocalInstallation.cmd
+call MergeConfigs.cmd</PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

branches/HeuristicLab.Hive.ExperimentManager/HeuristicLab.Hive.ExperimentManager/3.3/app.config

@@ -13 +13 @@
       </setting>
       <setting name="HiveUsername" serializeAs="String">
-        <value>cneumuel</value>
+        <value></value>
       </setting>
       <setting name="HivePassword" serializeAs="String">
@@ -19 +19 @@
       </setting>
     </HeuristicLab.Hive.ExperimentManager.Properties.Settings>
-    <HeuristicLab.Hive.Experiment.Properties.Settings>
-      <setting name="ResourceIds" serializeAs="String">
-        <value>HEAL</value>
-      </setting>
-      <setting name="HiveUsername" serializeAs="String">
-        <value>cneumuel</value>
-      </setting>
-      <setting name="HivePassword" serializeAs="String">
-        <value />
-      </setting>
-    </HeuristicLab.Hive.Experiment.Properties.Settings>
   </userSettings>
   <system.serviceModel>
@@ -56 +45 @@
     </bindings>
     <client>
-      <endpoint address="net.tcp://localhost:9001/Hive/ClientService.svc" behaviorConfiguration="ClientServiceBehaviour" binding="netTcpBinding" bindingConfiguration="ClientTcpStreamedEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" name="ClientTcpStreamedEndpoint">
+      <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">
         <identity>
-          <dns value="localhost"/>
+          <dns value="services.heuristiclab.com"/>
         </identity>
       </endpoint>
-      <endpoint address="http://localhost:9000/Hive/ClientService.svc" binding="wsHttpBinding" behaviorConfiguration="ClientServiceBehaviour" bindingConfiguration="ClientHttpEndpoint" contract="HeuristicLab.Hive.Contracts.Interfaces.IClientFacade" name="ClientHttpEndpoint">
+      <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">
         <identity>
-          <certificate encodedValue="AwAAAAEAAAAUAAAAfEKvcVixnJay+q4hCPFuO0JL5TQgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMTAxOTEwNTMxNVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXwC5TGcAffd/0oAWHtm0s6YXVXEgXgb1AYmBkkkhkKIFJG/e/Z0KSYbJepmSJD44W3oOAVm+x1DAsZxU79HahDYgWCuHLMm1TLpwSmYOQ0kV3pGHWHhiWV7h7oGLds/eqZ2EOpaNGryfEPnrA4VmxY91vV5/2BTeVSWG6F8lRKQIDAQABo0kwRzBFBgNVHQEEPjA8gBAR7kBnMRHO5gzThEqda0wWoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQADgYEAoPwEG4QTDXhlxERNDfsZmM2IhEpV42ppz1kEah2oYKDa/ElIMVtvqLv6flVtg18ENN/mEJWiHZ3NyP3qr2Pip+sh+/2WBiSbOaukES/CM7OJn9kJCImH7M/xqM8pxqY8IfgM6iBVrVj9uHqj3j2BBck+cYY8fKyh3CFifMIp6ac="/>
+          <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>
         </identity>
       </endpoint>