From be2f0336269e36fd987392209c8d5bf382a043f5 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 29 Dec 2009 17:21:16 -0800
Subject: More renames to make everything consistent. This is the
UserAccountService.
---
.../UserAccounts/UserAccountServiceConnector.cs | 287 +++++++++++++++++++++
.../UserAccounts/UserServiceConnector.cs | 287 ---------------------
.../UserAccountService/UserAccountService.cs | 75 ++++++
.../UserAccountService/UserAccountServiceBase.cs | 73 ++++++
OpenSim/Services/UserService/UserService.cs | 75 ------
OpenSim/Services/UserService/UserServiceBase.cs | 73 ------
6 files changed, 435 insertions(+), 435 deletions(-)
create mode 100644 OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs
delete mode 100644 OpenSim/Services/Connectors/UserAccounts/UserServiceConnector.cs
create mode 100644 OpenSim/Services/UserAccountService/UserAccountService.cs
create mode 100644 OpenSim/Services/UserAccountService/UserAccountServiceBase.cs
delete mode 100644 OpenSim/Services/UserService/UserService.cs
delete mode 100644 OpenSim/Services/UserService/UserServiceBase.cs
(limited to 'OpenSim')
diff --git a/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs
new file mode 100644
index 0000000..d4b906a
--- /dev/null
+++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs
@@ -0,0 +1,287 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using log4net;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenMetaverse;
+
+namespace OpenSim.Services.Connectors
+{
+ public class UserAccountServicesConnector : IUserAccountService
+ {
+ private static readonly ILog m_log =
+ LogManager.GetLogger(
+ MethodBase.GetCurrentMethod().DeclaringType);
+
+ private string m_ServerURI = String.Empty;
+
+ public UserAccountServicesConnector()
+ {
+ }
+
+ public UserAccountServicesConnector(string serverURI)
+ {
+ m_ServerURI = serverURI.TrimEnd('/');
+ }
+
+ public UserAccountServicesConnector(IConfigSource source)
+ {
+ Initialise(source);
+ }
+
+ public virtual void Initialise(IConfigSource source)
+ {
+ IConfig assetConfig = source.Configs["UserAccountService"];
+ if (assetConfig == null)
+ {
+ m_log.Error("[ACCOUNT CONNECTOR]: UserAccountService missing from OpenSim.ini");
+ throw new Exception("User account connector init error");
+ }
+
+ string serviceURI = assetConfig.GetString("UserAccountServerURI",
+ String.Empty);
+
+ if (serviceURI == String.Empty)
+ {
+ m_log.Error("[ACCOUNT CONNECTOR]: No Server URI named in section UserAccountService");
+ throw new Exception("User account connector init error");
+ }
+ m_ServerURI = serviceURI;
+ }
+
+ public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)
+ {
+ Dictionary<string, object> sendData = new Dictionary<string, object>();
+ //sendData["SCOPEID"] = scopeID.ToString();
+ sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+ sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+ sendData["METHOD"] = "getaccount";
+
+ sendData["ScopeID"] = scopeID;
+ sendData["FirstName"] = firstName.ToString();
+ sendData["LastName"] = lastName.ToString();
+
+ return SendAndGetReply(sendData);
+ }
+
+ public UserAccount GetUserAccount(UUID scopeID, string email)
+ {
+ Dictionary<string, object> sendData = new Dictionary<string, object>();
+ //sendData["SCOPEID"] = scopeID.ToString();
+ sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+ sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+ sendData["METHOD"] = "getaccount";
+
+ sendData["ScopeID"] = scopeID;
+ sendData["Email"] = email;
+
+ return SendAndGetReply(sendData);
+ }
+
+ public UserAccount GetUserAccount(UUID scopeID, UUID userID)
+ {
+ Dictionary<string, object> sendData = new Dictionary<string, object>();
+ //sendData["SCOPEID"] = scopeID.ToString();
+ sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+ sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+ sendData["METHOD"] = "getaccount";
+
+ sendData["ScopeID"] = scopeID;
+ sendData["UserID"] = userID.ToString();
+
+ return SendAndGetReply(sendData);
+ }
+
+ public List<UserAccount> GetUserAccounts(UUID scopeID, string query)
+ {
+ Dictionary<string, object> sendData = new Dictionary<string, object>();
+ //sendData["SCOPEID"] = scopeID.ToString();
+ sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+ sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+ sendData["METHOD"] = "getagents";
+
+ sendData["ScopeID"] = scopeID.ToString();
+ sendData["query"] = query;
+
+ string reply = string.Empty;
+ string reqString = ServerUtils.BuildQueryString(sendData);
+ // m_log.DebugFormat("[ACCOUNTS CONNECTOR]: queryString = {0}", reqString);
+ try
+ {
+ reply = SynchronousRestFormsRequester.MakeRequest("POST",
+ m_ServerURI + "/accounts",
+ reqString);
+ if (reply == null || (reply != null && reply == string.Empty))
+ {
+ m_log.DebugFormat("[ACCOUNT CONNECTOR]: GetUserAccounts received null or empty reply");
+ return null;
+ }
+ }
+ catch (Exception e)
+ {
+ m_log.DebugFormat("[ACCOUNT CONNECTOR]: Exception when contacting accounts server: {0}", e.Message);
+ }
+
+ List<UserAccount> accounts = new List<UserAccount>();
+
+ Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+ if (replyData != null)
+ {
+ if (replyData.ContainsKey("result") && replyData.ContainsKey("result").ToString() == "null")
+ {
+ return accounts;
+ }
+
+ Dictionary<string, object>.ValueCollection accountList = replyData.Values;
+ //m_log.DebugFormat("[ACCOUNTS CONNECTOR]: GetAgents returned {0} elements", pinfosList.Count);
+ foreach (object acc in accountList)
+ {
+ if (acc is Dictionary<string, object>)
+ {
+ UserAccount pinfo = new UserAccount((Dictionary<string, object>)acc);
+ accounts.Add(pinfo);
+ }
+ else
+ m_log.DebugFormat("[ACCOUNT CONNECTOR]: GetUserAccounts received invalid response type {0}",
+ acc.GetType());
+ }
+ }
+ else
+ m_log.DebugFormat("[ACCOUNTS CONNECTOR]: GetUserAccounts received null response");
+
+ return accounts;
+ }
+
+ public bool SetUserAccount(UserAccount data)
+ {
+ Dictionary<string, object> sendData = new Dictionary<string, object>();
+ //sendData["SCOPEID"] = scopeID.ToString();
+ sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+ sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+ sendData["METHOD"] = "setaccount";
+
+ sendData["account"] = data.ToKeyValuePairs();
+
+ return SendAndGetBoolReply(sendData);
+ }
+
+ public bool CreateUserAccount(UserAccount data)
+ {
+ Dictionary<string, object> sendData = new Dictionary<string, object>();
+ //sendData["SCOPEID"] = scopeID.ToString();
+ sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
+ sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
+ sendData["METHOD"] = "createaccount";
+
+ sendData["account"] = data.ToKeyValuePairs();
+
+ return SendAndGetBoolReply(sendData);
+ }
+
+ private UserAccount SendAndGetReply(Dictionary<string, object> sendData)
+ {
+ string reply = string.Empty;
+ string reqString = ServerUtils.BuildQueryString(sendData);
+ // m_log.DebugFormat("[ACCOUNTS CONNECTOR]: queryString = {0}", reqString);
+ try
+ {
+ reply = SynchronousRestFormsRequester.MakeRequest("POST",
+ m_ServerURI + "/accounts",
+ reqString);
+ if (reply == null || (reply != null && reply == string.Empty))
+ {
+ m_log.DebugFormat("[ACCOUNT CONNECTOR]: GetUserAccount received null or empty reply");
+ return null;
+ }
+ }
+ catch (Exception e)
+ {
+ m_log.DebugFormat("[ACCOUNT CONNECTOR]: Exception when contacting user account server: {0}", e.Message);
+ }
+
+ Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+ UserAccount account = null;
+
+ if ((replyData != null) && replyData.ContainsKey("result") && (replyData["result"] != null))
+ {
+ if (replyData["result"] is Dictionary<string, object>)
+ {
+ account = new UserAccount((Dictionary<string, object>)replyData["result"]);
+ }
+ }
+
+ return account;
+
+ }
+
+ private bool SendAndGetBoolReply(Dictionary<string, object> sendData)
+ {
+ string reqString = ServerUtils.BuildQueryString(sendData);
+ // m_log.DebugFormat("[ACCOUNTS CONNECTOR]: queryString = {0}", reqString);
+ try
+ {
+ string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+ m_ServerURI + "/accounts",
+ reqString);
+ if (reply != string.Empty)
+ {
+ Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+ if (replyData.ContainsKey("result"))
+ {
+ if (replyData["result"].ToString().ToLower() == "success")
+ return true;
+ else
+ return false;
+ }
+ else
+ m_log.DebugFormat("[ACCOUNTS CONNECTOR]: Set or Create UserAccount reply data does not contain result field");
+
+ }
+ else
+ m_log.DebugFormat("[ACCOUNTS CONNECTOR]: Set or Create UserAccount received empty reply");
+ }
+ catch (Exception e)
+ {
+ m_log.DebugFormat("[ACCOUNTS CONNECTOR]: Exception when contacting user account server: {0}", e.Message);
+ }
+
+ return false;
+ }
+
+ }
+}
diff --git a/OpenSim/Services/Connectors/UserAccounts/UserServiceConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserServiceConnector.cs
deleted file mode 100644
index d4b906a..0000000
--- a/OpenSim/Services/Connectors/UserAccounts/UserServiceConnector.cs
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSimulator Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using log4net;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Server.Base;
-using OpenSim.Services.Interfaces;
-using OpenMetaverse;
-
-namespace OpenSim.Services.Connectors
-{
- public class UserAccountServicesConnector : IUserAccountService
- {
- private static readonly ILog m_log =
- LogManager.GetLogger(
- MethodBase.GetCurrentMethod().DeclaringType);
-
- private string m_ServerURI = String.Empty;
-
- public UserAccountServicesConnector()
- {
- }
-
- public UserAccountServicesConnector(string serverURI)
- {
- m_ServerURI = serverURI.TrimEnd('/');
- }
-
- public UserAccountServicesConnector(IConfigSource source)
- {
- Initialise(source);
- }
-
- public virtual void Initialise(IConfigSource source)
- {
- IConfig assetConfig = source.Configs["UserAccountService"];
- if (assetConfig == null)
- {
- m_log.Error("[ACCOUNT CONNECTOR]: UserAccountService missing from OpenSim.ini");
- throw new Exception("User account connector init error");
- }
-
- string serviceURI = assetConfig.GetString("UserAccountServerURI",
- String.Empty);
-
- if (serviceURI == String.Empty)
- {
- m_log.Error("[ACCOUNT CONNECTOR]: No Server URI named in section UserAccountService");
- throw new Exception("User account connector init error");
- }
- m_ServerURI = serviceURI;
- }
-
- public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)
- {
- Dictionary<string, object> sendData = new Dictionary<string, object>();
- //sendData["SCOPEID"] = scopeID.ToString();
- sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
- sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
- sendData["METHOD"] = "getaccount";
-
- sendData["ScopeID"] = scopeID;
- sendData["FirstName"] = firstName.ToString();
- sendData["LastName"] = lastName.ToString();
-
- return SendAndGetReply(sendData);
- }
-
- public UserAccount GetUserAccount(UUID scopeID, string email)
- {
- Dictionary<string, object> sendData = new Dictionary<string, object>();
- //sendData["SCOPEID"] = scopeID.ToString();
- sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
- sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
- sendData["METHOD"] = "getaccount";
-
- sendData["ScopeID"] = scopeID;
- sendData["Email"] = email;
-
- return SendAndGetReply(sendData);
- }
-
- public UserAccount GetUserAccount(UUID scopeID, UUID userID)
- {
- Dictionary<string, object> sendData = new Dictionary<string, object>();
- //sendData["SCOPEID"] = scopeID.ToString();
- sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
- sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
- sendData["METHOD"] = "getaccount";
-
- sendData["ScopeID"] = scopeID;
- sendData["UserID"] = userID.ToString();
-
- return SendAndGetReply(sendData);
- }
-
- public List<UserAccount> GetUserAccounts(UUID scopeID, string query)
- {
- Dictionary<string, object> sendData = new Dictionary<string, object>();
- //sendData["SCOPEID"] = scopeID.ToString();
- sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
- sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
- sendData["METHOD"] = "getagents";
-
- sendData["ScopeID"] = scopeID.ToString();
- sendData["query"] = query;
-
- string reply = string.Empty;
- string reqString = ServerUtils.BuildQueryString(sendData);
- // m_log.DebugFormat("[ACCOUNTS CONNECTOR]: queryString = {0}", reqString);
- try
- {
- reply = SynchronousRestFormsRequester.MakeRequest("POST",
- m_ServerURI + "/accounts",
- reqString);
- if (reply == null || (reply != null && reply == string.Empty))
- {
- m_log.DebugFormat("[ACCOUNT CONNECTOR]: GetUserAccounts received null or empty reply");
- return null;
- }
- }
- catch (Exception e)
- {
- m_log.DebugFormat("[ACCOUNT CONNECTOR]: Exception when contacting accounts server: {0}", e.Message);
- }
-
- List<UserAccount> accounts = new List<UserAccount>();
-
- Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
-
- if (replyData != null)
- {
- if (replyData.ContainsKey("result") && replyData.ContainsKey("result").ToString() == "null")
- {
- return accounts;
- }
-
- Dictionary<string, object>.ValueCollection accountList = replyData.Values;
- //m_log.DebugFormat("[ACCOUNTS CONNECTOR]: GetAgents returned {0} elements", pinfosList.Count);
- foreach (object acc in accountList)
- {
- if (acc is Dictionary<string, object>)
- {
- UserAccount pinfo = new UserAccount((Dictionary<string, object>)acc);
- accounts.Add(pinfo);
- }
- else
- m_log.DebugFormat("[ACCOUNT CONNECTOR]: GetUserAccounts received invalid response type {0}",
- acc.GetType());
- }
- }
- else
- m_log.DebugFormat("[ACCOUNTS CONNECTOR]: GetUserAccounts received null response");
-
- return accounts;
- }
-
- public bool SetUserAccount(UserAccount data)
- {
- Dictionary<string, object> sendData = new Dictionary<string, object>();
- //sendData["SCOPEID"] = scopeID.ToString();
- sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
- sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
- sendData["METHOD"] = "setaccount";
-
- sendData["account"] = data.ToKeyValuePairs();
-
- return SendAndGetBoolReply(sendData);
- }
-
- public bool CreateUserAccount(UserAccount data)
- {
- Dictionary<string, object> sendData = new Dictionary<string, object>();
- //sendData["SCOPEID"] = scopeID.ToString();
- sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
- sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
- sendData["METHOD"] = "createaccount";
-
- sendData["account"] = data.ToKeyValuePairs();
-
- return SendAndGetBoolReply(sendData);
- }
-
- private UserAccount SendAndGetReply(Dictionary<string, object> sendData)
- {
- string reply = string.Empty;
- string reqString = ServerUtils.BuildQueryString(sendData);
- // m_log.DebugFormat("[ACCOUNTS CONNECTOR]: queryString = {0}", reqString);
- try
- {
- reply = SynchronousRestFormsRequester.MakeRequest("POST",
- m_ServerURI + "/accounts",
- reqString);
- if (reply == null || (reply != null && reply == string.Empty))
- {
- m_log.DebugFormat("[ACCOUNT CONNECTOR]: GetUserAccount received null or empty reply");
- return null;
- }
- }
- catch (Exception e)
- {
- m_log.DebugFormat("[ACCOUNT CONNECTOR]: Exception when contacting user account server: {0}", e.Message);
- }
-
- Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
- UserAccount account = null;
-
- if ((replyData != null) && replyData.ContainsKey("result") && (replyData["result"] != null))
- {
- if (replyData["result"] is Dictionary<string, object>)
- {
- account = new UserAccount((Dictionary<string, object>)replyData["result"]);
- }
- }
-
- return account;
-
- }
-
- private bool SendAndGetBoolReply(Dictionary<string, object> sendData)
- {
- string reqString = ServerUtils.BuildQueryString(sendData);
- // m_log.DebugFormat("[ACCOUNTS CONNECTOR]: queryString = {0}", reqString);
- try
- {
- string reply = SynchronousRestFormsRequester.MakeRequest("POST",
- m_ServerURI + "/accounts",
- reqString);
- if (reply != string.Empty)
- {
- Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
-
- if (replyData.ContainsKey("result"))
- {
- if (replyData["result"].ToString().ToLower() == "success")
- return true;
- else
- return false;
- }
- else
- m_log.DebugFormat("[ACCOUNTS CONNECTOR]: Set or Create UserAccount reply data does not contain result field");
-
- }
- else
- m_log.DebugFormat("[ACCOUNTS CONNECTOR]: Set or Create UserAccount received empty reply");
- }
- catch (Exception e)
- {
- m_log.DebugFormat("[ACCOUNTS CONNECTOR]: Exception when contacting user account server: {0}", e.Message);
- }
-
- return false;
- }
-
- }
-}
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
new file mode 100644
index 0000000..2e6f7dc
--- /dev/null
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Reflection;
+using Nini.Config;
+using OpenSim.Data;
+using OpenSim.Services.Interfaces;
+using System.Collections.Generic;
+using OpenMetaverse;
+
+namespace OpenSim.Services.UserAccountService
+{
+ public class UserAccountService : UserAccountServiceBase, IUserAccountService
+ {
+ public UserAccountService(IConfigSource config) : base(config)
+ {
+ }
+
+ public UserAccount GetUserAccount(UUID scopeID, string firstName,
+ string lastName)
+ {
+ return null;
+ }
+
+ public UserAccount GetUserAccount(UUID scopeID, string email)
+ {
+ return null;
+ }
+
+ public UserAccount GetUserAccount(UUID scopeID, UUID userID)
+ {
+ return null;
+ }
+
+ public bool SetUserAccount(UserAccount data)
+ {
+ return false;
+ }
+
+ public bool CreateUserAccount(UserAccount data)
+ {
+ return false;
+ }
+
+ public List<UserAccount> GetUserAccounts(UUID scopeID, string query)
+ {
+ return null;
+ }
+ }
+}
diff --git a/OpenSim/Services/UserAccountService/UserAccountServiceBase.cs b/OpenSim/Services/UserAccountService/UserAccountServiceBase.cs
new file mode 100644
index 0000000..70ed594
--- /dev/null
+++ b/OpenSim/Services/UserAccountService/UserAccountServiceBase.cs
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Reflection;
+using Nini.Config;
+using OpenSim.Data;
+using OpenSim.Services.Interfaces;
+using OpenSim.Services.Base;
+
+namespace OpenSim.Services.UserAccountService
+{
+ public class UserAccountServiceBase: ServiceBase
+ {
+ protected IUserAccountData m_Database = null;
+
+ public UserAccountServiceBase(IConfigSource config) : base(config)
+ {
+ string dllName = String.Empty;
+ string connString = String.Empty;
+ string realm = "useraccounts";
+
+ IConfig dbConfig = config.Configs["DatabaseService"];
+ if (dbConfig != null)
+ {
+ dllName = dbConfig.GetString("StorageProvider", String.Empty);
+ connString = dbConfig.GetString("ConnectionString", String.Empty);
+ }
+
+ IConfig userConfig = config.Configs["UserAccountService"];
+ if (userConfig == null)
+ throw new Exception("No UserAccountService configuration");
+
+ dllName = userConfig.GetString("StorageProvider", dllName);
+
+ if (dllName == String.Empty)
+ throw new Exception("No StorageProvider configured");
+
+ connString = userConfig.GetString("ConnectionString", connString);
+
+ realm = userConfig.GetString("Realm", realm);
+
+ m_Database = LoadPlugin<IUserAccountData>(dllName, new Object[] {connString, realm});
+
+ if (m_Database == null)
+ throw new Exception("Could not find a storage interface in the given module");
+ }
+ }
+}
diff --git a/OpenSim/Services/UserService/UserService.cs b/OpenSim/Services/UserService/UserService.cs
deleted file mode 100644
index 2e6f7dc..0000000
--- a/OpenSim/Services/UserService/UserService.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSimulator Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Reflection;
-using Nini.Config;
-using OpenSim.Data;
-using OpenSim.Services.Interfaces;
-using System.Collections.Generic;
-using OpenMetaverse;
-
-namespace OpenSim.Services.UserAccountService
-{
- public class UserAccountService : UserAccountServiceBase, IUserAccountService
- {
- public UserAccountService(IConfigSource config) : base(config)
- {
- }
-
- public UserAccount GetUserAccount(UUID scopeID, string firstName,
- string lastName)
- {
- return null;
- }
-
- public UserAccount GetUserAccount(UUID scopeID, string email)
- {
- return null;
- }
-
- public UserAccount GetUserAccount(UUID scopeID, UUID userID)
- {
- return null;
- }
-
- public bool SetUserAccount(UserAccount data)
- {
- return false;
- }
-
- public bool CreateUserAccount(UserAccount data)
- {
- return false;
- }
-
- public List<UserAccount> GetUserAccounts(UUID scopeID, string query)
- {
- return null;
- }
- }
-}
diff --git a/OpenSim/Services/UserService/UserServiceBase.cs b/OpenSim/Services/UserService/UserServiceBase.cs
deleted file mode 100644
index 70ed594..0000000
--- a/OpenSim/Services/UserService/UserServiceBase.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSimulator Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Reflection;
-using Nini.Config;
-using OpenSim.Data;
-using OpenSim.Services.Interfaces;
-using OpenSim.Services.Base;
-
-namespace OpenSim.Services.UserAccountService
-{
- public class UserAccountServiceBase: ServiceBase
- {
- protected IUserAccountData m_Database = null;
-
- public UserAccountServiceBase(IConfigSource config) : base(config)
- {
- string dllName = String.Empty;
- string connString = String.Empty;
- string realm = "useraccounts";
-
- IConfig dbConfig = config.Configs["DatabaseService"];
- if (dbConfig != null)
- {
- dllName = dbConfig.GetString("StorageProvider", String.Empty);
- connString = dbConfig.GetString("ConnectionString", String.Empty);
- }
-
- IConfig userConfig = config.Configs["UserAccountService"];
- if (userConfig == null)
- throw new Exception("No UserAccountService configuration");
-
- dllName = userConfig.GetString("StorageProvider", dllName);
-
- if (dllName == String.Empty)
- throw new Exception("No StorageProvider configured");
-
- connString = userConfig.GetString("ConnectionString", connString);
-
- realm = userConfig.GetString("Realm", realm);
-
- m_Database = LoadPlugin<IUserAccountData>(dllName, new Object[] {connString, realm});
-
- if (m_Database == null)
- throw new Exception("Could not find a storage interface in the given module");
- }
- }
-}
--
cgit v1.1