Changeset 6000 for branches/HeuristicLab.Hive-3.4/sources

Timestamp:

04/11/11 15:32:27 (14 years ago)

Author:

cneumuel

Message:

#1233

• added GetPlugin service method
• fixed minor issues with double plugins in database
• worked on HiveEngine
• fixed wrong role name for Hive User
• fixed bug in group assignment of slaves

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive.Slave.Tests/Mocks/MockHiveService.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.4/ExperimentManager/ExperimentManagerClient.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.4/PluginUtil.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveServiceClient.cs (modified) (7 diffs)
• HeuristicLab.Clients.Hive/3.4/ServiceClients/Plugin.cs (modified) (1 diff)
• HeuristicLab.Hive 3.4.sln (modified) (4 diffs)
• HeuristicLab.HiveEngine.Test (added)
• HeuristicLab.HiveEngine.Test/HeuristicLab.HiveEngine.Test.csproj (added)
• HeuristicLab.HiveEngine.Test/Program.cs (added)
• HeuristicLab.HiveEngine.Test/Properties (added)
• HeuristicLab.HiveEngine.Test/Properties/AssemblyInfo.cs (added)
• HeuristicLab.HiveEngine.Test/app.config (added)
• HeuristicLab.HiveEngine/3.4 (modified) (1 prop)
• HeuristicLab.HiveEngine/3.4/EngineJob.cs (modified) (4 diffs)
• HeuristicLab.HiveEngine/3.4/HeuristicLabHiveEnginePlugin.cs (added)
• HeuristicLab.HiveEngine/3.4/HiveEngine.cs (modified) (5 diffs)
• HeuristicLab.HiveEngine/3.4/Properties/AssemblyInfo.cs (added)
• HeuristicLab.Services.Hive.Common/3.4/HeuristicLab.Services.Hive.Common-3.4.csproj (modified) (1 diff)
• HeuristicLab.Services.Hive.Common/3.4/ServiceContracts/IHiveService.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.Common/3.4/ServiceFaults (added)
• HeuristicLab.Services.Hive.Common/3.4/ServiceFaults/PluginAlreadyExistsFault.cs (added)
• HeuristicLab.Services.Hive/3.4/HiveRoles.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.4/HiveService.cs (modified) (3 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Tests/Mocks/MockHiveService.cs

@@ -266 +266 @@
     }
 
+    public Plugin GetPlugin(Guid pluginId) {
+      if (plugins == null)
+        plugins = ReadPluginsFromServerCache();
+      return plugins.SingleOrDefault(x => x.Id == pluginId);
+    }
+
     public List<Plugin> GetPlugins() {
       if (plugins == null)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/ExperimentManagerClient.cs

@@ -50 +50 @@
     }
 
-    private IEnumerable<Plugin> onlinePlugins;
-    public IEnumerable<Plugin> OnlinePlugins {
+    private List<Plugin> onlinePlugins;
+    public List<Plugin> OnlinePlugins {
       get { return onlinePlugins; }
       set { onlinePlugins = value; }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/PluginUtil.cs

@@ -24 +24 @@
 using System.IO;
 using System.Linq;
+using System.ServiceModel;
 using HeuristicLab.PluginInfrastructure;
 
@@ -38 +39 @@
     /// <param name="useLocalPlugins">If true, the plugins which are already online are ignored. All local plugins are uploaded, but only once.</param>
     /// <returns></returns>
-    public static List<Guid> GetPluginDependencies(IHiveService service, IEnumerable<Plugin> onlinePlugins, List<Plugin> alreadyUploadedPlugins, IEnumerable<IPluginDescription> neededPlugins, bool useLocalPlugins) {
+    public static List<Guid> GetPluginDependencies(IHiveService service, List<Plugin> onlinePlugins, List<Plugin> alreadyUploadedPlugins, IEnumerable<IPluginDescription> neededPlugins, bool useLocalPlugins) {
       var pluginIds = new List<Guid>();
       foreach (var neededPlugin in neededPlugins) {
-        Plugin foundPlugin = alreadyUploadedPlugins.SingleOrDefault(p => p.Name == neededPlugin.Name && p.Version == neededPlugin.Version);
+        Plugin foundPlugin = alreadyUploadedPlugins.FirstOrDefault(p => p.Name == neededPlugin.Name && p.Version == neededPlugin.Version);
         if (foundPlugin == null) {
-          foundPlugin = onlinePlugins.SingleOrDefault(p => p.Name == neededPlugin.Name && p.Version == neededPlugin.Version);
+          foundPlugin = onlinePlugins.FirstOrDefault(p => p.Name == neededPlugin.Name && p.Version == neededPlugin.Version);
           if (useLocalPlugins || foundPlugin == null) {
             Plugin p = CreatePlugin(neededPlugin, useLocalPlugins);
             List<PluginData> pd = CreatePluginDatas(neededPlugin);
-            p.Id = service.AddPlugin(p, pd);
-            alreadyUploadedPlugins.Add(p);
-            pluginIds.Add(p.Id);
+            try {
+              p.Id = service.AddPlugin(p, pd);
+              alreadyUploadedPlugins.Add(p);
+              pluginIds.Add(p.Id);
+            }
+            catch (FaultException<PluginAlreadyExistsFault> fault) {
+              onlinePlugins.Add(service.GetPlugin(fault.Detail.Id));
+            }
           } else {
             pluginIds.Add(foundPlugin.Id);

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveServiceClient.cs

@@ -1673 +1673 @@
     }
     
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
+    [System.Runtime.Serialization.DataContractAttribute(Name="PluginAlreadyExistsFault", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.Common")]
+    [System.SerializableAttribute()]
+    public partial class PluginAlreadyExistsFault : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
+    {
+        
+        [System.NonSerializedAttribute()]
+        private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
+        
+        [System.Runtime.Serialization.OptionalFieldAttribute()]
+        private System.Guid IdField;
+        
+        public System.Runtime.Serialization.ExtensionDataObject ExtensionData
+        {
+            get
+            {
+                return this.extensionDataField;
+            }
+            set
+            {
+                this.extensionDataField = value;
+            }
+        }
+        
+        [System.Runtime.Serialization.DataMemberAttribute()]
+        public System.Guid Id
+        {
+            get
+            {
+                return this.IdField;
+            }
+            set
+            {
+                if ((this.IdField.Equals(value) != true))
+                {
+                    this.IdField = value;
+                    this.RaisePropertyChanged("Id");
+                }
+            }
+        }
+        
+        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
+        
+        protected void RaisePropertyChanged(string propertyName)
+        {
+            System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
+            if ((propertyChanged != null))
+            {
+                propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
+            }
+        }
+    }
+    
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
     [System.ServiceModel.ServiceContractAttribute(ConfigurationName="HeuristicLab.Clients.Hive.IHiveService")]
@@ -1678 +1732 @@
     {
         
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/AddAppointment", ReplyAction="http://tempuri.org/IHiveService/AddAppointmentResponse")]
+        System.Guid AddAppointment(HeuristicLab.Clients.Hive.Appointment appointment);
+        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/DeleteAppointment", ReplyAction="http://tempuri.org/IHiveService/DeleteAppointmentResponse")]
         void DeleteAppointment(System.Guid appointmentId);
@@ -1759 +1816 @@
         System.Collections.Generic.List<HeuristicLab.Clients.Hive.MessageContainer> Heartbeat([System.ServiceModel.MessageParameterAttribute(Name="heartbeat")] HeuristicLab.Clients.Hive.Heartbeat heartbeat1);
         
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetPlugin", ReplyAction="http://tempuri.org/IHiveService/GetPluginResponse")]
+        HeuristicLab.Clients.Hive.Plugin GetPlugin(System.Guid pluginId);
+        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/AddPlugin", ReplyAction="http://tempuri.org/IHiveService/AddPluginResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(HeuristicLab.Clients.Hive.PluginAlreadyExistsFault), Action="http://tempuri.org/IHiveService/AddPluginPluginAlreadyExistsFaultFault", Name="PluginAlreadyExistsFault", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.Common")]
         System.Guid AddPlugin(HeuristicLab.Clients.Hive.Plugin plugin, System.Collections.Generic.List<HeuristicLab.Clients.Hive.PluginData> pluginData);
         
@@ -1809 +1870 @@
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/TriggerLifecycle", ReplyAction="http://tempuri.org/IHiveService/TriggerLifecycleResponse")]
         void TriggerLifecycle(bool force);
-        
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/AddAppointment", ReplyAction="http://tempuri.org/IHiveService/AddAppointmentResponse")]
-        System.Guid AddAppointment(HeuristicLab.Clients.Hive.Appointment appointment);
     }
     
@@ -1848 +1906 @@
         }
         
+        public System.Guid AddAppointment(HeuristicLab.Clients.Hive.Appointment appointment)
+        {
+            return base.Channel.AddAppointment(appointment);
+        }
+        
         public void DeleteAppointment(System.Guid appointmentId)
         {
@@ -1983 +2046 @@
         }
         
+        public HeuristicLab.Clients.Hive.Plugin GetPlugin(System.Guid pluginId)
+        {
+            return base.Channel.GetPlugin(pluginId);
+        }
+        
         public System.Guid AddPlugin(HeuristicLab.Clients.Hive.Plugin plugin, System.Collections.Generic.List<HeuristicLab.Clients.Hive.PluginData> pluginData)
         {
@@ -2067 +2135 @@
             base.Channel.TriggerLifecycle(force);
         }
-        
-        public System.Guid AddAppointment(HeuristicLab.Clients.Hive.Appointment appointment)
-        {
-            return base.Channel.AddAppointment(appointment);
-        }
     }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/Plugin.cs

@@ -39 +39 @@
       return new Plugin(this, cloner);
     }
+
+    public override string ToString() {
+      return string.Format("{0}-{1}", this.Name, this.Version.ToString()) + (this.IsLocal ? ", Local" : string.Empty);
+    }
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Hive 3.4.sln

@@ -34 +34 @@
   ProjectSection(WebsiteProperties) = preProject
     TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
-    ProjectReferences = "{CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}|HeuristicLab.Services.Hive-3.4.dll;{14424A16-48D4-445E-80BF-DDF617548BBB}|HeuristicLab.Services.Hive.Common-3.4.dll;{EC2C8109-6E1E-4C88-9A2B-908CFF2EF4AC}|HeuristicLab.Services.Hive.DataAccess-3.4.dll;"
+    ProjectReferences = "{CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}|HeuristicLab.Services.Hive-3.4.dll;{14424A16-48D4-445E-80BF-DDF617548BBB}|HeuristicLab.Services.Hive.Common-3.4.dll;{EC2C8109-6E1E-4C88-9A2B-908CFF2EF4AC}|HeuristicLab.Services.Hive.DataAccess-3.4.dll;{F98A1740-9AC9-4D36-A582-6A2D0D06978D}|HeuristicLab.Hive-3.4.dll;"
     Debug.AspNetCompiler.VirtualPath = "/Hive-3.4"
     Debug.AspNetCompiler.PhysicalPath = "HeuristicLab.Services.Hive.Web\Hive-3.4\"
@@ -92 +92 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.HiveEngine-3.4", "HeuristicLab.HiveEngine\3.4\HeuristicLab.HiveEngine-3.4.csproj", "{2C036542-5451-4A23-AFF6-87575C7BAFE7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.HiveEngine.Test", "HeuristicLab.HiveEngine.Test\HeuristicLab.HiveEngine.Test.csproj", "{87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}"
 EndProject
 Global
@@ -386 +388 @@
     {2C036542-5451-4A23-AFF6-87575C7BAFE7}.Release|x86.ActiveCfg = Release|x86
     {2C036542-5451-4A23-AFF6-87575C7BAFE7}.Release|x86.Build.0 = Release|x86
+    {87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+    {87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}.Debug|Mixed Platforms.Build.0 = Debug|x86
+    {87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}.Debug|x64.ActiveCfg = Debug|x86
+    {87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}.Debug|x86.ActiveCfg = Debug|x86
+    {87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}.Debug|x86.Build.0 = Debug|x86
+    {87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}.Release|Any CPU.ActiveCfg = Release|x86
+    {87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}.Release|Mixed Platforms.ActiveCfg = Release|x86
+    {87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}.Release|Mixed Platforms.Build.0 = Release|x86
+    {87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}.Release|x64.ActiveCfg = Release|x86
+    {87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}.Release|x86.ActiveCfg = Release|x86
+    {87D9FBB9-8E54-4770-9C84-B4B571D9EDD5}.Release|x86.Build.0 = Release|x86
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution
@@ -413 +428 @@
     {A0EB9657-4D57-4CC1-A309-EC010D7F9EAB} = {9963403B-3CB9-48E0-9FEB-B1CE12C31601}
     {2C036542-5451-4A23-AFF6-87575C7BAFE7} = {4596C5BB-CAB1-4C01-891F-4890F9F16CF8}
+    {87D9FBB9-8E54-4770-9C84-B4B571D9EDD5} = {4596C5BB-CAB1-4C01-891F-4890F9F16CF8}
   EndGlobalSection
 EndGlobal

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/EngineJob.cs

@@ -33 +33 @@
       this.initialOperation = initialOperation;
       this.engine = engine;
-      this.engine.Prepare(initialOperation);
       RegisterEngineEvents();
     }
@@ -42 +41 @@
       : base(original, cloner) {
       this.engine = cloner.Clone(original.engine);
+      this.initialOperation = cloner.Clone(original.initialOperation);
       RegisterEngineEvents();
     }
@@ -60 +60 @@
 
     public override void Start() {
+      engine.Prepare(initialOperation);
       engine.Start();
     }
     
     public override void Pause() {
-      throw new NotImplementedException();
+      engine.Pause();
     }
 
@@ -80 +81 @@
     }
 
-    void engine_ExceptionOccurred(object sender, EventArgs<Exception> e) {
+    private void engine_ExceptionOccurred(object sender, EventArgs<Exception> e) {
       OnJobFailed(e);
     }
 
-    void engine_Stopped(object sender, EventArgs e) {
+    private void engine_Stopped(object sender, EventArgs e) {
       OnJobStopped();
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/HiveEngine.cs

@@ -46 +46 @@
     }
 
-    private IEnumerable<Plugin> onlinePlugins;
-    public IEnumerable<Plugin> OnlinePlugins {
+    private List<Plugin> onlinePlugins;
+    public List<Plugin> OnlinePlugins {
       get { return onlinePlugins; }
       set { onlinePlugins = value; }
     }
-    
+
     private List<Plugin> alreadyUploadedPlugins;
     public List<Plugin> AlreadyUploadedPlugins {
@@ -102 +102 @@
       TaskScheduler.UnobservedTaskException += new EventHandler<UnobservedTaskExceptionEventArgs>(TaskScheduler_UnobservedTaskException);
 
-      this.OnlinePlugins = ServiceLocator.Instance.CallHiveService(s => s.GetPlugins());
+      this.OnlinePlugins = ServiceLocator.Instance.CallHiveService(s => s.GetPlugins()).Where(x => x.IsLocal == false).ToList();
       this.AlreadyUploadedPlugins = new List<Plugin>();
 
@@ -123 +123 @@
 
             IScope[] scopes = ExecuteOnHive(jobs, parentScopeClone, cancellationToken);
-
+            //IScope[] scopes = ExecuteLocally(jobs, parentScopeClone, cancellationToken);
+            
             for (int i = 0; i < coll.Count; i++) {
               if (coll[i] is IAtomicOperation) {
@@ -183 +184 @@
       target.SubScopes.AddRange(source.SubScopes);
       // TODO: validate if parent scopes match - otherwise source is invalid
+    }
+
+    private IScope[] ExecuteLocally(EngineJob[] jobs, IScope parentScopeClone, CancellationToken cancellationToken) {
+      IScope[] scopes = new Scope[jobs.Length];
+
+      for (int i = 0; i < jobs.Length; i++) {
+        var job = (EngineJob)jobs[i].Clone();
+        job.Start();
+        while (job.ExecutionState != ExecutionState.Stopped) {
+          Thread.Sleep(100);
+        }
+        scopes[i] = ((IAtomicOperation)job.InitialOperation).Scope;
+      }
+
+      return scopes;
     }
 
@@ -444 +460 @@
     /// </summary>
     private static void TryAndRepeat(Action action, int repetitions, string errorMessage) {
-      while (repetitions > 0) {
-        try { action(); }
-        catch (Exception e) {
-          repetitions--;
-          if (repetitions == 0) {
-            throw new HiveEngineException(errorMessage, e);
-          }
-        }
-      }
-    }
-
-    private static void TryAndRepeat(Action action) {
-      TryAndRepeat(action, -1, string.Empty);
+      try { action(); }
+      catch (Exception e) {
+        repetitions--;
+        if (repetitions <= 0)
+          throw new HiveEngineException(errorMessage, e);
+        TryAndRepeat(action, repetitions, errorMessage);
+      }
     }
   }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/HeuristicLab.Services.Hive.Common-3.4.csproj

@@ -95 +95 @@
   <ItemGroup>
     <Compile Include="ApplicationConstants.cs" />
+    <Compile Include="ServiceFaults\PluginAlreadyExistsFault.cs" />
     <None Include="HeuristicLabServicesHiveCommonPlugin.cs.frame" />
     <Compile Include="DataTransfer\Appointment.cs" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/ServiceContracts/IHiveService.cs

@@ -101 +101 @@
     #region Plugin Methods
     [OperationContract]
+    Plugin GetPlugin(Guid pluginId);
+    [OperationContract]
+    [FaultContract(typeof(PluginAlreadyExistsFault))]
     Guid AddPlugin(Plugin plugin, List<PluginData> pluginData);
     [OperationContract]

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveRoles.cs

@@ -25 +25 @@
     public const string Administrator = "Hive Administrator";
     public const string Slave = "Hive Slave";
-    public const string Client = "Hive Client";
+    public const string Client = "Hive User";
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs

@@ -250 +250 @@
           dao.AddSlave(slaveInfo);
         } else {
-          dao.UpdateSlave(slaveInfo);
+          var dbSlave = dao.GetSlave(slaveInfo.Id);
+
+          dbSlave.Name = slaveInfo.Name;
+          dbSlave.Description = slaveInfo.Description;
+
+          dbSlave.Cores = slaveInfo.Cores;
+          dbSlave.CpuArchitecture = slaveInfo.CpuArchitecture;
+          dbSlave.CpuSpeed = slaveInfo.CpuSpeed;
+          dbSlave.FreeCores = slaveInfo.FreeCores;
+          dbSlave.FreeMemory = slaveInfo.FreeMemory;
+          dbSlave.Memory = slaveInfo.Memory;
+          dbSlave.OperatingSystem = slaveInfo.OperatingSystem;
+          
+          dbSlave.LastHeartbeat = DateTime.Now;          
+          dbSlave.SlaveState = SlaveState.Idle;
+
+          // don't update those properties:
+          // dbSlave.IsAllowedToCalculate = slaveInfo.IsAllowedToCalculate; 
+          // dbSlave.ParentResourceId = slaveInfo.ParentResourceId;
+
+          dao.UpdateSlave(dbSlave);
         }
       });
@@ -282 +302 @@
         plugin.UserId = auth.UserId;
         plugin.DateCreated = DateTime.Now;
+        if (!plugin.IsLocal) {
+          var existing = dao.GetPlugins(x => x.Name == plugin.Name && x.Version == plugin.Version.ToString() && !x.IsLocal);
+          if (existing.Count() > 0) {
+            // a plugin with the same name and version already exists.
+            throw new FaultException<PluginAlreadyExistsFault>(new PluginAlreadyExistsFault(existing.Single().Id));
+          }
+        }
         Guid pluginId = dao.AddPlugin(plugin);
         foreach (PluginData pluginData in pluginDatas) {
@@ -289 +316 @@
         return pluginId;
       });
+    }
+
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Administrator)]
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Client)]
+    [PrincipalPermission(SecurityAction.Demand, Role = HiveRoles.Slave)]
+    public Plugin GetPlugin(Guid pluginId) {
+      return dao.GetPlugin(pluginId);
     }