diff options
author | MW | 2009-02-24 13:53:38 +0000 |
---|---|---|
committer | MW | 2009-02-24 13:53:38 +0000 |
commit | 6954013d82eba2e6e1d77356fd879b369de7a26f (patch) | |
tree | 638a6a8b7be51339c63dd2be9f9203d1df4e638d /OpenSim/Grid/GridServer | |
parent | More refactoring of the UserServer. (diff) | |
download | opensim-SC-6954013d82eba2e6e1d77356fd879b369de7a26f.zip opensim-SC-6954013d82eba2e6e1d77356fd879b369de7a26f.tar.gz opensim-SC-6954013d82eba2e6e1d77356fd879b369de7a26f.tar.bz2 opensim-SC-6954013d82eba2e6e1d77356fd879b369de7a26f.tar.xz |
Added OpenSim.Grid.Framework project.
Changed the Gridserver so it uses/references OpenSim.Grid.Framework
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/GridServer/GridMessagingModule.cs | 1 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/GridRestModule.cs | 1 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/GridServerBase.cs | 4 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/GridXmlRpcModule.cs | 1 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/IGridMessagingMapper.cs | 3 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/IUGAIMCore.cs | 3 |
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; | |||
34 | using log4net; | 34 | using log4net; |
35 | using OpenSim.Framework.Servers; | 35 | using OpenSim.Framework.Servers; |
36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Grid.Framework; | ||
37 | 38 | ||
38 | namespace OpenSim.Grid.GridServer | 39 | namespace OpenSim.Grid.GridServer |
39 | { | 40 | { |
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; | |||
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Framework.Communications; | 38 | using OpenSim.Framework.Communications; |
39 | using OpenSim.Framework.Servers; | 39 | using OpenSim.Framework.Servers; |
40 | using OpenSim.Grid.Framework; | ||
40 | 41 | ||
41 | namespace OpenSim.Grid.GridServer | 42 | namespace OpenSim.Grid.GridServer |
42 | { | 43 | { |
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; | |||
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Console; | 35 | using OpenSim.Framework.Console; |
36 | using OpenSim.Framework.Servers; | 36 | using OpenSim.Framework.Servers; |
37 | using OpenSim.Grid.Framework; | ||
37 | 38 | ||
38 | namespace OpenSim.Grid.GridServer | 39 | namespace OpenSim.Grid.GridServer |
39 | { | 40 | { |
@@ -155,6 +156,9 @@ namespace OpenSim.Grid.GridServer | |||
155 | m_gridDBService = new GridDBService(); | 156 | m_gridDBService = new GridDBService(); |
156 | m_gridDBService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect); | 157 | m_gridDBService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect); |
157 | 158 | ||
159 | //Register the database access service so modules can fetch it | ||
160 | // RegisterInterface<GridDBService>(m_gridDBService); | ||
161 | |||
158 | m_gridMessageModule = new GridMessagingModule(); | 162 | m_gridMessageModule = new GridMessagingModule(); |
159 | m_gridMessageModule.Initialise(m_version, m_gridDBService, this, m_config); | 163 | m_gridMessageModule.Initialise(m_version, m_gridDBService, this, m_config); |
160 | 164 | ||
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; | |||
38 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
39 | using OpenSim.Framework.Communications; | 39 | using OpenSim.Framework.Communications; |
40 | using OpenSim.Framework.Servers; | 40 | using OpenSim.Framework.Servers; |
41 | using OpenSim.Grid.Framework; | ||
41 | 42 | ||
42 | namespace OpenSim.Grid.GridServer | 43 | namespace OpenSim.Grid.GridServer |
43 | { | 44 | { |
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; | |||
31 | 31 | ||
32 | namespace OpenSim.Grid.GridServer | 32 | namespace OpenSim.Grid.GridServer |
33 | { | 33 | { |
34 | /* | ||
34 | public interface IGridMessagingMapper | 35 | public interface IGridMessagingMapper |
35 | { | 36 | { |
36 | List<MessageServerInfo> GetMessageServersList(); | 37 | List<MessageServerInfo> GetMessageServersList(); |
37 | void RegisterMessageServer(MessageServerInfo m); | 38 | void RegisterMessageServer(MessageServerInfo m); |
38 | void DeRegisterMessageServer(MessageServerInfo m); | 39 | void DeRegisterMessageServer(MessageServerInfo m); |
39 | } | 40 | }*/ |
40 | } | 41 | } |
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; | |||
30 | 30 | ||
31 | namespace OpenSim.Grid.GridServer | 31 | namespace OpenSim.Grid.GridServer |
32 | { | 32 | { |
33 | /* | ||
33 | public interface IUGAIMCore | 34 | public interface IUGAIMCore |
34 | { | 35 | { |
35 | T Get<T>(); | 36 | T Get<T>(); |
36 | void RegisterInterface<T>(T iface); | 37 | void RegisterInterface<T>(T iface); |
37 | bool TryGet<T>(out T iface); | 38 | bool TryGet<T>(out T iface); |
38 | BaseHttpServer GetHttpServer(); | 39 | BaseHttpServer GetHttpServer(); |
39 | } | 40 | }*/ |
40 | } | 41 | } |