aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2009-05-05 05:35:22 +0000
committerMelanie Thielker2009-05-05 05:35:22 +0000
commit8b9f8be512ac47a52e5b7df1a5f3d150c92eda39 (patch)
tree62c47af40fa2877780717323663f2dc0a57bb5b0 /OpenSim
parentPlumb the database into the new server skel (diff)
downloadopensim-SC_OLD-8b9f8be512ac47a52e5b7df1a5f3d150c92eda39.zip
opensim-SC_OLD-8b9f8be512ac47a52e5b7df1a5f3d150c92eda39.tar.gz
opensim-SC_OLD-8b9f8be512ac47a52e5b7df1a5f3d150c92eda39.tar.bz2
opensim-SC_OLD-8b9f8be512ac47a52e5b7df1a5f3d150c92eda39.tar.xz
Some refactoring. Database is now active in the new user server
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServiceConnector.cs (renamed from OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServicesConnector.cs)4
-rw-r--r--OpenSim/Servers/User/UserServerConnector.cs4
-rw-r--r--OpenSim/Services/Interfaces/IUserService.cs (renamed from OpenSim/Services/Interfaces/IUserServices.cs)2
-rw-r--r--OpenSim/Services/UserService/UserService.cs8
-rw-r--r--OpenSim/Services/UserService/UserServiceBase.cs85
5 files changed, 94 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServicesConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServiceConnector.cs
index 38f32ed..70d440d 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServicesConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServiceConnector.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.User
35{ 35{
36 public class LocalUserServicesConnector : INonSharedRegionModule 36 public class LocalUserServicesConnector : INonSharedRegionModule
37 { 37 {
38 private IUserServices m_UserServices; 38 private IUserService m_UserService;
39 39
40 private bool m_Enabled = false; 40 private bool m_Enabled = false;
41 41
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.User
53 if (name == Name) 53 if (name == Name)
54 { 54 {
55 m_Enabled = true; 55 m_Enabled = true;
56 m_UserServices = new UserService(source); 56 m_UserService = new UserService(source);
57 } 57 }
58 } 58 }
59 } 59 }
diff --git a/OpenSim/Servers/User/UserServerConnector.cs b/OpenSim/Servers/User/UserServerConnector.cs
index b86fdb7..c20cc31 100644
--- a/OpenSim/Servers/User/UserServerConnector.cs
+++ b/OpenSim/Servers/User/UserServerConnector.cs
@@ -34,11 +34,11 @@ namespace OpenSim.Servers.UserServer
34{ 34{
35 public class UserServiceConnector 35 public class UserServiceConnector
36 { 36 {
37 private IUserServices m_UserServices; 37 private IUserService m_UserService;
38 38
39 public UserServiceConnector(IConfigSource config, IHttpServer server) 39 public UserServiceConnector(IConfigSource config, IHttpServer server)
40 { 40 {
41 m_UserServices = new UserService(config); 41 m_UserService = new UserService(config);
42 } 42 }
43 } 43 }
44} 44}
diff --git a/OpenSim/Services/Interfaces/IUserServices.cs b/OpenSim/Services/Interfaces/IUserService.cs
index 9eccc3c..0e8191f 100644
--- a/OpenSim/Services/Interfaces/IUserServices.cs
+++ b/OpenSim/Services/Interfaces/IUserService.cs
@@ -1,6 +1,6 @@
1namespace OpenSim.Services.Interfaces 1namespace OpenSim.Services.Interfaces
2{ 2{
3 public interface IUserServices 3 public interface IUserService
4 { 4 {
5 } 5 }
6} 6}
diff --git a/OpenSim/Services/UserService/UserService.cs b/OpenSim/Services/UserService/UserService.cs
index 1e29fc9..6948606 100644
--- a/OpenSim/Services/UserService/UserService.cs
+++ b/OpenSim/Services/UserService/UserService.cs
@@ -25,17 +25,17 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Reflection;
28using Nini.Config; 30using Nini.Config;
29using OpenSim.Data; 31using OpenSim.Data;
30using OpenSim.Services.Interfaces; 32using OpenSim.Services.Interfaces;
31 33
32namespace OpenSim.Services.UserService 34namespace OpenSim.Services.UserService
33{ 35{
34 public class UserService : IUserServices 36 public class UserService : UserServiceBase, IUserService
35 { 37 {
36 private UserDataBase m_DataBase = null; 38 public UserService(IConfigSource config) : base(config)
37
38 public UserService(IConfigSource config)
39 { 39 {
40 } 40 }
41 } 41 }
diff --git a/OpenSim/Services/UserService/UserServiceBase.cs b/OpenSim/Services/UserService/UserServiceBase.cs
new file mode 100644
index 0000000..6a20670
--- /dev/null
+++ b/OpenSim/Services/UserService/UserServiceBase.cs
@@ -0,0 +1,85 @@
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 OpenSim 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.Reflection;
30using Nini.Config;
31using OpenSim.Data;
32using OpenSim.Services.Interfaces;
33
34namespace OpenSim.Services.UserService
35{
36 public class UserServiceBase
37 {
38 protected IUserDataPlugin m_Database = null;
39
40 public UserServiceBase(IConfigSource config)
41 {
42 IConfig userConfig = config.Configs["UserService"];
43 if (userConfig == null)
44 throw new Exception("No userService configuration");
45
46 string dllName = userConfig.GetString("StorageProvider",
47 String.Empty);
48
49 if (dllName == String.Empty)
50 throw new Exception("No StorageProvider configured");
51
52 string connString = userConfig.GetString("ConnectionString",
53 String.Empty);
54
55 try
56 {
57 Assembly pluginAssembly = Assembly.LoadFrom(dllName);
58
59 foreach (Type pluginType in pluginAssembly.GetTypes())
60 {
61 if (pluginType.IsPublic)
62 {
63 Type typeInterface =
64 pluginType.GetInterface("IUserDataPlugin", true);
65 if (typeInterface != null)
66 {
67 IUserDataPlugin plug =
68 (IUserDataPlugin)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
69 plug.Initialise(connString);
70
71 m_Database = plug;
72 }
73 }
74 }
75
76 if (m_Database == null)
77 throw new Exception("Could not find a storage interface in the given module");
78 }
79 catch (Exception e)
80 {
81 throw new Exception("Can't open database module: "+e.Message);
82 }
83 }
84 }
85}