Changeset 12435 for trunk/sources/HeuristicLab.Services.WebApp/3.3/Controllers

Timestamp:

06/12/15 14:59:54 (10 years ago)

Author:

dglaser

Message:

#2394: Improved PluginManager and updated hive status monitor.

Location:

trunk/sources/HeuristicLab.Services.WebApp/3.3/Controllers

Files:

• AppController.cs (modified) (2 diffs)
• AuthenticationController.cs (modified) (1 diff)
• DataTransfer/Plugin.cs (modified) (1 diff)
• DataTransfer/User.cs (modified) (1 diff)
• PluginController.cs (modified) (2 diffs)
• WebAppControllerSelector.cs (modified) (2 diffs)

trunk/sources/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");
     }

trunk/sources/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;

trunk/sources/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 {

trunk/sources/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; }

trunk/sources/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 {
 
@@ -21 +43 @@
 
     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;

trunk/sources/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();