Changeset 988 for branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Server/ServerForm.cs

Timestamp:

12/15/08 01:22:08 (13 years ago)

Author:

gkronber

Message:

worked on #419 (Refactor CEDMA plugins)

File:

• branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Server/ServerForm.cs (modified) (4 diffs)

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Server/ServerForm.cs

@@ -43 +43 @@
   public partial class ServerForm : Form {
     private ServiceHost host;
-    private ServiceHost rdfHost;
-    private Database database;
     private Store store;
-    private static readonly string dbFile = AppDomain.CurrentDomain.BaseDirectory + "/test.db3";
-    private static readonly string connectionString = "Data Source=\"" + dbFile + "\";Pooling=False";
     private static readonly string rdfFile = AppDomain.CurrentDomain.BaseDirectory + "rdf_store.db3";
     private static readonly string rdfConnectionString = "sqlite:rdf:Data Source=\"" + rdfFile + "\"";
@@ -63 +59 @@
       JobManager jobManager = new JobManager(gridAddress.Text);
       jobManager.Reset();
-      RunScheduler scheduler = new RunScheduler(database, jobManager, addressTextBox.Text);
-      Thread runSchedulerThread = new Thread(scheduler.Run);
-      runSchedulerThread.Start();
-    }
-
-    private void InitDatabase() {
-      DbProviderFactory fact;
-      fact = DbProviderFactories.GetFactory("System.Data.SQLite");
-      if(!System.IO.File.Exists(dbFile)) {
-        database = new Database(connectionString);
-        database.CreateNew();
-      } else {
-        database = new Database(connectionString);
-      }
     }
 
@@ -84 +66 @@
 
     private void Start() {
-      InitDatabase();
       InitRdfStore();
       InitRunScheduler();
 
-      host = new ServiceHost(database, new Uri(addressTextBox.Text));
-      rdfHost = new ServiceHost(store, new Uri(addressTextBox.Text+"/RdfStore"));
+      host = new ServiceHost(store, new Uri(addressTextBox.Text));
       ServiceThrottlingBehavior throttlingBehavior = new ServiceThrottlingBehavior();
       throttlingBehavior.MaxConcurrentSessions = 20;
       host.Description.Behaviors.Add(throttlingBehavior);
-      rdfHost.Description.Behaviors.Add(throttlingBehavior);
       try {
         NetTcpBinding binding = new NetTcpBinding();
@@ -101 +80 @@
         binding.Security.Mode = SecurityMode.None;
 
-        host.AddServiceEndpoint(typeof(IDatabase), binding, addressTextBox.Text);
+        host.AddServiceEndpoint(typeof(IStore), binding, addressTextBox.Text);
         host.Open();
-        rdfHost.AddServiceEndpoint(typeof(IStore), binding, addressTextBox.Text+"/RdfStore");
-        rdfHost.Open();
       } catch(CommunicationException ex) {
         MessageBox.Show("An exception occurred: " + ex.Message);
         host.Abort();
-        rdfHost.Abort();
       }
     }