Changeset 12584 for branches/HiveStatistics/sources
- Timestamp:
- 07/03/15 16:35:17 (9 years ago)
- Location:
- branches/HiveStatistics/sources
- Files:
-
- 5 added
- 50 edited
-
HeuristicLab.Clients.Access/3.3/app.config (modified) (1 diff)
-
HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/app.config (modified) (1 diff)
-
HeuristicLab.Clients.Hive.Slave.WindowsService/3.3/app.config (modified) (1 diff)
-
HeuristicLab.Clients.Hive.Slave/3.3/app.config (modified) (1 diff)
-
HeuristicLab.Clients.Hive/3.3/app.config (modified) (1 diff)
-
HeuristicLab.Clients.OKB/3.3/app.config (modified) (1 diff)
-
HeuristicLab.MainForm.WindowsForms/3.3/HeuristicLab.MainForm.WindowsForms-3.3.csproj (modified) (1 diff)
-
HeuristicLab.Persistence/3.3/Default/Xml/XmlParser.cs (modified) (1 diff)
-
HeuristicLab.PluginInfrastructure/3.3/Advanced/DeploymentService/AdminServiceClientFactory.cs (modified) (1 diff)
-
HeuristicLab.PluginInfrastructure/3.3/Advanced/DeploymentService/GenerateServiceClients.cmd (modified) (1 diff)
-
HeuristicLab.PluginInfrastructure/3.3/Advanced/DeploymentService/UpdateServiceClientFactory.cs (modified) (1 diff)
-
HeuristicLab.PluginInfrastructure/3.3/Properties/Settings.Designer.cs (modified) (2 diffs)
-
HeuristicLab.PluginInfrastructure/3.3/Properties/Settings.settings (modified) (1 diff)
-
HeuristicLab.PluginInfrastructure/3.3/app.config (modified) (2 diffs)
-
HeuristicLab.Services.Access/3.3/HeuristicLab.Services.Access-3.3.csproj (modified) (1 diff)
-
HeuristicLab.Services.Access/3.3/Web.config (modified) (1 diff)
-
HeuristicLab.Services.Deployment/3.3/App.config (modified) (1 diff)
-
HeuristicLab.Services.Hive.DataAccess/3.3/Daos/AssignedResourceDao.cs (modified) (2 diffs)
-
HeuristicLab.Services.Hive.DataAccess/3.3/Daos/JobPermissionDao.cs (modified) (2 diffs)
-
HeuristicLab.Services.Hive.DataAccess/3.3/Daos/StateLogDao.cs (modified) (1 diff)
-
HeuristicLab.Services.Hive.DataAccess/3.3/Daos/TaskDao.cs (modified) (1 diff)
-
HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Initialize Hive Database.sql (modified) (1 diff)
-
HeuristicLab.Services.Hive.DataAccess/3.3/app.config (modified) (1 diff)
-
HeuristicLab.Services.Hive.Web/Hive-3.3/App_Data/PublishProfiles (added)
-
HeuristicLab.Services.Hive.Web/Hive-3.3/App_Data/PublishProfiles/Hive-3.3.pubxml (added)
-
HeuristicLab.Services.Hive.Web/Hive-3.3/Web.config (modified) (2 diffs)
-
HeuristicLab.Services.Hive.Web/Hive-3.3/website.publishproj (added)
-
HeuristicLab.Services.Hive/3.3/Convert.cs (modified) (1 diff)
-
HeuristicLab.Services.Hive/3.3/Converter.cs (added)
-
HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj (modified) (2 diffs)
-
HeuristicLab.Services.Hive/3.3/HiveDao.cs (modified) (1 diff)
-
HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (1 diff)
-
HeuristicLab.Services.Hive/3.3/NewHiveService.cs (added)
-
HeuristicLab.Services.OKB/3.3/web.config (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/HeuristicLab.Services.WebApp.Statistics-3.3.csproj (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/ClientController.cs (modified) (2 diffs)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/JavascriptUtils.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/TaskController.cs (modified) (2 diffs)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/clients.cshtml (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/details/clientDetails.cshtml (modified) (2 diffs)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/details/clientDetailsCtrl.js (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/details/clientTaskDetailsDialogCtrl.js (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/details/jobTaskDetailsDialogCtrl.js (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/jobsCtrl.js (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/users/details/userDetails.cshtml (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/users/details/userDetailsCtrl.js (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/users/users.cshtml (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Status/3.3/WebApp/history/history.cshtml (modified) (2 diffs)
-
HeuristicLab.Services.WebApp.Status/3.3/WebApp/history/historyCtrl.js (modified) (5 diffs)
-
HeuristicLab.Services.WebApp/3.3/Configs/BundleConfig.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp/3.3/HeuristicLab.Services.WebApp-3.3.csproj (modified) (1 diff)
-
HeuristicLab.Services.WebApp/3.3/Web.config (modified) (5 diffs)
-
HeuristicLab.Services.WebApp/3.3/WebApp/helper.js (modified) (2 diffs)
-
HeuristicLab.Services.WebApp/3.3/WebApp/plugins/about/about.cshtml (modified) (2 diffs)
-
HeuristicLab.Services.WebApp/3.3/WebApp/plugins/about/aboutCtrl.js (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/HiveStatistics/sources/HeuristicLab.Clients.Access/3.3/app.config
r11623 r12584 20 20 </bindings> 21 21 <client> 22 <endpoint address="http:// services.heuristiclab.com/AccessService-3.3/AccessService.svc" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IAccessService" contract="HeuristicLab.Clients.Access.IAccessService" name="WSHttpBinding_IAccessService">22 <endpoint address="http://localhost/AccessService-3.3/AccessService.svc" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IAccessService" contract="HeuristicLab.Clients.Access.IAccessService" name="WSHttpBinding_IAccessService"> 23 23 <identity> 24 <certificate encodedValue="AwAAAAEAAAAUAAAA wK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>24 <certificate encodedValue="AwAAAAEAAAAUAAAAsBAiQNbfReR5pYaSMZcalnXNehMgAAAAAQAAANUBAAAwggHRMIIBOqADAgECAhBZk8ZrPkmUv0lw+rA4krQ5MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNDAzMDUxMjAyMDBaFw0xOTAzMDUwMDAwMDBaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApeJ7tPwPHlTw7Q3P0vsdZYbLV3uG1nlXsdxWLGlfNjo4AUaIm2W9Kj0Kkr2e5b65mhWxt7vBfiAE2WLyb4raQo+ZLMTjCy5NSFlEFbxtOIXNZFXIpLJpdzwKAtWsQlr8Eliu5DTjs/WXd+MbimeEjXg6KuTVxeLXaf4ZfMmpoLsCAwEAAaMkMCIwCwYDVR0PBAQDAgSwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4GBAKHyEdLKZBdMHjmKYuGpZ46Io65X+IhvQsL+vggkzhpORwaZUOkwDct3rK9vIfm+1l0vbd3vhqmo4wEvUGBPGm76/Uyd1XkAyVtl7IyjLv7su/1H51bWHggdnyDDqG8f5lzd1ZAqSKu/V8JIymwR9WIlIzgB1lZzWliyl4x8e0I9"/> 25 25 </identity> 26 26 </endpoint> -
branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/app.config
r11651 r12584 50 50 <client> 51 51 <endpoint name="SlaveCommunicationServiceEndpoint" address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/> 52 <endpoint address="http:// services.heuristiclab.com/Hive-3.3/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">52 <endpoint address="http://localhost/Hive-3.3/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration"> 53 53 <identity> 54 <certificate encodedValue="AwAAAAEAAAAUAAAA wK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>54 <certificate encodedValue="AwAAAAEAAAAUAAAAsBAiQNbfReR5pYaSMZcalnXNehMgAAAAAQAAANUBAAAwggHRMIIBOqADAgECAhBZk8ZrPkmUv0lw+rA4krQ5MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNDAzMDUxMjAyMDBaFw0xOTAzMDUwMDAwMDBaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApeJ7tPwPHlTw7Q3P0vsdZYbLV3uG1nlXsdxWLGlfNjo4AUaIm2W9Kj0Kkr2e5b65mhWxt7vBfiAE2WLyb4raQo+ZLMTjCy5NSFlEFbxtOIXNZFXIpLJpdzwKAtWsQlr8Eliu5DTjs/WXd+MbimeEjXg6KuTVxeLXaf4ZfMmpoLsCAwEAAaMkMCIwCwYDVR0PBAQDAgSwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4GBAKHyEdLKZBdMHjmKYuGpZ46Io65X+IhvQsL+vggkzhpORwaZUOkwDct3rK9vIfm+1l0vbd3vhqmo4wEvUGBPGm76/Uyd1XkAyVtl7IyjLv7su/1H51bWHggdnyDDqG8f5lzd1ZAqSKu/V8JIymwR9WIlIzgB1lZzWliyl4x8e0I9"/> 55 55 </identity> 56 56 </endpoint> 57 <endpoint address="net.tcp:// services.heuristiclab.com/Hive-3.3/HiveService.svc" binding="netTcpBinding" bindingConfiguration="netTcpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="netTcpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">57 <endpoint address="net.tcp://localhost/Hive-3.3/HiveService.svc" binding="netTcpBinding" bindingConfiguration="netTcpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="netTcpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration"> 58 58 <identity> 59 <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>59 <certificate encodedValue="AwAAAAEAAAAUAAAAsBAiQNbfReR5pYaSMZcalnXNehMgAAAAAQAAANUBAAAwggHRMIIBOqADAgECAhBZk8ZrPkmUv0lw+rA4krQ5MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNDAzMDUxMjAyMDBaFw0xOTAzMDUwMDAwMDBaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApeJ7tPwPHlTw7Q3P0vsdZYbLV3uG1nlXsdxWLGlfNjo4AUaIm2W9Kj0Kkr2e5b65mhWxt7vBfiAE2WLyb4raQo+ZLMTjCy5NSFlEFbxtOIXNZFXIpLJpdzwKAtWsQlr8Eliu5DTjs/WXd+MbimeEjXg6KuTVxeLXaf4ZfMmpoLsCAwEAAaMkMCIwCwYDVR0PBAQDAgSwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4GBAKHyEdLKZBdMHjmKYuGpZ46Io65X+IhvQsL+vggkzhpORwaZUOkwDct3rK9vIfm+1l0vbd3vhqmo4wEvUGBPGm76/Uyd1XkAyVtl7IyjLv7su/1H51bWHggdnyDDqG8f5lzd1ZAqSKu/V8JIymwR9WIlIzgB1lZzWliyl4x8e0I9"/> 60 60 </identity> 61 61 </endpoint> -
branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.WindowsService/3.3/app.config
r11651 r12584 50 50 <client> 51 51 <endpoint name="SlaveCommunicationServiceEndpoint" address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/> 52 <endpoint address="http:// services.heuristiclab.com/Hive-3.3/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">52 <endpoint address="http://localhost/Hive-3.3/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration"> 53 53 <identity> 54 <certificate encodedValue="AwAAAAEAAAAUAAAA wK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>54 <certificate encodedValue="AwAAAAEAAAAUAAAAsBAiQNbfReR5pYaSMZcalnXNehMgAAAAAQAAANUBAAAwggHRMIIBOqADAgECAhBZk8ZrPkmUv0lw+rA4krQ5MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNDAzMDUxMjAyMDBaFw0xOTAzMDUwMDAwMDBaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApeJ7tPwPHlTw7Q3P0vsdZYbLV3uG1nlXsdxWLGlfNjo4AUaIm2W9Kj0Kkr2e5b65mhWxt7vBfiAE2WLyb4raQo+ZLMTjCy5NSFlEFbxtOIXNZFXIpLJpdzwKAtWsQlr8Eliu5DTjs/WXd+MbimeEjXg6KuTVxeLXaf4ZfMmpoLsCAwEAAaMkMCIwCwYDVR0PBAQDAgSwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4GBAKHyEdLKZBdMHjmKYuGpZ46Io65X+IhvQsL+vggkzhpORwaZUOkwDct3rK9vIfm+1l0vbd3vhqmo4wEvUGBPGm76/Uyd1XkAyVtl7IyjLv7su/1H51bWHggdnyDDqG8f5lzd1ZAqSKu/V8JIymwR9WIlIzgB1lZzWliyl4x8e0I9"/> 55 55 </identity> 56 56 </endpoint> 57 <endpoint address="net.tcp:// services.heuristiclab.com/Hive-3.3/HiveService.svc" binding="netTcpBinding" bindingConfiguration="netTcpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="netTcpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">57 <endpoint address="net.tcp://localhost/Hive-3.3/HiveService.svc" binding="netTcpBinding" bindingConfiguration="netTcpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="netTcpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration"> 58 58 <identity> 59 <certificate encodedValue="AwAAAAEAAAAUAAAA wK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>59 <certificate encodedValue="AwAAAAEAAAAUAAAAsBAiQNbfReR5pYaSMZcalnXNehMgAAAAAQAAANUBAAAwggHRMIIBOqADAgECAhBZk8ZrPkmUv0lw+rA4krQ5MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNDAzMDUxMjAyMDBaFw0xOTAzMDUwMDAwMDBaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApeJ7tPwPHlTw7Q3P0vsdZYbLV3uG1nlXsdxWLGlfNjo4AUaIm2W9Kj0Kkr2e5b65mhWxt7vBfiAE2WLyb4raQo+ZLMTjCy5NSFlEFbxtOIXNZFXIpLJpdzwKAtWsQlr8Eliu5DTjs/WXd+MbimeEjXg6KuTVxeLXaf4ZfMmpoLsCAwEAAaMkMCIwCwYDVR0PBAQDAgSwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4GBAKHyEdLKZBdMHjmKYuGpZ46Io65X+IhvQsL+vggkzhpORwaZUOkwDct3rK9vIfm+1l0vbd3vhqmo4wEvUGBPGm76/Uyd1XkAyVtl7IyjLv7su/1H51bWHggdnyDDqG8f5lzd1ZAqSKu/V8JIymwR9WIlIzgB1lZzWliyl4x8e0I9"/> 60 60 </identity> 61 61 </endpoint> -
branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/app.config
r11651 r12584 52 52 <client> 53 53 <endpoint name="SlaveCommunicationServiceEndpoint" address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/> 54 <endpoint address="http:// services.heuristiclab.com/Hive-3.3/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">54 <endpoint address="http://localhost/Hive-3.3/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration"> 55 55 <identity> 56 <certificate encodedValue="AwAAAAEAAAAUAAAA wK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>56 <certificate encodedValue="AwAAAAEAAAAUAAAAsBAiQNbfReR5pYaSMZcalnXNehMgAAAAAQAAANUBAAAwggHRMIIBOqADAgECAhBZk8ZrPkmUv0lw+rA4krQ5MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNDAzMDUxMjAyMDBaFw0xOTAzMDUwMDAwMDBaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApeJ7tPwPHlTw7Q3P0vsdZYbLV3uG1nlXsdxWLGlfNjo4AUaIm2W9Kj0Kkr2e5b65mhWxt7vBfiAE2WLyb4raQo+ZLMTjCy5NSFlEFbxtOIXNZFXIpLJpdzwKAtWsQlr8Eliu5DTjs/WXd+MbimeEjXg6KuTVxeLXaf4ZfMmpoLsCAwEAAaMkMCIwCwYDVR0PBAQDAgSwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4GBAKHyEdLKZBdMHjmKYuGpZ46Io65X+IhvQsL+vggkzhpORwaZUOkwDct3rK9vIfm+1l0vbd3vhqmo4wEvUGBPGm76/Uyd1XkAyVtl7IyjLv7su/1H51bWHggdnyDDqG8f5lzd1ZAqSKu/V8JIymwR9WIlIzgB1lZzWliyl4x8e0I9"/> 57 57 </identity> 58 58 </endpoint> 59 <endpoint address="net.tcp:// services.heuristiclab.com/Hive-3.3/HiveService.svc" binding="netTcpBinding" bindingConfiguration="netTcpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="netTcpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">59 <endpoint address="net.tcp://localhost/Hive-3.3/HiveService.svc" binding="netTcpBinding" bindingConfiguration="netTcpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="netTcpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration"> 60 60 <identity> 61 <certificate encodedValue="AwAAAAEAAAAUAAAA wK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>61 <certificate encodedValue="AwAAAAEAAAAUAAAAsBAiQNbfReR5pYaSMZcalnXNehMgAAAAAQAAANUBAAAwggHRMIIBOqADAgECAhBZk8ZrPkmUv0lw+rA4krQ5MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNDAzMDUxMjAyMDBaFw0xOTAzMDUwMDAwMDBaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApeJ7tPwPHlTw7Q3P0vsdZYbLV3uG1nlXsdxWLGlfNjo4AUaIm2W9Kj0Kkr2e5b65mhWxt7vBfiAE2WLyb4raQo+ZLMTjCy5NSFlEFbxtOIXNZFXIpLJpdzwKAtWsQlr8Eliu5DTjs/WXd+MbimeEjXg6KuTVxeLXaf4ZfMmpoLsCAwEAAaMkMCIwCwYDVR0PBAQDAgSwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4GBAKHyEdLKZBdMHjmKYuGpZ46Io65X+IhvQsL+vggkzhpORwaZUOkwDct3rK9vIfm+1l0vbd3vhqmo4wEvUGBPGm76/Uyd1XkAyVtl7IyjLv7su/1H51bWHggdnyDDqG8f5lzd1ZAqSKu/V8JIymwR9WIlIzgB1lZzWliyl4x8e0I9"/> 62 62 </identity> 63 63 </endpoint> -
branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/app.config
r11623 r12584 70 70 </bindings> 71 71 <client> 72 <endpoint address="http:// services.heuristiclab.com/Hive-3.3/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">72 <endpoint address="http://localhost/Hive-3.3/HiveService.svc" binding="wsHttpBinding" bindingConfiguration="wsHttpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="wsHttpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration"> 73 73 <identity> 74 <certificate encodedValue="AwAAAAEAAAAUAAAA wK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>74 <certificate encodedValue="AwAAAAEAAAAUAAAAsBAiQNbfReR5pYaSMZcalnXNehMgAAAAAQAAANUBAAAwggHRMIIBOqADAgECAhBZk8ZrPkmUv0lw+rA4krQ5MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNDAzMDUxMjAyMDBaFw0xOTAzMDUwMDAwMDBaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApeJ7tPwPHlTw7Q3P0vsdZYbLV3uG1nlXsdxWLGlfNjo4AUaIm2W9Kj0Kkr2e5b65mhWxt7vBfiAE2WLyb4raQo+ZLMTjCy5NSFlEFbxtOIXNZFXIpLJpdzwKAtWsQlr8Eliu5DTjs/WXd+MbimeEjXg6KuTVxeLXaf4ZfMmpoLsCAwEAAaMkMCIwCwYDVR0PBAQDAgSwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4GBAKHyEdLKZBdMHjmKYuGpZ46Io65X+IhvQsL+vggkzhpORwaZUOkwDct3rK9vIfm+1l0vbd3vhqmo4wEvUGBPGm76/Uyd1XkAyVtl7IyjLv7su/1H51bWHggdnyDDqG8f5lzd1ZAqSKu/V8JIymwR9WIlIzgB1lZzWliyl4x8e0I9"/> 75 75 </identity> 76 76 </endpoint> 77 <endpoint address="net.tcp:// services.heuristiclab.com/Hive-3.3/HiveService.svc" binding="netTcpBinding" bindingConfiguration="netTcpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="netTcpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration">77 <endpoint address="net.tcp://localhost/Hive-3.3/HiveService.svc" binding="netTcpBinding" bindingConfiguration="netTcpBinding_Hive" contract="HeuristicLab.Clients.Hive.IHiveService" name="netTcpBinding_IHiveService" behaviorConfiguration="HiveBehaviorConfiguration"> 78 78 <identity> 79 <certificate encodedValue="AwAAAAEAAAAUAAAA wK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>79 <certificate encodedValue="AwAAAAEAAAAUAAAAsBAiQNbfReR5pYaSMZcalnXNehMgAAAAAQAAANUBAAAwggHRMIIBOqADAgECAhBZk8ZrPkmUv0lw+rA4krQ5MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNDAzMDUxMjAyMDBaFw0xOTAzMDUwMDAwMDBaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApeJ7tPwPHlTw7Q3P0vsdZYbLV3uG1nlXsdxWLGlfNjo4AUaIm2W9Kj0Kkr2e5b65mhWxt7vBfiAE2WLyb4raQo+ZLMTjCy5NSFlEFbxtOIXNZFXIpLJpdzwKAtWsQlr8Eliu5DTjs/WXd+MbimeEjXg6KuTVxeLXaf4ZfMmpoLsCAwEAAaMkMCIwCwYDVR0PBAQDAgSwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4GBAKHyEdLKZBdMHjmKYuGpZ46Io65X+IhvQsL+vggkzhpORwaZUOkwDct3rK9vIfm+1l0vbd3vhqmo4wEvUGBPGm76/Uyd1XkAyVtl7IyjLv7su/1H51bWHggdnyDDqG8f5lzd1ZAqSKu/V8JIymwR9WIlIzgB1lZzWliyl4x8e0I9"/> 80 80 </identity> 81 81 </endpoint> -
branches/HiveStatistics/sources/HeuristicLab.Clients.OKB/3.3/app.config
r11623 r12584 46 46 </bindings> 47 47 <client> 48 <endpoint address="http:// services.heuristiclab.com/OKB-3.3/AdministrationService.svc" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IAdministrationService" contract="HeuristicLab.Clients.OKB.Administration.IAdministrationService" name="WSHttpBinding_IAdministrationService" behaviorConfiguration="DefaultEndpointBehavior">48 <endpoint address="http://localhost/OKB-3.3/AdministrationService.svc" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IAdministrationService" contract="HeuristicLab.Clients.OKB.Administration.IAdministrationService" name="WSHttpBinding_IAdministrationService" behaviorConfiguration="DefaultEndpointBehavior"> 49 49 <identity> 50 <certificate encodedValue="AwAAAAEAAAAUAAAA wK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>50 <certificate encodedValue="AwAAAAEAAAAUAAAAsBAiQNbfReR5pYaSMZcalnXNehMgAAAAAQAAANUBAAAwggHRMIIBOqADAgECAhBZk8ZrPkmUv0lw+rA4krQ5MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNDAzMDUxMjAyMDBaFw0xOTAzMDUwMDAwMDBaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApeJ7tPwPHlTw7Q3P0vsdZYbLV3uG1nlXsdxWLGlfNjo4AUaIm2W9Kj0Kkr2e5b65mhWxt7vBfiAE2WLyb4raQo+ZLMTjCy5NSFlEFbxtOIXNZFXIpLJpdzwKAtWsQlr8Eliu5DTjs/WXd+MbimeEjXg6KuTVxeLXaf4ZfMmpoLsCAwEAAaMkMCIwCwYDVR0PBAQDAgSwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4GBAKHyEdLKZBdMHjmKYuGpZ46Io65X+IhvQsL+vggkzhpORwaZUOkwDct3rK9vIfm+1l0vbd3vhqmo4wEvUGBPGm76/Uyd1XkAyVtl7IyjLv7su/1H51bWHggdnyDDqG8f5lzd1ZAqSKu/V8JIymwR9WIlIzgB1lZzWliyl4x8e0I9"/> 51 51 </identity> 52 52 </endpoint> 53 <endpoint address="http:// services.heuristiclab.com/OKB-3.3/RunCreationService.svc" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IRunCreationService" contract="HeuristicLab.Clients.OKB.RunCreation.IRunCreationService" name="WSHttpBinding_IRunCreationService" behaviorConfiguration="DefaultEndpointBehavior">53 <endpoint address="http://localhost/OKB-3.3/RunCreationService.svc" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IRunCreationService" contract="HeuristicLab.Clients.OKB.RunCreation.IRunCreationService" name="WSHttpBinding_IRunCreationService" behaviorConfiguration="DefaultEndpointBehavior"> 54 54 <identity> 55 <certificate encodedValue="AwAAAAEAAAAUAAAA wK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>55 <certificate encodedValue="AwAAAAEAAAAUAAAAsBAiQNbfReR5pYaSMZcalnXNehMgAAAAAQAAANUBAAAwggHRMIIBOqADAgECAhBZk8ZrPkmUv0lw+rA4krQ5MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNDAzMDUxMjAyMDBaFw0xOTAzMDUwMDAwMDBaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApeJ7tPwPHlTw7Q3P0vsdZYbLV3uG1nlXsdxWLGlfNjo4AUaIm2W9Kj0Kkr2e5b65mhWxt7vBfiAE2WLyb4raQo+ZLMTjCy5NSFlEFbxtOIXNZFXIpLJpdzwKAtWsQlr8Eliu5DTjs/WXd+MbimeEjXg6KuTVxeLXaf4ZfMmpoLsCAwEAAaMkMCIwCwYDVR0PBAQDAgSwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4GBAKHyEdLKZBdMHjmKYuGpZ46Io65X+IhvQsL+vggkzhpORwaZUOkwDct3rK9vIfm+1l0vbd3vhqmo4wEvUGBPGm76/Uyd1XkAyVtl7IyjLv7su/1H51bWHggdnyDDqG8f5lzd1ZAqSKu/V8JIymwR9WIlIzgB1lZzWliyl4x8e0I9"/> 56 56 </identity> 57 57 </endpoint> 58 <endpoint address="http:// services.heuristiclab.com/OKB-3.3/QueryService.svc" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IQueryService" contract="HeuristicLab.Clients.OKB.Query.IQueryService" name="WSHttpBinding_IQueryService" behaviorConfiguration="DefaultEndpointBehavior">58 <endpoint address="http://localhost/OKB-3.3/QueryService.svc" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IQueryService" contract="HeuristicLab.Clients.OKB.Query.IQueryService" name="WSHttpBinding_IQueryService" behaviorConfiguration="DefaultEndpointBehavior"> 59 59 <identity> 60 <certificate encodedValue="AwAAAAEAAAAUAAAA wK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>60 <certificate encodedValue="AwAAAAEAAAAUAAAAsBAiQNbfReR5pYaSMZcalnXNehMgAAAAAQAAANUBAAAwggHRMIIBOqADAgECAhBZk8ZrPkmUv0lw+rA4krQ5MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNDAzMDUxMjAyMDBaFw0xOTAzMDUwMDAwMDBaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApeJ7tPwPHlTw7Q3P0vsdZYbLV3uG1nlXsdxWLGlfNjo4AUaIm2W9Kj0Kkr2e5b65mhWxt7vBfiAE2WLyb4raQo+ZLMTjCy5NSFlEFbxtOIXNZFXIpLJpdzwKAtWsQlr8Eliu5DTjs/WXd+MbimeEjXg6KuTVxeLXaf4ZfMmpoLsCAwEAAaMkMCIwCwYDVR0PBAQDAgSwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4GBAKHyEdLKZBdMHjmKYuGpZ46Io65X+IhvQsL+vggkzhpORwaZUOkwDct3rK9vIfm+1l0vbd3vhqmo4wEvUGBPGm76/Uyd1XkAyVtl7IyjLv7su/1H51bWHggdnyDDqG8f5lzd1ZAqSKu/V8JIymwR9WIlIzgB1lZzWliyl4x8e0I9"/> 61 61 </identity> 62 62 </endpoint> -
branches/HiveStatistics/sources/HeuristicLab.MainForm.WindowsForms/3.3/HeuristicLab.MainForm.WindowsForms-3.3.csproj
r11623 r12584 165 165 <None Include="Plugin.cs.frame" /> 166 166 <Compile Include="Controls\ControlExtensions.cs" /> 167 <Compile Include="MainForms\DockForm.cs"> 168 <SubType>Form</SubType> 169 </Compile> 167 <Compile Include="MainForms\DockForm.cs" /> 170 168 <Compile Include="MainForms\DockForm.Designer.cs"> 171 169 <DependentUpon>DockForm.cs</DependentUpon> -
branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/Xml/XmlParser.cs
r12467 r12584 193 193 try { 194 194 using (FileStream fs = new FileStream(filename, FileMode.Open, FileAccess.Read)) { 195 using (ZipArchive zip = new ZipArchive(fs)) { 196 return Deserialize(zip); 195 try { 196 using (ZipArchive zip = new ZipArchive(fs)) { 197 return Deserialize(zip); 198 } 199 } 200 catch (Exception) { 201 return DeserializeWithGZip(fs); 197 202 } 198 203 } -
branches/HiveStatistics/sources/HeuristicLab.PluginInfrastructure/3.3/Advanced/DeploymentService/AdminServiceClientFactory.cs
r12012 r12584 35 35 /// </summary> 36 36 static AdminServiceClientFactory() { 37 var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("HeuristicLab.PluginInfrastructure.Advanced.DeploymentService. services.heuristiclab.com.cer");37 var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("HeuristicLab.PluginInfrastructure.Advanced.DeploymentService.localhost.cer"); 38 38 serverCrtData = new byte[stream.Length]; 39 39 stream.Read(serverCrtData, 0, serverCrtData.Length); -
branches/HiveStatistics/sources/HeuristicLab.PluginInfrastructure/3.3/Advanced/DeploymentService/GenerateServiceClients.cmd
r4495 r12584 7 7 8 8 svcutil.exe ^ 9 http:// services.heuristiclab.com/Deployment-3.3/UpdateService.svc/mex ^10 http:// services.heuristiclab.com/Deployment-3.3/AdminService.svc/mex ^9 http://localhost/Deployment-3.3/UpdateService.svc/mex ^ 10 http://localhost/Deployment-3.3/AdminService.svc/mex ^ 11 11 /out:ServiceClients ^ 12 12 /namespace:*,HeuristicLab.PluginInfrastructure.Advanced.DeploymentService ^ -
branches/HiveStatistics/sources/HeuristicLab.PluginInfrastructure/3.3/Advanced/DeploymentService/UpdateServiceClientFactory.cs
r12012 r12584 35 35 /// </summary> 36 36 static UpdateServiceClientFactory() { 37 var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("HeuristicLab.PluginInfrastructure.Advanced.DeploymentService. services.heuristiclab.com.cer");37 var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("HeuristicLab.PluginInfrastructure.Advanced.DeploymentService.localhost.cer"); 38 38 serverCrtData = new byte[stream.Length]; 39 39 stream.Read(serverCrtData, 0, serverCrtData.Length); -
branches/HiveStatistics/sources/HeuristicLab.PluginInfrastructure/3.3/Properties/Settings.Designer.cs
r11623 r12584 62 62 [global::System.Configuration.UserScopedSettingAttribute()] 63 63 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 64 [global::System.Configuration.DefaultSettingValueAttribute("http:// services.heuristiclab.com/Deployment-3.3/UpdateService.svc")]64 [global::System.Configuration.DefaultSettingValueAttribute("http://localhost/Deployment-3.3/UpdateService.svc")] 65 65 public string UpdateLocation { 66 66 get { … … 74 74 [global::System.Configuration.UserScopedSettingAttribute()] 75 75 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 76 [global::System.Configuration.DefaultSettingValueAttribute("http:// services.heuristiclab.com/Deployment-3.3/AdminService.svc")]76 [global::System.Configuration.DefaultSettingValueAttribute("http://localhost/Deployment-3.3/AdminService.svc")] 77 77 public string UpdateLocationAdministrationAddress { 78 78 get { -
branches/HiveStatistics/sources/HeuristicLab.PluginInfrastructure/3.3/Properties/Settings.settings
r4495 r12584 13 13 </Setting> 14 14 <Setting Name="UpdateLocation" Type="System.String" Scope="User"> 15 <Value Profile="(Default)">http:// services.heuristiclab.com/Deployment-3.3/UpdateService.svc</Value>15 <Value Profile="(Default)">http://localhost/Deployment-3.3/UpdateService.svc</Value> 16 16 </Setting> 17 17 <Setting Name="UpdateLocationAdministrationAddress" Type="System.String" Scope="User"> 18 <Value Profile="(Default)">http:// services.heuristiclab.com/Deployment-3.3/AdminService.svc</Value>18 <Value Profile="(Default)">http://localhost/Deployment-3.3/AdminService.svc</Value> 19 19 </Setting> 20 20 </Settings> -
branches/HiveStatistics/sources/HeuristicLab.PluginInfrastructure/3.3/app.config
r11623 r12584 19 19 </setting> 20 20 <setting name="UpdateLocation" serializeAs="String"> 21 <value>http:// services.heuristiclab.com/Deployment-3.3/UpdateService.svc</value>21 <value>http://localhost/Deployment-3.3/UpdateService.svc</value> 22 22 </setting> 23 23 <setting name="UpdateLocationAdministrationAddress" serializeAs="String"> 24 <value>http:// services.heuristiclab.com/Deployment-3.3/AdminService.svc</value>24 <value>http://localhost/Deployment-3.3/AdminService.svc</value> 25 25 </setting> 26 26 </HeuristicLab.PluginInfrastructure.Properties.Settings> … … 51 51 52 52 <client> 53 <endpoint address="http:// services.heuristiclab.com/Deployment-3.3/UpdateService.svc" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IUpdateService" contract="HeuristicLab.PluginInfrastructure.Advanced.DeploymentService.IUpdateService" name="WSHttpBinding_IUpdateService">53 <endpoint address="http://localhost/Deployment-3.3/UpdateService.svc" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IUpdateService" contract="HeuristicLab.PluginInfrastructure.Advanced.DeploymentService.IUpdateService" name="WSHttpBinding_IUpdateService"> 54 54 <identity> 55 <certificate encodedValue="AwAAAAEAAAAUAAAA wK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>55 <certificate encodedValue="AwAAAAEAAAAUAAAAsBAiQNbfReR5pYaSMZcalnXNehMgAAAAAQAAANUBAAAwggHRMIIBOqADAgECAhBZk8ZrPkmUv0lw+rA4krQ5MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNDAzMDUxMjAyMDBaFw0xOTAzMDUwMDAwMDBaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApeJ7tPwPHlTw7Q3P0vsdZYbLV3uG1nlXsdxWLGlfNjo4AUaIm2W9Kj0Kkr2e5b65mhWxt7vBfiAE2WLyb4raQo+ZLMTjCy5NSFlEFbxtOIXNZFXIpLJpdzwKAtWsQlr8Eliu5DTjs/WXd+MbimeEjXg6KuTVxeLXaf4ZfMmpoLsCAwEAAaMkMCIwCwYDVR0PBAQDAgSwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4GBAKHyEdLKZBdMHjmKYuGpZ46Io65X+IhvQsL+vggkzhpORwaZUOkwDct3rK9vIfm+1l0vbd3vhqmo4wEvUGBPGm76/Uyd1XkAyVtl7IyjLv7su/1H51bWHggdnyDDqG8f5lzd1ZAqSKu/V8JIymwR9WIlIzgB1lZzWliyl4x8e0I9"/> 56 56 </identity> 57 57 </endpoint> 58 <endpoint address="http:// services.heuristiclab.com/Deployment-3.3/AdminService.svc" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IAdminService" contract="HeuristicLab.PluginInfrastructure.Advanced.DeploymentService.IAdminService" name="WSHttpBinding_IAdminService">58 <endpoint address="http://localhost/Deployment-3.3/AdminService.svc" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IAdminService" contract="HeuristicLab.PluginInfrastructure.Advanced.DeploymentService.IAdminService" name="WSHttpBinding_IAdminService"> 59 59 <identity> 60 <certificate encodedValue="AwAAAAEAAAAUAAAA wK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ=="/>60 <certificate encodedValue="AwAAAAEAAAAUAAAAsBAiQNbfReR5pYaSMZcalnXNehMgAAAAAQAAANUBAAAwggHRMIIBOqADAgECAhBZk8ZrPkmUv0lw+rA4krQ5MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNDAzMDUxMjAyMDBaFw0xOTAzMDUwMDAwMDBaMBQxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApeJ7tPwPHlTw7Q3P0vsdZYbLV3uG1nlXsdxWLGlfNjo4AUaIm2W9Kj0Kkr2e5b65mhWxt7vBfiAE2WLyb4raQo+ZLMTjCy5NSFlEFbxtOIXNZFXIpLJpdzwKAtWsQlr8Eliu5DTjs/WXd+MbimeEjXg6KuTVxeLXaf4ZfMmpoLsCAwEAAaMkMCIwCwYDVR0PBAQDAgSwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4GBAKHyEdLKZBdMHjmKYuGpZ46Io65X+IhvQsL+vggkzhpORwaZUOkwDct3rK9vIfm+1l0vbd3vhqmo4wEvUGBPGm76/Uyd1XkAyVtl7IyjLv7su/1H51bWHggdnyDDqG8f5lzd1ZAqSKu/V8JIymwR9WIlIzgB1lZzWliyl4x8e0I9"/> 61 61 </identity> 62 62 </endpoint> -
branches/HiveStatistics/sources/HeuristicLab.Services.Access/3.3/HeuristicLab.Services.Access-3.3.csproj
r12515 r12584 135 135 </ItemGroup> 136 136 <ItemGroup> 137 <None Include="App.config" /> 137 <None Include="App.config"> 138 <SubType>Designer</SubType> 139 </None> 138 140 <None Include="HeuristicLab.snk" /> 139 141 <None Include="Properties\AssemblyInfo.cs.frame" /> 140 <None Include="Web.config" /> 142 <None Include="Web.config"> 143 <SubType>Designer</SubType> 144 </None> 141 145 </ItemGroup> 142 146 <ItemGroup> -
branches/HiveStatistics/sources/HeuristicLab.Services.Access/3.3/Web.config
r8040 r12584 65 65 <serviceDebug includeExceptionDetailInFaults="true" /> 66 66 <serviceCredentials> 67 <serviceCertificate findValue=" services.heuristiclab.com" x509FindType="FindBySubjectName" />67 <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName" /> 68 68 <userNameAuthentication userNamePasswordValidationMode="MembershipProvider" membershipProviderName="AspNetSqlMembershipProvider" /> 69 69 </serviceCredentials> -
branches/HiveStatistics/sources/HeuristicLab.Services.Deployment/3.3/App.config
r11623 r12584 27 27 </sources> 28 28 <sharedListeners> 29 <add initializeData="C:\inetpub\wwwroot\ services.heuristiclab.com\Deployment-3.3\web_messages.svclog"29 <add initializeData="C:\inetpub\wwwroot\localhost\Deployment-3.3\web_messages.svclog" 30 30 type="System.Diagnostics.XmlWriterTraceListener, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" 31 31 name="ServiceModelMessageLoggingListener" traceOutputOptions="Timestamp"> 32 32 <filter type="" /> 33 33 </add> 34 <add initializeData="C:\inetpub\wwwroot\ services.heuristiclab.com\Deployment-3.3\web_tracelog.svclog"34 <add initializeData="C:\inetpub\wwwroot\localhost\Deployment-3.3\web_tracelog.svclog" 35 35 type="System.Diagnostics.XmlWriterTraceListener, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" 36 36 name="ServiceModelTraceListener" traceOutputOptions="Timestamp"> -
branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/AssignedResourceDao.cs
r12468 r12584 22 22 using System; 23 23 using System.Data.Linq; 24 using System.Linq; 24 25 25 26 namespace HeuristicLab.Services.Hive.DataAccess.Daos { … … 30 31 throw new NotImplementedException(); 31 32 } 33 34 public IQueryable<AssignedResource> GetByTaskId(Guid taskId) { 35 return Table.Where(x => x.TaskId == taskId); 36 } 32 37 } 33 38 } -
branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/JobPermissionDao.cs
r12468 r12584 22 22 using System; 23 23 using System.Data.Linq; 24 using System.Linq; 24 25 25 26 namespace HeuristicLab.Services.Hive.DataAccess.Daos { … … 30 31 throw new NotImplementedException(); 31 32 } 33 34 public JobPermission GetByJobAndUserId(Guid jobId, Guid userId) { 35 return Table.SingleOrDefault(x => x.JobId == jobId && x.GrantedUserId == userId); 36 } 32 37 } 33 38 } -
branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/StateLogDao.cs
r12468 r12584 26 26 namespace HeuristicLab.Services.Hive.DataAccess.Daos { 27 27 public class StateLogDao : GenericDao<Guid, StateLog> { 28 29 private Table<Task> TaskTable { 30 get { return DataContext.GetTable<Task>(); } 31 } 32 28 33 public StateLogDao(DataContext dataContext) : base(dataContext) { } 29 34 -
branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/TaskDao.cs
r12516 r12584 36 36 } 37 37 38 public IQueryable<Task> Get AllByJobId(Guid id) {38 public IQueryable<Task> GetByJobId(Guid id) { 39 39 return Table.Where(x => x.JobId == id); 40 40 } -
branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Initialize Hive Database.sql
r12551 r12584 256 256 CONSTRAINT [FK_FactClientInfo_DimUser] FOREIGN KEY ([UserId]) REFERENCES [statistics].[DimUser] ([UserId]) 257 257 ); 258 259 258 CREATE TABLE [statistics].[FactTask] ( 260 259 [TaskId] UNIQUEIDENTIFIER NOT NULL, -
branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/app.config
r11623 r12584 7 7 </configSections> 8 8 <connectionStrings> 9 <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source= localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;" providerName="System.Data.SqlClient"/>9 <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;" providerName="System.Data.SqlClient"/> 10 10 </connectionStrings> 11 11 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup><applicationSettings> -
branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Web/Hive-3.3/Web.config
r11623 r12584 20 20 </applicationSettings> 21 21 <connectionStrings> 22 <add name="HeuristicLab.Authentication" connectionString="data source= localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>23 <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source= localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;" providerName="System.Data.SqlClient"/>22 <add name="HeuristicLab.Authentication" connectionString="data source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/> 23 <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;" providerName="System.Data.SqlClient"/> 24 24 </connectionStrings> 25 25 <!-- … … 104 104 <endpoint address="mex" binding="mexTcpBinding" bindingConfiguration="" name="MexTcpEndpoint" contract="IMetadataExchange"/> 105 105 <endpoint address="" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IHiveService" name="WSHttpBinding_IHiveService" contract="HeuristicLab.Services.Hive.ServiceContracts.IHiveService"/> 106 <endpoint address="net.tcp:// services.heuristiclab.com/Hive-3.3/HiveService.svc" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IHiveService" name="NetBinding_IHiveService" contract="HeuristicLab.Services.Hive.ServiceContracts.IHiveService"/>106 <endpoint address="net.tcp://localhost/Hive-3.3/HiveService.svc" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IHiveService" name="NetBinding_IHiveService" contract="HeuristicLab.Services.Hive.ServiceContracts.IHiveService"/> 107 107 </service> 108 108 </services> -
branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Convert.cs
r12012 r12584 22 22 using System; 23 23 using System.Collections.Generic; 24 using System.Data.Linq;25 24 using System.Linq; 26 25 using DB = HeuristicLab.Services.Hive.DataAccess; -
branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj
r12441 r12584 119 119 <ItemGroup> 120 120 <Compile Include="Convert.cs" /> 121 <Compile Include="Converter.cs" /> 121 122 <Compile Include="DataTransfer\Command.cs" /> 122 123 <Compile Include="DataTransfer\UserPriority.cs" /> … … 145 146 <Compile Include="HiveStatisticsGenerator.cs" /> 146 147 <Compile Include="Interfaces\IStatisticsGenerator.cs" /> 148 <Compile Include="NewHiveService.cs" /> 147 149 <Compile Include="OptimizedHiveDao.cs" /> 148 150 <Compile Include="HiveDao.cs" /> -
branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/HiveDao.cs
r12516 r12584 72 72 public IEnumerable<DT.LightweightTask> GetLightweightTasksWithoutStateLog(Expression<Func<Task, bool>> predicate) { 73 73 List<DT.LightweightTask> tasks = new List<DT.LightweightTask>(); 74 75 74 using (var db = CreateContext()) { 76 75 var tasksQuery = db.Tasks.Where(predicate).Select(task => new { task.TaskId, task.ExecutionTimeMs, task.ParentTaskId, task.State, task.Command }); -
branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/HiveService.cs
r12468 r12584 94 94 authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client, HiveRoles.Slave); 95 95 author.AuthorizeForTask(taskId, Permission.Read); 96 97 96 return trans.UseTransaction(() => { 98 97 return DT.Convert.ToDto(optimizedDao.GetTaskById(taskId)); -
branches/HiveStatistics/sources/HeuristicLab.Services.OKB/3.3/web.config
r8049 r12584 53 53 <serviceAuthorization principalPermissionMode="UseAspNetRoles" roleProviderName="AspNetSqlRoleProvider" /> 54 54 <serviceCredentials> 55 <serviceCertificate findValue=" services.heuristiclab.com" x509FindType="FindBySubjectName" />55 <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName" /> 56 56 <userNameAuthentication userNamePasswordValidationMode="MembershipProvider" membershipProviderName="AspNetSqlMembershipProvider" /> 57 57 </serviceCredentials> -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/HeuristicLab.Services.WebApp.Statistics-3.3.csproj
r12560 r12584 150 150 <Compile Include="WebApi\DataTransfer\GroupDetails.cs" /> 151 151 <Compile Include="WebApi\DataTransfer\GroupPage.cs" /> 152 <Compile Include="WebApi\DataTransfer\Integer.cs" />153 152 <Compile Include="WebApi\DataTransfer\Job.cs" /> 154 153 <Compile Include="WebApi\DataTransfer\JobDetails.cs" /> -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/ClientController.cs
r12562 r12584 27 27 using HeuristicLab.Services.Hive.DataAccess; 28 28 using HeuristicLab.Services.Hive.DataAccess.Interfaces; 29 using HeuristicLab.Services.WebApp.Status.WebApi;30 29 using DT = HeuristicLab.Services.WebApp.Statistics.WebApi.DataTransfer; 31 30 … … 106 105 Name = x.DimJob.UserName 107 106 }) 108 .Distinct().ToList() 107 .Distinct() 108 .ToList() 109 109 }) 110 110 .FirstOrDefault(); -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/JavascriptUtils.cs
r12562 r12584 22 22 using System; 23 23 24 namespace HeuristicLab.Services.WebApp.Stat us.WebApi {24 namespace HeuristicLab.Services.WebApp.Statistics.WebApi { 25 25 public static class JavascriptUtils { 26 26 public static long ToTimestamp(DateTime input) { -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/TaskController.cs
r12562 r12584 22 22 using System; 23 23 using System.Collections.Generic; 24 using System.IO; 24 25 using System.Linq; 26 using System.Net; 27 using System.Net.Http; 28 using System.Net.Http.Headers; 25 29 using System.Web.Http; 26 30 using HeuristicLab.Services.Access; … … 153 157 } 154 158 } 159 160 public HttpResponseMessage GetTaskDataById(Guid id) { 161 using (var pm = PersistenceManager) { 162 var taskDataDao = pm.TaskDataDao; 163 return pm.UseTransaction(() => { 164 var taskData = taskDataDao.GetById(id); 165 if (taskData == null) 166 return new HttpResponseMessage(HttpStatusCode.NotFound); 167 HttpResponseMessage result = new HttpResponseMessage(HttpStatusCode.OK); 168 var stream = new MemoryStream(taskData.Data); 169 result.Content = new StreamContent(stream); 170 result.Content.Headers.ContentType = new MediaTypeHeaderValue("application/octet-stream"); 171 result.Content.Headers.ContentDisposition = 172 new ContentDispositionHeaderValue("attachment") { 173 FileName = string.Format("{0}.hl", id) 174 }; 175 return result; 176 }); 177 } 178 } 155 179 } 156 180 } -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/clients.cshtml
r12551 r12584 6 6 <a ng-href="#/statistics/jobs">Jobs</a> 7 7 </li> 8 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) 9 { 8 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) { 10 9 <li> 11 10 <a ng-href="#/statistics/users">Users</a> -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/details/clientDetails.cshtml
r12551 r12584 236 236 <div class="panel-body"> 237 237 <table class="table table-condensed table-no-border table-auto-width"> 238 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) 239 { 238 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) { 240 239 <tr> 241 240 <td colspan="2"><span data-fittext="0.99">{{task.Id}}</span></td> … … 256 255 <td class="text-right">{{task.CalculatingTime | toTimespan}}</td> 257 256 </tr> 258 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) 259 { 257 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) { 260 258 <tr> 261 259 <td>User:</td> -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/details/clientDetailsCtrl.js
r12551 r12584 100 100 $scope.curUserId = id; 101 101 $scope.curUserName = name; 102 $scope.curTaskPage = 1; 102 103 getClientDetails(); 103 104 }; -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/details/clientTaskDetailsDialogCtrl.js
r12516 r12584 5 5 $scope.taskNo = taskNo; 6 6 $scope.task = task; 7 8 7 $scope.close = function () { 9 8 $modalInstance.dismiss('cancel'); 10 9 }; 11 12 10 }] 13 11 ); -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/details/jobTaskDetailsDialogCtrl.js
r12516 r12584 5 5 $scope.taskNo = taskNo; 6 6 $scope.task = task; 7 8 7 $scope.close = function () { 9 8 $modalInstance.dismiss('cancel'); 10 9 }; 11 12 10 }] 13 11 ); -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/jobsCtrl.js
r12551 r12584 42 42 }; 43 43 44 45 44 $scope.updateInterval = $interval(update, $scope.interval); 46 45 var cancelInterval = $scope.$on('$locationChangeSuccess', function () { -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/users/details/userDetails.cshtml
r12551 r12584 16 16 <a ng-href="#/statistics/groups">Groups</a> 17 17 </li> 18 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) { 19 <li> 20 <a ng-href="#/statistics/exceptions">Exceptions</a> 21 </li> 22 } 18 <li> 19 <a ng-href="#/statistics/exceptions">Exceptions</a> 20 </li> 23 21 </ul> 24 22 </header> -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/users/details/userDetailsCtrl.js
r12551 r12584 7 7 $scope.completedJobCurPage = 1; 8 8 $scope.completedJobPageSize = 20; 9 10 9 11 10 var getUserDetails = function () { -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/users/users.cshtml
r12551 r12584 16 16 <a ng-href="#/statistics/groups">Groups</a> 17 17 </li> 18 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) { 19 <li> 20 <a ng-href="#/statistics/exceptions">Exceptions</a> 21 </li> 22 } 18 <li> 19 <a ng-href="#/statistics/exceptions">Exceptions</a> 20 </li> 23 21 </ul> 24 22 </header> -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/history/history.cshtml
r12522 r12584 15 15 <label for="fromDate">From: </label> 16 16 <div class="input-group"> 17 <input id="fromDate" type="text" class="form-control" datepicker-popup="dd.MM.yyyy" ng-model="fromDate" is-open="fromIsOpen" datepicker-options="dateOptions" ng-required="true" close-text="Close" 17 <input id="fromDate" type="text" class="form-control" datepicker-popup="dd.MM.yyyy" ng-model="fromDate" is-open="fromIsOpen" datepicker-options="dateOptions" ng-required="true" close-text="Close"/> 18 18 <span class="input-group-btn"> 19 19 <button type="button" class="btn btn-default" ng-click="openFromDateSelection($event)"><i class="glyphicon glyphicon-calendar"></i></button> … … 24 24 <label for="fromDate">To: </label> 25 25 <div class="input-group"> 26 <input id="fromDate" type="text" class="form-control" datepicker-popup="dd.MM.yyyy" ng-model="toDate" is-open="toIsOpen" datepicker-options="dateOptions" ng-required="true" close-text="Close" 26 <input id="fromDate" type="text" class="form-control" datepicker-popup="dd.MM.yyyy" ng-model="toDate" is-open="toIsOpen" datepicker-options="dateOptions" ng-required="true" close-text="Close"/> 27 27 <span class="input-group-btn"> 28 28 <button type="button" class="btn btn-default" ng-click="openToDateSelection($event)"><i class="glyphicon glyphicon-calendar"></i></button> 29 29 </span> 30 </div> 31 </div> 32 <div class="form-group" style="margin-left: 5px; margin-right: 5px;"> 33 <div class="btn-group" dropdown dropdown-append-to-body> 34 <button type="button" class="btn btn-default dropdown-toggle" dropdown-toggle style="width: 130px; text-align: left;"> 35 {{curQuickSelection.name}} <span class="glyphicon glyphicon-chevron-down" style="margin-top: 3px; float:right"></span> 36 </button> 37 <ul class="dropdown-menu" role="menu"> 38 <li ng-repeat="quickSelection in quickSelectionList"> 39 <a ng-click="changeQuickSelection(quickSelection)">{{quickSelection.name}}</a> 40 </li> 41 </ul> 30 42 </div> 31 43 </div> -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/history/historyCtrl.js
r12551 r12584 2 2 var module = appStatusPlugin.getAngularModule(); 3 3 module.controller('app.status.historyCtrl', 4 ['$scope', '$interval', 'app.status.data.service', 5 function ($scope, $interval, dataService ) {4 ['$scope', '$interval', 'app.status.data.service', '$log', 5 function ($scope, $interval, dataService, $log) { 6 6 $scope.chartOptions = { 7 7 grid: { … … 40 40 }; 41 41 42 43 42 $scope.fromDate = new Date(); 44 43 $scope.toDate = new Date(); … … 47 46 $scope.toIsOpen = false; 48 47 48 $scope.quickSelectionList = [ 49 { id: 0, name: 'Custom' }, 50 { id: 1, name: 'Today' }, 51 { id: 2, name: 'Yesterday' }, 52 { id: 3, name: 'Last 7 Days' }, 53 { id: 4, name: 'Last 30 Days' } 54 ]; 55 $scope.changeQuickSelection = function (quickSelection) { 56 var today = new Date(); 57 var oneDayInMs = 24 * 60 * 60 * 1000; 58 switch (quickSelection.id) { 59 case 1: 60 $scope.fromDate = new Date(today.valueOf()); 61 $scope.toDate = new Date(today.valueOf()); 62 break; 63 case 2: 64 $scope.fromDate = new Date(today.valueOf() - oneDayInMs); 65 $scope.toDate = new Date(today.valueOf() - oneDayInMs); 66 break; 67 case 3: 68 $scope.fromDate = new Date(today.valueOf() - (7 * oneDayInMs)); 69 $scope.toDate = new Date(today.valueOf()); 70 break; 71 case 4: 72 $scope.fromDate = new Date(today.valueOf() - (30 * oneDayInMs)); 73 $scope.toDate = new Date(today.valueOf()); 74 break; 75 } 76 $scope.curQuickSelection = quickSelection; 77 }; 78 // set default 'today' 79 $scope.changeQuickSelection($scope.quickSelectionList[1]); 80 49 81 $scope.openFromDateSelection = function ($event) { 50 82 $event.preventDefault(); … … 52 84 $scope.toIsOpen = false; 53 85 $scope.fromIsOpen = true; 86 $scope.curQuickSelection = $scope.quickSelectionList[0]; 54 87 }; 55 88 … … 59 92 $scope.fromIsOpen = false; 60 93 $scope.toIsOpen = true; 94 $scope.curQuickSelection = $scope.quickSelectionList[0]; 61 95 }; 62 96 -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/Configs/BundleConfig.cs
r12558 r12584 59 59 // bootstrap 60 60 "~/WebApp/libs/bootstrap/js/bootstrap.min.js", 61 // cryptojs 62 "~/WebApp/libs/cryptojs/aes.js", 61 63 // angular js 62 64 "~/WebApp/libs/angularjs/angular.min.js", -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/HeuristicLab.Services.WebApp-3.3.csproj
r12558 r12584 146 146 <Content Include="WebApp\libs\angularjs\angular-tablesort\tablesort.css" /> 147 147 <Content Include="WebApp\libs\angularjs\fittext\ng-FitText.js" /> 148 <Content Include="WebApp\libs\cryptojs\aes.js" /> 148 149 <Content Include="WebApp\main.js" /> 149 150 <Content Include="WebApp\helper.js" /> -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/Web.config
r12428 r12584 6 6 <remove name="HeuristicLab.Authentication" /> 7 7 <remove name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" /> 8 <add name="HeuristicLab.Authentication" connectionString="data source= localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />9 <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source= localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;" providerName="System.Data.SqlClient" />8 <add name="HeuristicLab.Authentication" connectionString="data source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" /> 9 <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;" providerName="System.Data.SqlClient" /> 10 10 </connectionStrings> 11 11 <appSettings> … … 31 31 </providers> 32 32 </roleManager> 33 <compilation debug=" true" targetFramework="4.5" />33 <compilation debug="false" targetFramework="4.5" /> 34 34 <httpRuntime targetFramework="4.5" /> 35 35 </system.web> … … 59 59 <dependentAssembly> 60 60 <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" /> 61 <bindingRedirect oldVersion="0.0.0.0- 6.0.0.0" newVersion="6.0.0.0" />61 <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" /> 62 62 </dependentAssembly> 63 63 <dependentAssembly> … … 67 67 <dependentAssembly> 68 68 <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" /> 69 <bindingRedirect oldVersion="0.0.0.0-1. 5.2.14234" newVersion="1.5.2.14234" />69 <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" /> 70 70 </dependentAssembly> 71 71 <dependentAssembly> … … 81 81 <bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" /> 82 82 </dependentAssembly> 83 <dependentAssembly> 84 <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" /> 85 <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" /> 86 </dependentAssembly> 83 87 </assemblyBinding> 84 88 </runtime> -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/WebApp/helper.js
r12515 r12584 51 51 }; 52 52 53 54 53 var CSharpDateToString = function (datetime) { 55 54 var date = new Date(Date.parse(datetime)); … … 63 62 }; 64 63 64 function decryptString(s) { 65 return CryptoJS.AES.decrypt(s, "heuristiclab").toString(CryptoJS.enc.Utf8); 66 } -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/WebApp/plugins/about/about.cshtml
r12560 r12584 27 27 </div> 28 28 <div class="panel-body"> 29 <p><strong>Support and Inquiries</strong>: <a href="mailto:support@heuristiclab.com">support@heuristiclab.com</a></p> 29 <p><strong>Support</strong>: <a href="App/RedirectUrl?url=http://groups.google.com/group/heuristiclab">HeuristicLab Google Group</a></p> 30 <p><strong>Inquiries</strong>: <a class="cursor-pointer" ng-click="mailToSupport()">support(at)heuristiclab.com</a></p> 30 31 <p><strong>Heuristic and Evolutionary Algorithms Laboratory (HEAL)</strong>: <a href="App/RedirectUrl?url=http://heal.heuristiclab.com">http://heal.heuristiclab.com</a></p> 31 32 <p><strong>HeuristicLab development site</strong>: <a href="App/RedirectUrl?url=http://dev.heuristiclab.com">http://dev.heuristiclab.com</a></p> … … 35 36 <span class="glyphicon glyphicon-phone-alt"></span> +43 50804 22030<br /> 36 37 <span class="glyphicon glyphicon-print"></span> +43 50804 21599<br /> 37 <span class="glyphicon glyphicon-envelope"></span> <a href="mailto:stefan.wagner@heuristiclab.com">stefan.wagner@heuristiclab.com</a><br />38 <span class="glyphicon glyphicon-envelope"></span> <a class="cursor-pointer" ng-click="mailToStefanWagner()">stefan.wagner(at)heuristiclab.com</a><br /> 38 39 </p> 39 40 </div> -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/WebApp/plugins/about/aboutCtrl.js
r12546 r12584 1 1 (function () { 2 2 var module = appAboutPlugin.getAngularModule(); 3 module.controller('app.about.ctrl', ['$scope', function ($scope) { }]); 3 module.controller('app.about.ctrl', ['$scope', '$log', function($scope, $log) { 4 $scope.mailToSupport = function () { 5 location.href = decryptString('U2FsdGVkX1/pCOITUzzsN36hx4sHh11FeVXkVyQ5b2KeZebFQ3KaNN8G9bKL3lU9'); 6 }; 7 8 $scope.mailToStefanWagner = function () { 9 location.href = decryptString('U2FsdGVkX1/Lzu8UFltiBl6VmBf9E0lmGna0+7o7cavCPwiCytBpSLsJoyhO9tl5hHCvJPVgsSndWdmGEuWrXw=='); 10 }; 11 }]); 4 12 })();
Note: See TracChangeset
for help on using the changeset viewer.
