aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorMW2009-02-24 13:53:38 +0000
committerMW2009-02-24 13:53:38 +0000
commit6954013d82eba2e6e1d77356fd879b369de7a26f (patch)
tree638a6a8b7be51339c63dd2be9f9203d1df4e638d /OpenSim/Grid
parentMore refactoring of the UserServer. (diff)
downloadopensim-SC_OLD-6954013d82eba2e6e1d77356fd879b369de7a26f.zip
opensim-SC_OLD-6954013d82eba2e6e1d77356fd879b369de7a26f.tar.gz
opensim-SC_OLD-6954013d82eba2e6e1d77356fd879b369de7a26f.tar.bz2
opensim-SC_OLD-6954013d82eba2e6e1d77356fd879b369de7a26f.tar.xz
Added OpenSim.Grid.Framework project.
Changed the Gridserver so it uses/references OpenSim.Grid.Framework
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/Framework/IGridMessagingMapper.cs40
-rw-r--r--OpenSim/Grid/Framework/IMessageRegionService.cs38
-rw-r--r--OpenSim/Grid/Framework/IMessageUserServerService.cs35
-rw-r--r--OpenSim/Grid/Framework/IUGAIMCore.cs40
-rw-r--r--OpenSim/Grid/GridServer/GridMessagingModule.cs1
-rw-r--r--OpenSim/Grid/GridServer/GridRestModule.cs1
-rw-r--r--OpenSim/Grid/GridServer/GridServerBase.cs4
-rw-r--r--OpenSim/Grid/GridServer/GridXmlRpcModule.cs1
-rw-r--r--OpenSim/Grid/GridServer/IGridMessagingMapper.cs3
-rw-r--r--OpenSim/Grid/GridServer/IUGAIMCore.cs3
10 files changed, 164 insertions, 2 deletions
diff --git a/OpenSim/Grid/Framework/IGridMessagingMapper.cs b/OpenSim/Grid/Framework/IGridMessagingMapper.cs
new file mode 100644
index 0000000..b89f102
--- /dev/null
+++ b/OpenSim/Grid/Framework/IGridMessagingMapper.cs
@@ -0,0 +1,40 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using OpenSim.Framework.Servers;
31
32namespace OpenSim.Grid.Framework
33{
34 public interface IGridMessagingMapper
35 {
36 List<MessageServerInfo> GetMessageServersList();
37 void RegisterMessageServer(MessageServerInfo m);
38 void DeRegisterMessageServer(MessageServerInfo m);
39 }
40}
diff --git a/OpenSim/Grid/Framework/IMessageRegionService.cs b/OpenSim/Grid/Framework/IMessageRegionService.cs
new file mode 100644
index 0000000..2fdb40e
--- /dev/null
+++ b/OpenSim/Grid/Framework/IMessageRegionService.cs
@@ -0,0 +1,38 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using OpenSim.Data;
30
31namespace OpenSim.Grid.Framework
32{
33 public interface IMessageRegionService
34 {
35 int ClearRegionCache();
36 RegionProfileData GetRegionInfo(ulong regionhandle);
37 }
38}
diff --git a/OpenSim/Grid/Framework/IMessageUserServerService.cs b/OpenSim/Grid/Framework/IMessageUserServerService.cs
new file mode 100644
index 0000000..614606b
--- /dev/null
+++ b/OpenSim/Grid/Framework/IMessageUserServerService.cs
@@ -0,0 +1,35 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29namespace OpenSim.Grid.Framework
30{
31 public interface IMessageUserServerService
32 {
33 bool SendToUserServer(System.Collections.Hashtable request, string method);
34 }
35}
diff --git a/OpenSim/Grid/Framework/IUGAIMCore.cs b/OpenSim/Grid/Framework/IUGAIMCore.cs
new file mode 100644
index 0000000..a7df0d4
--- /dev/null
+++ b/OpenSim/Grid/Framework/IUGAIMCore.cs
@@ -0,0 +1,40 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using OpenSim.Framework.Servers;
30
31namespace OpenSim.Grid.Framework
32{
33 public interface IUGAIMCore
34 {
35 T Get<T>();
36 void RegisterInterface<T>(T iface);
37 bool TryGet<T>(out T iface);
38 BaseHttpServer GetHttpServer();
39 }
40}
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;
34using log4net; 34using log4net;
35using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Grid.Framework;
37 38
38namespace OpenSim.Grid.GridServer 39namespace 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;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications; 38using OpenSim.Framework.Communications;
39using OpenSim.Framework.Servers; 39using OpenSim.Framework.Servers;
40using OpenSim.Grid.Framework;
40 41
41namespace OpenSim.Grid.GridServer 42namespace 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;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
36using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
37using OpenSim.Grid.Framework;
37 38
38namespace OpenSim.Grid.GridServer 39namespace 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;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Framework.Communications; 39using OpenSim.Framework.Communications;
40using OpenSim.Framework.Servers; 40using OpenSim.Framework.Servers;
41using OpenSim.Grid.Framework;
41 42
42namespace OpenSim.Grid.GridServer 43namespace 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
32namespace OpenSim.Grid.GridServer 32namespace 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
31namespace OpenSim.Grid.GridServer 31namespace 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}