aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorMW2009-02-21 14:19:40 +0000
committerMW2009-02-21 14:19:40 +0000
commit65d413e5ee1a2e7e46806039d667fc31063e2a09 (patch)
tree66555194e50683beeb4f9d1c07c8d76dfcc182bf /OpenSim/Grid
parent* Upping to interface version 3 - let's see how this goes. (diff)
downloadopensim-SC_OLD-65d413e5ee1a2e7e46806039d667fc31063e2a09.zip
opensim-SC_OLD-65d413e5ee1a2e7e46806039d667fc31063e2a09.tar.gz
opensim-SC_OLD-65d413e5ee1a2e7e46806039d667fc31063e2a09.tar.bz2
opensim-SC_OLD-65d413e5ee1a2e7e46806039d667fc31063e2a09.tar.xz
A bit more refactoring of the GridServer. To make the "modules" share a common Initialise method.
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/GridServer/GridMessagingModule.cs9
-rw-r--r--OpenSim/Grid/GridServer/GridRestModule.cs11
-rw-r--r--OpenSim/Grid/GridServer/GridServerBase.cs12
-rw-r--r--OpenSim/Grid/GridServer/GridXmlRpcModule.cs9
4 files changed, 22 insertions, 19 deletions
diff --git a/OpenSim/Grid/GridServer/GridMessagingModule.cs b/OpenSim/Grid/GridServer/GridMessagingModule.cs
index 348e56c..bfe65ba 100644
--- a/OpenSim/Grid/GridServer/GridMessagingModule.cs
+++ b/OpenSim/Grid/GridServer/GridMessagingModule.cs
@@ -34,17 +34,18 @@ namespace OpenSim.Grid.GridServer
34 get { return _MessageServers; } 34 get { return _MessageServers; }
35 } 35 }
36 36
37 public GridMessagingModule(string opensimVersion, GridDBService gridDBService, IGridCore gridCore, GridConfig config) 37 public GridMessagingModule()
38 {
39 }
40
41 public void Initialise(string opensimVersion, GridDBService gridDBService, IGridCore gridCore, GridConfig config)
38 { 42 {
39 m_opensimVersion = opensimVersion; 43 m_opensimVersion = opensimVersion;
40 m_gridDBService = gridDBService; 44 m_gridDBService = gridDBService;
41 m_gridCore = gridCore; 45 m_gridCore = gridCore;
42 m_config = config; 46 m_config = config;
43 m_httpServer = m_gridCore.GetHttpServer(); 47 m_httpServer = m_gridCore.GetHttpServer();
44 }
45 48
46 public void Initialise()
47 {
48 m_gridCore.RegisterInterface<IGridMessagingModule>(this); 49 m_gridCore.RegisterInterface<IGridMessagingModule>(this);
49 // Message Server ---> Grid Server 50 // Message Server ---> Grid Server
50 m_httpServer.AddXmlRPCHandler("register_messageserver", XmlRPCRegisterMessageServer); 51 m_httpServer.AddXmlRPCHandler("register_messageserver", XmlRPCRegisterMessageServer);
diff --git a/OpenSim/Grid/GridServer/GridRestModule.cs b/OpenSim/Grid/GridServer/GridRestModule.cs
index 1ed0ac1..d0bcbe8 100644
--- a/OpenSim/Grid/GridServer/GridRestModule.cs
+++ b/OpenSim/Grid/GridServer/GridRestModule.cs
@@ -62,17 +62,18 @@ namespace OpenSim.Grid.GridServer
62 /// <param name="opensimVersion"> 62 /// <param name="opensimVersion">
63 /// Used to notify old regions as to which OpenSim version to upgrade to 63 /// Used to notify old regions as to which OpenSim version to upgrade to
64 /// </param> 64 /// </param>
65 public GridRestModule(string opensimVersion, GridDBService gridDBService, IGridCore gridCore, GridConfig config) 65 public GridRestModule()
66 { 66 {
67 m_opensimVersion = opensimVersion; 67 }
68
69 public void Initialise(string opensimVersion, GridDBService gridDBService, IGridCore gridCore, GridConfig config)
70 {
71 m_opensimVersion = opensimVersion;
68 m_gridDBService = gridDBService; 72 m_gridDBService = gridDBService;
69 m_gridCore = gridCore; 73 m_gridCore = gridCore;
70 m_config = config; 74 m_config = config;
71 m_httpServer = m_gridCore.GetHttpServer(); 75 m_httpServer = m_gridCore.GetHttpServer();
72 }
73 76
74 public void Initialise()
75 {
76 m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/sims/", RestGetSimMethod)); 77 m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/sims/", RestGetSimMethod));
77 m_httpServer.AddStreamHandler(new RestStreamHandler("POST", "/sims/", RestSetSimMethod)); 78 m_httpServer.AddStreamHandler(new RestStreamHandler("POST", "/sims/", RestSetSimMethod));
78 79
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index d4d268c..ffe0378 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -155,14 +155,14 @@ namespace OpenSim.Grid.GridServer
155 m_gridDBService = new GridDBService(); 155 m_gridDBService = new GridDBService();
156 m_gridDBService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect); 156 m_gridDBService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect);
157 157
158 m_gridMessageModule = new GridMessagingModule(m_version, m_gridDBService, this, m_config); 158 m_gridMessageModule = new GridMessagingModule();
159 m_gridMessageModule.Initialise(); 159 m_gridMessageModule.Initialise(m_version, m_gridDBService, this, m_config);
160 160
161 m_gridXmlRpcModule = new GridXmlRpcModule(m_version, m_gridDBService, this, m_config); 161 m_gridXmlRpcModule = new GridXmlRpcModule();
162 m_gridXmlRpcModule.Initialise(); 162 m_gridXmlRpcModule.Initialise(m_version, m_gridDBService, this, m_config);
163 163
164 m_gridRestModule = new GridRestModule(m_version, m_gridDBService, this, m_config); 164 m_gridRestModule = new GridRestModule();
165 m_gridRestModule.Initialise(); 165 m_gridRestModule.Initialise(m_version, m_gridDBService, this, m_config);
166 } 166 }
167 167
168 public void CheckSims(object sender, ElapsedEventArgs e) 168 public void CheckSims(object sender, ElapsedEventArgs e)
diff --git a/OpenSim/Grid/GridServer/GridXmlRpcModule.cs b/OpenSim/Grid/GridServer/GridXmlRpcModule.cs
index 0eb7d1f..af83985 100644
--- a/OpenSim/Grid/GridServer/GridXmlRpcModule.cs
+++ b/OpenSim/Grid/GridServer/GridXmlRpcModule.cs
@@ -63,17 +63,18 @@ namespace OpenSim.Grid.GridServer
63 /// <param name="opensimVersion"> 63 /// <param name="opensimVersion">
64 /// Used to notify old regions as to which OpenSim version to upgrade to 64 /// Used to notify old regions as to which OpenSim version to upgrade to
65 /// </param> 65 /// </param>
66 public GridXmlRpcModule(string opensimVersion, GridDBService gridDBService, IGridCore gridCore, GridConfig config) 66 public GridXmlRpcModule()
67 {
68 }
69
70 public void Initialise(string opensimVersion, GridDBService gridDBService, IGridCore gridCore, GridConfig config)
67 { 71 {
68 m_opensimVersion = opensimVersion; 72 m_opensimVersion = opensimVersion;
69 m_gridDBService = gridDBService; 73 m_gridDBService = gridDBService;
70 m_gridCore = gridCore; 74 m_gridCore = gridCore;
71 m_config = config; 75 m_config = config;
72 m_httpServer = m_gridCore.GetHttpServer(); 76 m_httpServer = m_gridCore.GetHttpServer();
73 }
74 77
75 public void Initialise()
76 {
77 m_httpServer.AddXmlRPCHandler("simulator_login", XmlRpcSimulatorLoginMethod); 78 m_httpServer.AddXmlRPCHandler("simulator_login", XmlRpcSimulatorLoginMethod);
78 m_httpServer.AddXmlRPCHandler("simulator_data_request", XmlRpcSimulatorDataRequestMethod); 79 m_httpServer.AddXmlRPCHandler("simulator_data_request", XmlRpcSimulatorDataRequestMethod);
79 m_httpServer.AddXmlRPCHandler("simulator_after_region_moved", XmlRpcDeleteRegionMethod); 80 m_httpServer.AddXmlRPCHandler("simulator_after_region_moved", XmlRpcDeleteRegionMethod);