Changeset 12563 for stable/HeuristicLab.Services.WebApp/3.3/Controllers

Timestamp:

07/01/15 14:59:47 (10 years ago)

Author:

ascheibe

Message:

#2394 merged r12428, r12429, r12430, r12435, r12442, r12443, r12445, r12514, r12517, r12519, r12520, r12521, r12523, r12532, r12542, r12546, r12552, r12553, r12556, r12557, r12559, r12561, r12146, r12457 into stable

Location:

stable

Files:

• . (modified) (2 props)
• HeuristicLab.Services.WebApp (copied) (copied from trunk/sources/HeuristicLab.Services.WebApp)
• HeuristicLab.Services.WebApp/3.3/Controllers/AppController.cs (modified) (3 diffs)
• HeuristicLab.Services.WebApp/3.3/Controllers/AuthenticationController.cs (modified) (1 diff)
• HeuristicLab.Services.WebApp/3.3/Controllers/DataTransfer/Plugin.cs (modified) (2 diffs)
• HeuristicLab.Services.WebApp/3.3/Controllers/DataTransfer/User.cs (modified) (1 diff)
• HeuristicLab.Services.WebApp/3.3/Controllers/PluginController.cs (modified) (2 diffs)
• HeuristicLab.Services.WebApp/3.3/Controllers/WebAppControllerSelector.cs (modified) (2 diffs)

stable/HeuristicLab.Services.WebApp/3.3/Controllers/AppController.cs

@@ -21 +21 @@
 
 using System.Web.Mvc;
-using HeuristicLab.Services.WebApp.Configs;
 
 namespace HeuristicLab.Services.WebApp.Controllers {
@@ -31 +30 @@
         return RedirectPermanent(Request.Url + "/");
       }
-      BundleConfig.AddOrUpdateWebAppBundle();
       return View("~/WebApp/shared/layout/layout.cshtml");
     }
@@ -49 +47 @@
     }
 
+    public ActionResult RedirectUrl(string url) {
+      return RedirectPermanent(url);
+    }
   }
 }

stable/HeuristicLab.Services.WebApp/3.3/Controllers/AuthenticationController.cs

@@ -1 @@
-using System.Web.Http;
+#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 System.Web.Http;
 using System.Web.Security;
 using HeuristicLab.Services.WebApp.Controllers.DataTransfer;

stable/HeuristicLab.Services.WebApp/3.3/Controllers/DataTransfer/Plugin.cs

@@ -1 @@
-using System;
+#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 System;
 
 namespace HeuristicLab.Services.WebApp.Controllers.DataTransfer {
@@ -7 +28 @@
     public DateTime? LastReload { get; set; }
     public int Reloads { get; set; }
+    public string Exception { get; set; }
   }
 }

stable/HeuristicLab.Services.WebApp/3.3/Controllers/DataTransfer/User.cs

@@ -1 @@
-namespace HeuristicLab.Services.WebApp.Controllers.DataTransfer {
+#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
+
+namespace HeuristicLab.Services.WebApp.Controllers.DataTransfer {
   public class User {
     public string Username { get; set; }

stable/HeuristicLab.Services.WebApp/3.3/Controllers/PluginController.cs

@@ -1 @@
-using System.Collections.Generic;
+#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 System.Collections.Generic;
 using System.Linq;
 using System.Web.Http;
+using HeuristicLab.Services.Hive;
 using DTO = HeuristicLab.Services.WebApp.Controllers.DataTransfer;
 
 namespace HeuristicLab.Services.WebApp.Controllers {
 
-  [Authorize(Roles = "Hive Administrator")]
+  [Authorize(Roles = HiveRoles.Administrator)]
   public class PluginController : ApiController {
 
@@ -12 +34 @@
 
     public IEnumerable<DTO.Plugin> GetPlugins() {
-      var plugins = pluginManager.GetPlugins();
+      var plugins = pluginManager.Plugins;
       return plugins.Select(plugin => new DTO.Plugin {
         Name = plugin.Name,
         AssemblyName = plugin.AssemblyName,
-        LastReload = plugin.LastReload
+        LastReload = plugin.LastReload,
+        Exception = plugin.Exception
       });
     }
 
     public bool ReloadPlugin(string name) {
-      var plugin = PluginManager.Instance.GetPlugin(name);
+      var plugin = pluginManager.GetPlugin(name);
+      if (plugin == null)
+        return false;
       plugin.ReloadControllers();
       return true;

stable/HeuristicLab.Services.WebApp/3.3/Controllers/WebAppControllerSelector.cs

@@ -1 @@
-using System;
+#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 System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -18 +39 @@
       : base(configuration) {
       this.configuration = configuration;
-      pluginManager.Configuration = configuration;
       controllers = new ConcurrentDictionary<string, HttpControllerDescriptor>();
       LoadAppControllers();