Context Navigation

Changeset 4791 for branches

Timestamp:

11/15/10 12:52:54 (14 years ago)

Author:

cneumuel

Message:

#1260

Location:

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive

Files:

r4105	r4791
10	10	<FallbackCulture>en-US</FallbackCulture>
11	11	<VerifyUploadedFiles>false</VerifyUploadedFiles>
12		<ProjectView>~~ShowAll~~Files</ProjectView>
	12	<ProjectView>ProjectFiles</ProjectView>
13	13	</PropertyGroup>
14	14	</Project>

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive/HeuristicLab.Calendar/3.3/Properties
- Property svn:ignore set to
  AssemblyInfo.cs

r4772	r4791
50	50	event EventHandler Stopped;
51	51
52		IEnumerable<PluginDescription> Plugins { get; ~~set;~~ }
	52	IEnumerable<PluginDescription> Plugins { get;}
53	53	}
54	54	}

r4760	r4791
136	136	: this() {
137	137	this.Job = new OptimizerJob(optimizer);
	138	this.IsFinishedOptimizerDownloaded = false;
138	139	}
139	140	public HiveJob(SerializedJob serializedJob, bool autoCreateChildHiveJobs)

-                      r4772
+                      r4791
 using System.Collections.Generic;
 using HeuristicLab.PluginInfrastructure.Manager;
+using System.IO;
 namespace HeuristicLab.Hive.Server.Core {
 …
     private Thread thread;
     private bool shutdownRequested;
+    private PluginManager pm;
     private TimeSpan interval = new TimeSpan(0, 0, 10);
 …
     private IEnumerable<PluginDescription> plugins;
     public IEnumerable<PluginDescription> Plugins {
+      get { return plugins; }
+      set { plugins = value; }
+      get { return pm.Plugins; }
+    }
 …
     public void Start() {
+      LoadPlugins();
       Thread thread = new Thread(RunHeartbeatThread);
       thread.Start();
 …
         OnStarted();
+      }
+    }
+    private void LoadPlugins() {
+      pm = new PluginManager(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "App_Data\\Plugins"));
+      pm.DiscoverAndCheckPlugins();
+      pm.InitializeLifetimeService();
+    }

r4710	r4791
91	91	//lifecycleManager = ApplicationManager.Manager.GetInstances<ILifecycleManager>().First();
92	92	lifecycleManager = new LifecycleManager();
	93	lifecycleManager.Start();
93	94	}
94	95	return lifecycleManager;

-                      r4772
+                      r4791
       lock (locker) {
         if (lifecycleManager == null) {
-          pm = new PluginManager(@"C:\ch\SVN\branches\HeuristicLab.Hive\sources\HeuristicLab.Hive\HiveWeb\App_Data\Plugins\");
-          pm.DiscoverAndCheckPlugins();
-          pm.InitializeLifetimeService();
           lifecycleManager = ServiceLocator.GetLifecycleManager();
-          lifecycleManager.Plugins = pm.Plugins;
-          lifecycleManager.Start();
+        }
+      }

Note: See TracChangeset for help on using the changeset viewer.