Changeset 6712


Ignore:
Timestamp:
09/06/11 16:26:00 (8 years ago)
Author:
ascheibe
Message:

#1233

  • got db scripts up-to-date
  • renamed db related stuff back to 3.3
  • fixed a bug in the Status page that occured when the db is empty
Location:
branches/HeuristicLab.Hive-3.4/sources
Files:
2 deleted
22 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.App/3.3/HiveSlaveApplication.cs

    r6704 r6712  
    2525using System.Windows.Forms;
    2626using HeuristicLab.PluginInfrastructure;
    27 using HeuristicLab.Clients.Hive.SlaveCore.SlaveTrayIcon;
    2827using HeuristicLab.Clients.Hive.SlaveCore.Views;
    2928using System.Threading;
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/app_f005pc.config

    r6359 r6712  
    3333              name="wsHttpBinding_IHiveService">
    3434              <identity>
    35                 <certificate encodedValue="AwAAAAEAAAAUAAAAfEKvcVixnJay+q4hCPFuO0JL5TQgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMTAxOTEwNTMxNVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXwC5TGcAffd/0oAWHtm0s6YXVXEgXgb1AYmBkkkhkKIFJG/e/Z0KSYbJepmSJD44W3oOAVm+x1DAsZxU79HahDYgWCuHLMm1TLpwSmYOQ0kV3pGHWHhiWV7h7oGLds/eqZ2EOpaNGryfEPnrA4VmxY91vV5/2BTeVSWG6F8lRKQIDAQABo0kwRzBFBgNVHQEEPjA8gBAR7kBnMRHO5gzThEqda0wWoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQADgYEAoPwEG4QTDXhlxERNDfsZmM2IhEpV42ppz1kEah2oYKDa/ElIMVtvqLv6flVtg18ENN/mEJWiHZ3NyP3qr2Pip+sh+/2WBiSbOaukES/CM7OJn9kJCImH7M/xqM8pxqY8IfgM6iBVrVj9uHqj3j2BBck+cYY8fKyh3CFifMIp6ac=" />
     35                <certificate encodedValue="AwAAAAEAAAAUAAAAQkazTmWcZqFuuREaov8jmDtOu4UgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhAVedIj+0w6jEdhZErAeemyMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTExMDkwNjA4NDUzOVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCiKeSwXFm0qxkuMFao9NHftClUYvX0jpiyKFthUnutfhB2FF3Ie8a8U15M+GBYSZOV5vXlEn3D30HsV/x6L9/UU1fiJndJd5lWI2/4mP2jra0qP0b8xyitHfRhePIfpDkufZqIOvOmT/DoFqMTK3joexzuEmAw5Ugil6fbOxELlwIDAQABo0kwRzBFBgNVHQEEPjA8gBCJmAWIXCTyTFXdjdnseED4oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghAVedIj+0w6jEdhZErAeemyMAkGBSsOAwIdBQADgYEACW9nLJnu1+OJg93AAKfWqkiETHcXUcULrPjMWJQsy5fkHY1qExKBGeUJHK0REvqQs3KRY3GqikMjlAnDmb/e9P1h+PynsRv7y2zAGCnKW4nryWVncWf1xJL9xvKNuH2aR4+Wdq9oo2m793+RXtA7YTSsr/OiiIdkQcjUGQtkaYo=" />
    3636              </identity>
    3737
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.Designer.cs

    r6546 r6712  
    122122        [global::System.Configuration.UserScopedSettingAttribute()]
    123123        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    124         [global::System.Configuration.DefaultSettingValueAttribute("HeuristicLab.Clients.Hive.SlaveCore-3.4.dll")]
     124        [global::System.Configuration.DefaultSettingValueAttribute("HeuristicLab.Clients.Hive.SlaveCore-3.3.dll")]
    125125        public string ClientsHiveSlaveCoreDll {
    126126            get {
     
    134134        [global::System.Configuration.UserScopedSettingAttribute()]
    135135        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    136         [global::System.Configuration.DefaultSettingValueAttribute("HeuristicLab.Clients.Hive-3.4.dll")]
     136        [global::System.Configuration.DefaultSettingValueAttribute("HeuristicLab.Clients.Hive-3.3.dll")]
    137137        public string ClientsHiveDll {
    138138            get {
     
    146146        [global::System.Configuration.UserScopedSettingAttribute()]
    147147        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    148         [global::System.Configuration.DefaultSettingValueAttribute("HeuristicLab.Hive-3.4.dll")]
     148        [global::System.Configuration.DefaultSettingValueAttribute("HeuristicLab.Hive-3.3.dll")]
    149149        public string HiveDll {
    150150            get {
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.settings

    r6546 r6712  
    2828    </Setting>
    2929    <Setting Name="ClientsHiveSlaveCoreDll" Type="System.String" Scope="User">
    30       <Value Profile="(Default)">HeuristicLab.Clients.Hive.SlaveCore-3.4.dll</Value>
     30      <Value Profile="(Default)">HeuristicLab.Clients.Hive.SlaveCore-3.3.dll</Value>
    3131    </Setting>
    3232    <Setting Name="ClientsHiveDll" Type="System.String" Scope="User">
    33       <Value Profile="(Default)">HeuristicLab.Clients.Hive-3.4.dll</Value>
     33      <Value Profile="(Default)">HeuristicLab.Clients.Hive-3.3.dll</Value>
    3434    </Setting>
    3535    <Setting Name="HiveDll" Type="System.String" Scope="User">
    36       <Value Profile="(Default)">HeuristicLab.Hive-3.4.dll</Value>
     36      <Value Profile="(Default)">HeuristicLab.Hive-3.3.dll</Value>
    3737    </Setting>
    3838    <Setting Name="ClientsCommonDll" Type="System.String" Scope="User">
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/app_ascheibe.config

    r6546 r6712  
    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">
     
    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.Slave/3.3/app_f005pc.config

    r6546 r6712  
    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">
     
    104107      <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="AwAAAAEAAAAUAAAAfEKvcVixnJay+q4hCPFuO0JL5TQgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMTAxOTEwNTMxNVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXwC5TGcAffd/0oAWHtm0s6YXVXEgXgb1AYmBkkkhkKIFJG/e/Z0KSYbJepmSJD44W3oOAVm+x1DAsZxU79HahDYgWCuHLMm1TLpwSmYOQ0kV3pGHWHhiWV7h7oGLds/eqZ2EOpaNGryfEPnrA4VmxY91vV5/2BTeVSWG6F8lRKQIDAQABo0kwRzBFBgNVHQEEPjA8gBAR7kBnMRHO5gzThEqda0wWoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQADgYEAoPwEG4QTDXhlxERNDfsZmM2IhEpV42ppz1kEah2oYKDa/ElIMVtvqLv6flVtg18ENN/mEJWiHZ3NyP3qr2Pip+sh+/2WBiSbOaukES/CM7OJn9kJCImH7M/xqM8pxqY8IfgM6iBVrVj9uHqj3j2BBck+cYY8fKyh3CFifMIp6ac="/>
     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.Slave/3.3/app_services.config

    r6546 r6712  
    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">
     
    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/3.3/HeuristicLab.Clients.Hive-3.3.csproj

    r6701 r6712  
    171171    <Compile Include="ServiceClients\Job.cs" />
    172172    <Compile Include="ServiceLocator.cs" />
    173     <Compile Include="Properties\Settings.Designer.cs">
    174       <AutoGen>True</AutoGen>
    175       <DesignTimeSharedInput>True</DesignTimeSharedInput>
    176       <DependentUpon>Settings.settings</DependentUpon>
    177     </Compile>
    178173    <None Include="app_ascheibe.config" />
    179174    <None Include="HeuristicLab.snk" />
    180175    <None Include="ServiceClients\GenerateServiceClients.cmd" />
    181     <None Include="Properties\Settings.settings">
    182       <Generator>PublicSettingsSingleFileGenerator</Generator>
    183       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
    184     </None>
    185176  </ItemGroup>
    186177  <ItemGroup />
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/app_f005pc.config

    r6168 r6712  
    3535      <endpoint address="http://localhost/Hive-3.4/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_IHiveService" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService">
    3636        <identity>
    37           <certificate encodedValue="AwAAAAEAAAAUAAAAfEKvcVixnJay+q4hCPFuO0JL5TQgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMTAxOTEwNTMxNVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXwC5TGcAffd/0oAWHtm0s6YXVXEgXgb1AYmBkkkhkKIFJG/e/Z0KSYbJepmSJD44W3oOAVm+x1DAsZxU79HahDYgWCuHLMm1TLpwSmYOQ0kV3pGHWHhiWV7h7oGLds/eqZ2EOpaNGryfEPnrA4VmxY91vV5/2BTeVSWG6F8lRKQIDAQABo0kwRzBFBgNVHQEEPjA8gBAR7kBnMRHO5gzThEqda0wWoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQADgYEAoPwEG4QTDXhlxERNDfsZmM2IhEpV42ppz1kEah2oYKDa/ElIMVtvqLv6flVtg18ENN/mEJWiHZ3NyP3qr2Pip+sh+/2WBiSbOaukES/CM7OJn9kJCImH7M/xqM8pxqY8IfgM6iBVrVj9uHqj3j2BBck+cYY8fKyh3CFifMIp6ac="/>
     37          <certificate encodedValue="AwAAAAEAAAAUAAAAQkazTmWcZqFuuREaov8jmDtOu4UgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhAVedIj+0w6jEdhZErAeemyMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTExMDkwNjA4NDUzOVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCiKeSwXFm0qxkuMFao9NHftClUYvX0jpiyKFthUnutfhB2FF3Ie8a8U15M+GBYSZOV5vXlEn3D30HsV/x6L9/UU1fiJndJd5lWI2/4mP2jra0qP0b8xyitHfRhePIfpDkufZqIOvOmT/DoFqMTK3joexzuEmAw5Ugil6fbOxELlwIDAQABo0kwRzBFBgNVHQEEPjA8gBCJmAWIXCTyTFXdjdnseED4oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghAVedIj+0w6jEdhZErAeemyMAkGBSsOAwIdBQADgYEACW9nLJnu1+OJg93AAKfWqkiETHcXUcULrPjMWJQsy5fkHY1qExKBGeUJHK0REvqQs3KRY3GqikMjlAnDmb/e9P1h+PynsRv7y2zAGCnKW4nryWVncWf1xJL9xvKNuH2aR4+Wdq9oo2m793+RXtA7YTSsr/OiiIdkQcjUGQtkaYo="/>
    3838        </identity>
    3939      </endpoint>
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive 3.4.sln

    r6704 r6712  
    4949    Release.AspNetCompiler.FixedNames = "false"
    5050    Release.AspNetCompiler.Debug = "False"
    51     VWDPort = "49532"
     51    VWDPort = "4591"
     52    VWDVirtualPath = "/Hive-3.4"
    5253    DefaultWebSiteLanguage = "Visual C#"
    5354  EndProjectSection
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.3/Tests/app.config

    r6358 r6712  
    99  </configSections>
    1010  <connectionStrings>
    11     <add name="HeuristicLab.Services.Hive.DataAccess.Properties.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.4;Integrated Security=True;" providerName="System.Data.SqlClient" />
     11    <add name="HeuristicLab.Services.Hive.DataAccess.Properties.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;" providerName="System.Data.SqlClient" />
    1212  </connectionStrings>
    1313  <!-- [chn] TODO: system.web should be located in HeuristicLab.Hive.Server.Core/app.config, but the ConfigMerger does not merge system.web (yet) -->
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.3/Tests/app_services.config

    r6358 r6712  
    99  </configSections>
    1010  <connectionStrings>
    11     <add name="HeuristicLab.Services.Hive.DataAccess.Properties.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.4;Integrated Security=True;" providerName="System.Data.SqlClient" />
     11    <add name="HeuristicLab.Services.Hive.DataAccess.Properties.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;" providerName="System.Data.SqlClient" />
    1212  </connectionStrings>
    1313  <!-- [chn] TODO: system.web should be located in HeuristicLab.Hive.Server.Core/app.config, but the ConfigMerger does not merge system.web (yet) -->
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Initialize Hive Database.sql

    r6698 r6712  
    1 USE [HeuristicLab.Hive-3.4]
     1USE [HeuristicLab.Hive-3.3]
    22/* create and initialize hive database tables */
    33
     
    66  [ResourceId] UniqueIdentifier NOT NULL,
    77  [JobId] UniqueIdentifier NOT NULL,   
    8   CONSTRAINT [PK_dbo.ResourceId] PRIMARY KEY ([ResourceId]),
    9   CONSTRAINT [PK_dbo.JobId] PRIMARY KEY ([JobId])
     8  CONSTRAINT [PK_dbo.ResourceIdJobId] PRIMARY KEY ([ResourceId], [JobId])
    109  )
    1110CREATE TABLE [dbo].[Plugin](
     
    5958  CONSTRAINT [PK_dbo.Job] PRIMARY KEY ([JobId])
    6059  )
    61 CREATE TABLE [dbo].[UptimeCalendar](
    62   [UptimeCalendarId] UniqueIdentifier,
     60CREATE TABLE [dbo].[Downtime](
     61  [DowntimeId] UniqueIdentifier,
    6362  [ResourceId] UniqueIdentifier,
    6463  [StartDate] DateTime,
     
    6766  [Recurring] Bit,
    6867  [RecurringId] UniqueIdentifier,
    69   CONSTRAINT [PK_dbo.UptimeCalendar] PRIMARY KEY ([UptimeCalendarId])
     68  CONSTRAINT [PK_dbo.Downtime] PRIMARY KEY ([DowntimeId])
    7069  )
    7170CREATE TABLE [dbo].[HiveExperiment](
     
    161160ALTER TABLE [dbo].[Job]
    162161  ADD CONSTRAINT [HiveExperiment_Job] FOREIGN KEY ([HiveExperimentId]) REFERENCES [dbo].[HiveExperiment]([HiveExperimentId])
    163 ALTER TABLE [dbo].[UptimeCalendar]
    164   ADD CONSTRAINT [Resource_UptimeCalendar] FOREIGN KEY ([ResourceId]) REFERENCES [dbo].[Resource]([ResourceId])
     162ALTER TABLE [dbo].[Downtime]
     163  ADD CONSTRAINT [Resource_Downtime] FOREIGN KEY ([ResourceId]) REFERENCES [dbo].[Resource]([ResourceId])
    165164ALTER TABLE [dbo].[JobData]
    166165  ADD CONSTRAINT [Job_JobData] FOREIGN KEY ([JobId]) REFERENCES [dbo].[Job]([JobId])
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Prepare Hive Database.sql

    r6698 r6712  
    1 USE [HeuristicLab.Hive-3.4]
     1USE [HeuristicLab.Hive-3.3]
    22/* this script is supposed to be executed after the plain DB is generated by the linq-to-sql schema */
    33/* adds default values */
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Query Daily Statistics.sql

    r6688 r6712  
    99      ,MAX([ExecutionTimeFinished]) AS [ExecutionTimeFinished]
    1010      ,MAX([StartToEndTimeFinished]) AS [StartToEndTimeFinished]
    11   FROM [HeuristicLab.Hive-3.4].[dbo].[view_Statistics]
     11  FROM [HeuristicLab.Hive-3.3].[dbo].[view_Statistics]
    1212  GROUP BY CONVERT(VARCHAR(10), [DateTime], 104)
    1313  ORDER BY CONVERT(VARCHAR(10), [DateTime], 104) DESC
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Query Jobs.sql

    r6688 r6712  
    1818      , he.HiveExperimentId
    1919  FROM
    20   [HeuristicLab.Hive-3.4].[dbo].[Job] j
    21   ,[HeuristicLab.Hive-3.4].[dbo].[HiveExperiment] he
     20  [HeuristicLab.Hive-3.3].[dbo].[Job] j
     21  ,[HeuristicLab.Hive-3.3].[dbo].[HiveExperiment] he
    2222  ,[HeuristicLab.Authentication].dbo.aspnet_Users u
    23   ,[HeuristicLab.Hive-3.4].dbo.JobData jd
     23  ,[HeuristicLab.Hive-3.3].dbo.JobData jd
    2424  WHERE
    2525  j.HiveExperimentId = he.HiveExperimentId
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Query Statistics.sql

    r6688 r6712  
    88      ,[ExecutionTimeFinished]
    99      ,[StartToEndTimeFinished]
    10   FROM [HeuristicLab.Hive-3.4].[dbo].[view_Statistics]
     10  FROM [HeuristicLab.Hive-3.3].[dbo].[view_Statistics]
    1111  --WHERE [DateTime] > '2011-06-24 14:30'
    1212  ORDER BY [DateTime] DESC
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Settings.Designer.cs

    r6452 r6712  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:4.0.30319.225
     4//     Runtime Version:4.0.30319.235
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
     
    2727        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    2828        [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
    29         [global::System.Configuration.DefaultSettingValueAttribute("Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.4;Integrated Security=T" +
     29        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=T" +
    3030            "rue;")]
    3131        public string HeuristicLab_Hive_LinqConnectionString {
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Settings.settings

    r6452 r6712  
    11<?xml version='1.0' encoding='utf-8'?>
    2 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="HeuristicLab.Services.Hive.DataAccess.Properties" GeneratedClassName="Settings">
     2<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="HeuristicLab.Services.Hive.DataAccess" GeneratedClassName="Settings">
    33  <Profiles />
    44  <Settings>
     
    66      <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
    77&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
    8   &lt;ConnectionString&gt;Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.4;Integrated Security=True;&lt;/ConnectionString&gt;
     8  &lt;ConnectionString&gt;Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;&lt;/ConnectionString&gt;
    99  &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
    1010&lt;/SerializableConnectionString&gt;</DesignTimeValue>
    11       <Value Profile="(Default)">Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.4;Integrated Security=True;</Value>
     11      <Value Profile="(Default)">Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;</Value>
    1212    </Setting>
    1313    <Setting Name="LongRunningDatabaseCommandTimeout" Type="System.TimeSpan" Scope="Application">
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/app.config

    r6452 r6712  
    66    </sectionGroup>
    77  </configSections>
    8   <connectionStrings>
    9     <add name="HeuristicLab.Services.Hive.DataAccess.Properties.Settings.HeuristicLab_Hive_LinqConnectionString"
    10       connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.4;Integrated Security=True;"
     8  <connectionStrings>   
     9    <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString"
     10      connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;"
    1111      providerName="System.Data.SqlClient" />
    1212  </connectionStrings>
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/HeuristicLab 3.3.exe.config

    r6167 r6712  
    1010  <connectionStrings>
    1111    <add name="HeuristicLab.Authentication" connectionString="data source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
    12     <add name="HeuristicLab.Services.Hive.DataAccess.Properties.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.4;Integrated Security=True;" providerName="System.Data.SqlClient" />
     12    <add name="HeuristicLab.Services.Hive.DataAccess.Properties.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;" providerName="System.Data.SqlClient" />
    1313  </connectionStrings>
    1414  <!-- [chn] TODO: system.web should be located in HeuristicLab.Hive.Server.Core/app.config, but the ConfigMerger does not merge system.web (yet) -->
     
    9797      <endpoint address="http://localhost:80/Service.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService">
    9898        <identity>
    99           <certificate encodedValue="AwAAAAEAAAAUAAAAfEKvcVixnJay+q4hCPFuO0JL5TQgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMTAxOTEwNTMxNVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXwC5TGcAffd/0oAWHtm0s6YXVXEgXgb1AYmBkkkhkKIFJG/e/Z0KSYbJepmSJD44W3oOAVm+x1DAsZxU79HahDYgWCuHLMm1TLpwSmYOQ0kV3pGHWHhiWV7h7oGLds/eqZ2EOpaNGryfEPnrA4VmxY91vV5/2BTeVSWG6F8lRKQIDAQABo0kwRzBFBgNVHQEEPjA8gBAR7kBnMRHO5gzThEqda0wWoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghCNN5wrUcXMmE/9xwp4TYa9MAkGBSsOAwIdBQADgYEAoPwEG4QTDXhlxERNDfsZmM2IhEpV42ppz1kEah2oYKDa/ElIMVtvqLv6flVtg18ENN/mEJWiHZ3NyP3qr2Pip+sh+/2WBiSbOaukES/CM7OJn9kJCImH7M/xqM8pxqY8IfgM6iBVrVj9uHqj3j2BBck+cYY8fKyh3CFifMIp6ac=" />
     99          <certificate encodedValue="AwAAAAEAAAAUAAAAQkazTmWcZqFuuREaov8jmDtOu4UgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhAVedIj+0w6jEdhZErAeemyMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTExMDkwNjA4NDUzOVoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCiKeSwXFm0qxkuMFao9NHftClUYvX0jpiyKFthUnutfhB2FF3Ie8a8U15M+GBYSZOV5vXlEn3D30HsV/x6L9/UU1fiJndJd5lWI2/4mP2jra0qP0b8xyitHfRhePIfpDkufZqIOvOmT/DoFqMTK3joexzuEmAw5Ugil6fbOxELlwIDAQABo0kwRzBFBgNVHQEEPjA8gBCJmAWIXCTyTFXdjdnseED4oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghAVedIj+0w6jEdhZErAeemyMAkGBSsOAwIdBQADgYEACW9nLJnu1+OJg93AAKfWqkiETHcXUcULrPjMWJQsy5fkHY1qExKBGeUJHK0REvqQs3KRY3GqikMjlAnDmb/e9P1h+PynsRv7y2zAGCnKW4nryWVncWf1xJL9xvKNuH2aR4+Wdq9oo2m793+RXtA7YTSsr/OiiIdkQcjUGQtkaYo=" />
    100100        </identity>
    101101      </endpoint>
  • branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Web/Hive-3.4/Status.aspx.cs

    r6478 r6712  
    4949    var firstStatisticsDate = DateTime.Parse("2011-05-24 17:16:40");
    5050    var statisticsSince = DateTime.Now - firstStatisticsDate;
    51     totalExecutionTimeLabel.Text = new TimeSpan(stats.Last().UserStatistics.Sum(x => x.ExecutionTime.Ticks)).ToString() + " (since " + Math.Round(statisticsSince.TotalDays, 2) + " days)";
     51    if (stats.Length != 0) {
     52      totalExecutionTimeLabel.Text = new TimeSpan(stats.Last().UserStatistics.Sum(x => x.ExecutionTime.Ticks)).ToString() + " (since " + Math.Round(statisticsSince.TotalDays, 2) + " days)";
     53    } else {
     54      totalExecutionTimeLabel.Text = "00:00:00.00";
     55    }
    5256   
    5357    for (int i = 0; i < stats.Length; i++) {
Note: See TracChangeset for help on using the changeset viewer.