Added OpenSim.Grid.Framework project.

Changed the Gridserver so it uses/references OpenSim.Grid.Framework

6 files changed, 11 insertions, 2 deletions

diff --git a/OpenSim/Grid/GridServer/GridMessagingModule.cs b/OpenSim/Grid/GridServer/GridMessagingModule.cs
index 14ce727..7194ba4 100644
--- a/OpenSim/Grid/GridServer/GridMessagingModule.cs
+++ b/OpenSim/Grid/GridServer/GridMessagingModule.cs
@@ -34,6 +34,7 @@ using Nwc.XmlRpc;
 using log4net;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework;
+using OpenSim.Grid.Framework;
 
 namespace OpenSim.Grid.GridServer
 {
diff --git a/OpenSim/Grid/GridServer/GridRestModule.cs b/OpenSim/Grid/GridServer/GridRestModule.cs
index 7d3bd18..2ec7cdb 100644
--- a/OpenSim/Grid/GridServer/GridRestModule.cs
+++ b/OpenSim/Grid/GridServer/GridRestModule.cs
@@ -37,6 +37,7 @@ using OpenSim.Data;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Servers;
+using OpenSim.Grid.Framework;
 
 namespace OpenSim.Grid.GridServer
 {
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index f118c90..7b47aab 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -34,6 +34,7 @@ using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
+using OpenSim.Grid.Framework;
 
 namespace OpenSim.Grid.GridServer
 {
@@ -155,6 +156,9 @@ namespace OpenSim.Grid.GridServer
             m_gridDBService = new GridDBService();
             m_gridDBService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect);
 
+            //Register the database access service so modules can fetch it
+            // RegisterInterface<GridDBService>(m_gridDBService);
+
             m_gridMessageModule = new GridMessagingModule();
             m_gridMessageModule.Initialise(m_version, m_gridDBService, this, m_config);
 
diff --git a/OpenSim/Grid/GridServer/GridXmlRpcModule.cs b/OpenSim/Grid/GridServer/GridXmlRpcModule.cs
index e0e16b5..d69f079 100644
--- a/OpenSim/Grid/GridServer/GridXmlRpcModule.cs
+++ b/OpenSim/Grid/GridServer/GridXmlRpcModule.cs
@@ -38,6 +38,7 @@ using OpenSim.Data;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Servers;
+using OpenSim.Grid.Framework;
 
 namespace OpenSim.Grid.GridServer
 {
diff --git a/OpenSim/Grid/GridServer/IGridMessagingMapper.cs b/OpenSim/Grid/GridServer/IGridMessagingMapper.cs
index 0183ad5..5475029 100644
--- a/OpenSim/Grid/GridServer/IGridMessagingMapper.cs
+++ b/OpenSim/Grid/GridServer/IGridMessagingMapper.cs
@@ -31,10 +31,11 @@ using OpenSim.Framework.Servers;
 

 namespace OpenSim.Grid.GridServer

 {

+    /*

     public interface IGridMessagingMapper

     {

         List<MessageServerInfo> GetMessageServersList();

         void RegisterMessageServer(MessageServerInfo m);

         void DeRegisterMessageServer(MessageServerInfo m);

-    }

+    }*/

 }

diff --git a/OpenSim/Grid/GridServer/IUGAIMCore.cs b/OpenSim/Grid/GridServer/IUGAIMCore.cs
index 561c230..6c53b59 100644
--- a/OpenSim/Grid/GridServer/IUGAIMCore.cs
+++ b/OpenSim/Grid/GridServer/IUGAIMCore.cs
@@ -30,11 +30,12 @@ using OpenSim.Framework.Servers;
 
 namespace OpenSim.Grid.GridServer
 {
+    /*
     public interface IUGAIMCore
     {
         T Get<T>();
         void RegisterInterface<T>(T iface);
         bool TryGet<T>(out T iface);
         BaseHttpServer GetHttpServer();
-    }
+    }*/
 }