Changeset 6712
- Timestamp:
- 09/06/11 16:26:00 (13 years ago)
- 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 25 25 using System.Windows.Forms; 26 26 using HeuristicLab.PluginInfrastructure; 27 using HeuristicLab.Clients.Hive.SlaveCore.SlaveTrayIcon;28 27 using HeuristicLab.Clients.Hive.SlaveCore.Views; 29 28 using System.Threading; -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/app_f005pc.config
r6359 r6712 33 33 name="wsHttpBinding_IHiveService"> 34 34 <identity> 35 <certificate encodedValue="AwAAAAEAAAAUAAAA fEKvcVixnJay+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=" /> 36 36 </identity> 37 37 -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.Designer.cs
r6546 r6712 122 122 [global::System.Configuration.UserScopedSettingAttribute()] 123 123 [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")] 125 125 public string ClientsHiveSlaveCoreDll { 126 126 get { … … 134 134 [global::System.Configuration.UserScopedSettingAttribute()] 135 135 [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")] 137 137 public string ClientsHiveDll { 138 138 get { … … 146 146 [global::System.Configuration.UserScopedSettingAttribute()] 147 147 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 148 [global::System.Configuration.DefaultSettingValueAttribute("HeuristicLab.Hive-3. 4.dll")]148 [global::System.Configuration.DefaultSettingValueAttribute("HeuristicLab.Hive-3.3.dll")] 149 149 public string HiveDll { 150 150 get { -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.settings
r6546 r6712 28 28 </Setting> 29 29 <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> 31 31 </Setting> 32 32 <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> 34 34 </Setting> 35 35 <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> 37 37 </Setting> 38 38 <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 10 10 </sectionGroup> 11 11 </configSections> 12 <startup> 13 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/> 14 </startup> 12 15 <userSettings> 13 16 <HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings> … … 37 40 </setting> 38 41 <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> 40 43 </setting> 41 44 <setting name="ClientsHiveDll" serializeAs="String"> 42 <value>HeuristicLab.Clients.Hive-3. 4.dll</value>45 <value>HeuristicLab.Clients.Hive-3.3.dll</value> 43 46 </setting> 44 47 <setting name="HiveDll" serializeAs="String"> 45 <value>HeuristicLab.Hive-3. 4.dll</value>48 <value>HeuristicLab.Hive-3.3.dll</value> 46 49 </setting> 47 50 <setting name="ClientsCommonDll" serializeAs="String"> … … 109 112 </client> 110 113 </system.serviceModel> 111 112 <startup>113 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>114 </startup>115 114 </configuration> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/app_f005pc.config
r6546 r6712 10 10 </sectionGroup> 11 11 </configSections> 12 <startup> 13 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/> 14 </startup> 12 15 <userSettings> 13 16 <HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings> … … 37 40 </setting> 38 41 <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> 40 43 </setting> 41 44 <setting name="ClientsHiveDll" serializeAs="String"> 42 <value>HeuristicLab.Clients.Hive-3. 4.dll</value>45 <value>HeuristicLab.Clients.Hive-3.3.dll</value> 43 46 </setting> 44 47 <setting name="HiveDll" serializeAs="String"> 45 <value>HeuristicLab.Hive-3. 4.dll</value>48 <value>HeuristicLab.Hive-3.3.dll</value> 46 49 </setting> 47 50 <setting name="ClientsCommonDll" serializeAs="String"> … … 104 107 <endpoint address="http://localhost/Hive-3.4/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService"> 105 108 <identity> 106 <certificate encodedValue="AwAAAAEAAAAUAAAA fEKvcVixnJay+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="/> 107 110 </identity> 108 111 </endpoint> 109 112 </client> 110 113 </system.serviceModel> 111 112 <startup>113 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>114 </startup>115 114 </configuration> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/app_services.config
r6546 r6712 10 10 </sectionGroup> 11 11 </configSections> 12 <startup> 13 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/> 14 </startup> 12 15 <userSettings> 13 16 <HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings> … … 37 40 </setting> 38 41 <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> 40 43 </setting> 41 44 <setting name="ClientsHiveDll" serializeAs="String"> 42 <value>HeuristicLab.Clients.Hive-3. 4.dll</value>45 <value>HeuristicLab.Clients.Hive-3.3.dll</value> 43 46 </setting> 44 47 <setting name="HiveDll" serializeAs="String"> 45 <value>HeuristicLab.Hive-3. 4.dll</value>48 <value>HeuristicLab.Hive-3.3.dll</value> 46 49 </setting> 47 50 <setting name="ClientsCommonDll" serializeAs="String"> … … 109 112 </client> 110 113 </system.serviceModel> 111 112 <startup>113 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>114 </startup>115 114 </configuration> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj
r6701 r6712 171 171 <Compile Include="ServiceClients\Job.cs" /> 172 172 <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>178 173 <None Include="app_ascheibe.config" /> 179 174 <None Include="HeuristicLab.snk" /> 180 175 <None Include="ServiceClients\GenerateServiceClients.cmd" /> 181 <None Include="Properties\Settings.settings">182 <Generator>PublicSettingsSingleFileGenerator</Generator>183 <LastGenOutput>Settings.Designer.cs</LastGenOutput>184 </None>185 176 </ItemGroup> 186 177 <ItemGroup /> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/app_f005pc.config
r6168 r6712 35 35 <endpoint address="http://localhost/Hive-3.4/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_IHiveService" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService"> 36 36 <identity> 37 <certificate encodedValue="AwAAAAEAAAAUAAAA fEKvcVixnJay+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="/> 38 38 </identity> 39 39 </endpoint> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive 3.4.sln
r6704 r6712 49 49 Release.AspNetCompiler.FixedNames = "false" 50 50 Release.AspNetCompiler.Debug = "False" 51 VWDPort = "49532" 51 VWDPort = "4591" 52 VWDVirtualPath = "/Hive-3.4" 52 53 DefaultWebSiteLanguage = "Visual C#" 53 54 EndProjectSection -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.3/Tests/app.config
r6358 r6712 9 9 </configSections> 10 10 <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" /> 12 12 </connectionStrings> 13 13 <!-- [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 9 9 </configSections> 10 10 <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" /> 12 12 </connectionStrings> 13 13 <!-- [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]1 USE [HeuristicLab.Hive-3.3] 2 2 /* create and initialize hive database tables */ 3 3 … … 6 6 [ResourceId] UniqueIdentifier NOT NULL, 7 7 [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]) 10 9 ) 11 10 CREATE TABLE [dbo].[Plugin]( … … 59 58 CONSTRAINT [PK_dbo.Job] PRIMARY KEY ([JobId]) 60 59 ) 61 CREATE TABLE [dbo].[ UptimeCalendar](62 [ UptimeCalendarId] UniqueIdentifier,60 CREATE TABLE [dbo].[Downtime]( 61 [DowntimeId] UniqueIdentifier, 63 62 [ResourceId] UniqueIdentifier, 64 63 [StartDate] DateTime, … … 67 66 [Recurring] Bit, 68 67 [RecurringId] UniqueIdentifier, 69 CONSTRAINT [PK_dbo. UptimeCalendar] PRIMARY KEY ([UptimeCalendarId])68 CONSTRAINT [PK_dbo.Downtime] PRIMARY KEY ([DowntimeId]) 70 69 ) 71 70 CREATE TABLE [dbo].[HiveExperiment]( … … 161 160 ALTER TABLE [dbo].[Job] 162 161 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])162 ALTER TABLE [dbo].[Downtime] 163 ADD CONSTRAINT [Resource_Downtime] FOREIGN KEY ([ResourceId]) REFERENCES [dbo].[Resource]([ResourceId]) 165 164 ALTER TABLE [dbo].[JobData] 166 165 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]1 USE [HeuristicLab.Hive-3.3] 2 2 /* this script is supposed to be executed after the plain DB is generated by the linq-to-sql schema */ 3 3 /* adds default values */ -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Query Daily Statistics.sql
r6688 r6712 9 9 ,MAX([ExecutionTimeFinished]) AS [ExecutionTimeFinished] 10 10 ,MAX([StartToEndTimeFinished]) AS [StartToEndTimeFinished] 11 FROM [HeuristicLab.Hive-3. 4].[dbo].[view_Statistics]11 FROM [HeuristicLab.Hive-3.3].[dbo].[view_Statistics] 12 12 GROUP BY CONVERT(VARCHAR(10), [DateTime], 104) 13 13 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 18 18 , he.HiveExperimentId 19 19 FROM 20 [HeuristicLab.Hive-3. 4].[dbo].[Job] j21 ,[HeuristicLab.Hive-3. 4].[dbo].[HiveExperiment] he20 [HeuristicLab.Hive-3.3].[dbo].[Job] j 21 ,[HeuristicLab.Hive-3.3].[dbo].[HiveExperiment] he 22 22 ,[HeuristicLab.Authentication].dbo.aspnet_Users u 23 ,[HeuristicLab.Hive-3. 4].dbo.JobData jd23 ,[HeuristicLab.Hive-3.3].dbo.JobData jd 24 24 WHERE 25 25 j.HiveExperimentId = he.HiveExperimentId -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Query Statistics.sql
r6688 r6712 8 8 ,[ExecutionTimeFinished] 9 9 ,[StartToEndTimeFinished] 10 FROM [HeuristicLab.Hive-3. 4].[dbo].[view_Statistics]10 FROM [HeuristicLab.Hive-3.3].[dbo].[view_Statistics] 11 11 --WHERE [DateTime] > '2011-06-24 14:30' 12 12 ORDER BY [DateTime] DESC -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Settings.Designer.cs
r6452 r6712 2 2 // <auto-generated> 3 3 // This code was generated by a tool. 4 // Runtime Version:4.0.30319.2 254 // Runtime Version:4.0.30319.235 5 5 // 6 6 // Changes to this file may cause incorrect behavior and will be lost if … … 27 27 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 28 28 [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" + 30 30 "rue;")] 31 31 public string HeuristicLab_Hive_LinqConnectionString { -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Settings.settings
r6452 r6712 1 1 <?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"> 3 3 <Profiles /> 4 4 <Settings> … … 6 6 <DesignTimeValue Profile="(Default)"><?xml version="1.0" encoding="utf-16"?> 7 7 <SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> 8 <ConnectionString>Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3. 4;Integrated Security=True;</ConnectionString>8 <ConnectionString>Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;</ConnectionString> 9 9 <ProviderName>System.Data.SqlClient</ProviderName> 10 10 </SerializableConnectionString></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> 12 12 </Setting> 13 13 <Setting Name="LongRunningDatabaseCommandTimeout" Type="System.TimeSpan" Scope="Application"> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.3/app.config
r6452 r6712 6 6 </sectionGroup> 7 7 </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;" 11 11 providerName="System.Data.SqlClient" /> 12 12 </connectionStrings> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Tests/HeuristicLab 3.3.exe.config
r6167 r6712 10 10 <connectionStrings> 11 11 <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" /> 13 13 </connectionStrings> 14 14 <!-- [chn] TODO: system.web should be located in HeuristicLab.Hive.Server.Core/app.config, but the ConfigMerger does not merge system.web (yet) --> … … 97 97 <endpoint address="http://localhost:80/Service.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService"> 98 98 <identity> 99 <certificate encodedValue="AwAAAAEAAAAUAAAA fEKvcVixnJay+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=" /> 100 100 </identity> 101 101 </endpoint> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Web/Hive-3.4/Status.aspx.cs
r6478 r6712 49 49 var firstStatisticsDate = DateTime.Parse("2011-05-24 17:16:40"); 50 50 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 } 52 56 53 57 for (int i = 0; i < stats.Length; i++) {
Note: See TracChangeset
for help on using the changeset viewer.