Changeset 13860 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services

Timestamp:

05/25/16 16:48:19 (9 years ago)

Author:

jlodewyc

Message:

#2582 RC2 migration fixed. OKB query implemented. Preparing for OKB manager

Location:

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services

Files:

• Imports/HiveClientWeb.cs (modified) (1 diff)
• Imports/HiveServiceLocatorWeb.cs (modified) (1 diff)
• Jobs/FileOpeningService.cs (modified) (3 diffs)
• Jobs/JsonTaskResolver.cs (deleted)
• WebLoginService.cs (modified) (1 diff)

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/Imports/HiveClientWeb.cs

@@ -35 +35 @@
 using HeuristicLab.Clients.Hive.WebJobManager.Services;
 using HeuristicLab.Clients.Common.Properties;
-using Microsoft.AspNet.Hosting;
+using Microsoft.AspNetCore.Hosting;
 using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
 

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/Imports/HiveServiceLocatorWeb.cs

@@ -2 +2 @@
 using HeuristicLab.Clients.Common.Properties;
 using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/Jobs/FileOpeningService.cs

@@ -1 @@
-using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+
+using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
 using HeuristicLab.Common;
 using HeuristicLab.Optimization;
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Hosting;
 using System;
 using System.Collections.Generic;
@@ -9 +30 @@
 using System.Linq;
 using System.Threading;
-using System.Threading.Tasks;
 
 namespace HeuristicLab.Clients.Hive.WebJobManager.Services
@@ -73 +93 @@
             {
                 var clientWeb = weblog.getClientWeb(UserId);
-                clientWeb.CurrentEnv = env;
+                clientWeb.CurrentEnv = (Microsoft.AspNetCore.Hosting.IHostingEnvironment)env;
                 clientWeb.Refresh();
                 clientWeb.StartJob((ex) => { throw ex; }, Job, CancellationToken.None);

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/WebLoginService.cs

@@ -1 @@
-using HeuristicLab.Clients.Access.Administration;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+
+using HeuristicLab.Clients.Access.Administration;
 using HeuristicLab.Clients.Hive.WebJobManager.Models;
 using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;