Changeset 403 for trunk/sources/HeuristicLab.CEDMA.Server

Timestamp:

07/29/08 18:05:18 (16 years ago)

Author:

gkronber

Message:

• fixed ticket #201 (Fix plugin dependencies for CEDMA plugins)
• deleted classes DbPersistenceManager because the common code was moved to the PersistenceManager in HeuristicLab.Core.

Location:

trunk/sources/HeuristicLab.CEDMA.Server

Files:

• DbPersistenceManager.cs (deleted)
• HeuristicLab.CEDMA.Server.csproj (modified) (3 diffs)
• HeuristicLabCedmaServerPlugin.cs (modified) (1 diff)
• RunScheduler.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.CEDMA.Server/HeuristicLab.CEDMA.Server.csproj

@@ -60 +60 @@
   <ItemGroup>
     <Compile Include="RunScheduler.cs" />
-    <Compile Include="DbPersistenceManager.cs" />
     <Compile Include="ServerApplication.cs" />
     <Compile Include="HeuristicLabCedmaServerPlugin.cs" />
@@ -72 +71 @@
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\HeuristicLab.CEDMA.Core\HeuristicLab.CEDMA.Core.csproj">
-      <Project>{C27DDF6C-84DF-45EF-B82F-57A28DD51166}</Project>
-      <Name>HeuristicLab.CEDMA.Core</Name>
-    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.CEDMA.DB.Interfaces\HeuristicLab.CEDMA.DB.Interfaces.csproj">
       <Project>{4F9BB789-D561-436B-B226-2BF44B7D0804}</Project>
@@ -100 +95 @@
       <Name>HeuristicLab.PluginInfrastructure</Name>
     </ProjectReference>
-    <ProjectReference Include="..\HeuristicLab.SequentialEngine\HeuristicLab.SequentialEngine.csproj">
-      <Project>{B4BE8E53-BA06-4237-9A01-24255F880201}</Project>
-      <Name>HeuristicLab.SequentialEngine</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>

trunk/sources/HeuristicLab.CEDMA.Server/HeuristicLabCedmaServerPlugin.cs

@@ -29 +29 @@
   [PluginFile(Filename = "HeuristicLab.CEDMA.Server.dll", Filetype = PluginFileType.Assembly)]
   [Dependency(Dependency = "HeuristicLab.CEDMA.DB.Interfaces")]
+  [Dependency(Dependency = "HeuristicLab.CEDMA.DB")]
+  [Dependency(Dependency = "HeuristicLab.Grid")]
+  [Dependency(Dependency = "HeuristicLab.Core")]
+  [Dependency(Dependency = "HeuristicLab.Data")]
   public class HeuristicLabCedmaServerPlugin : PluginBase {
   }

trunk/sources/HeuristicLab.CEDMA.Server/RunScheduler.cs

@@ -28 +28 @@
 using HeuristicLab.Core;
 using System.Threading;
-using HeuristicLab.CEDMA.Core;
 using HeuristicLab.Grid;
 using System.Diagnostics;
@@ -69 +68 @@
       }
       foreach(AgentEntry entry in agents) {
-        Agent agent = (Agent)DbPersistenceManager.Restore(entry.RawData);
-        IOperatorGraph opGraph = agent.OperatorGraph;
         Scope scope = new Scope();
         // initialize CEDMA variables for the execution of the agent
         scope.AddVariable(new Variable("AgentId", new IntData((int)entry.Id)));
         scope.AddVariable(new Variable("CedmaServerUri", new StringData(serverUri)));
+        IOperatorGraph opGraph = (IOperatorGraph)PersistenceManager.RestoreFromGZip(entry.RawData);
         AtomicOperation op = new AtomicOperation(opGraph.InitialOperator, scope);
         WaitHandle wHandle;