From e906dd3d28a3cb4dfada36daccfd8900f0e844b5 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 5 Mar 2010 22:29:51 +0000
Subject: add initial UserGrid service classes as per diva's direction this
will initially store home location data instead of the presence service
compiles but not enough to actually test yet
---
.../UserGrid/UserGridServiceConnector.cs | 38 ++++++++++
OpenSim/Services/Interfaces/IUserGridService.cs | 75 ++++++++++++++++++++
.../Services/UserAccountService/UserGridService.cs | 76 ++++++++++++++++++++
.../UserAccountService/UserGridServiceBase.cs | 82 ++++++++++++++++++++++
4 files changed, 271 insertions(+)
create mode 100644 OpenSim/Services/Connectors/UserGrid/UserGridServiceConnector.cs
create mode 100644 OpenSim/Services/Interfaces/IUserGridService.cs
create mode 100644 OpenSim/Services/UserAccountService/UserGridService.cs
create mode 100644 OpenSim/Services/UserAccountService/UserGridServiceBase.cs
(limited to 'OpenSim/Services')
diff --git a/OpenSim/Services/Connectors/UserGrid/UserGridServiceConnector.cs b/OpenSim/Services/Connectors/UserGrid/UserGridServiceConnector.cs
new file mode 100644
index 0000000..3aa8940
--- /dev/null
+++ b/OpenSim/Services/Connectors/UserGrid/UserGridServiceConnector.cs
@@ -0,0 +1,38 @@
+/*
+ * 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;
+
+namespace OpenSim.Services.Connectors
+{
+ public class UserGridServiceConnector
+ {
+ public UserGridServiceConnector()
+ {
+ }
+ }
+}
diff --git a/OpenSim/Services/Interfaces/IUserGridService.cs b/OpenSim/Services/Interfaces/IUserGridService.cs
new file mode 100644
index 0000000..50134e0
--- /dev/null
+++ b/OpenSim/Services/Interfaces/IUserGridService.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.Collections.Generic;
+using OpenMetaverse;
+
+namespace OpenSim.Services.Interfaces
+{
+ ///
+ /// Records user information specific to a grid but which is not part of a user's account.
+ ///
+ public class UserGridInfo
+ {
+ public string UserID;
+ public UUID HomeRegionID;
+ public Vector3 HomePosition;
+ public Vector3 HomeLookAt;
+
+ public UserGridInfo() {}
+
+ public UserGridInfo(Dictionary kvp)
+ {
+ if (kvp.ContainsKey("UserID"))
+ UserID = kvp["UserID"].ToString();
+ if (kvp.ContainsKey("HomeRegionID"))
+ UUID.TryParse(kvp["HomeRegionID"].ToString(), out HomeRegionID);
+ if (kvp.ContainsKey("HomePosition"))
+ Vector3.TryParse(kvp["HomePosition"].ToString(), out HomePosition);
+ if (kvp.ContainsKey("HomeLookAt"))
+ Vector3.TryParse(kvp["HomeLookAt"].ToString(), out HomeLookAt);
+ }
+
+ public Dictionary ToKeyValuePairs()
+ {
+ Dictionary result = new Dictionary();
+ result["UserID"] = UserID;
+ result["HomeRegionID"] = HomeRegionID.ToString();
+ result["HomePosition"] = HomePosition.ToString();
+ result["HomeLookAt"] = HomeLookAt.ToString();
+
+ return result;
+ }
+ }
+
+ public interface IUserGridService
+ {
+ UserGridInfo GetUserGridInfo(string userID);
+ bool StoreUserGridInfo(UserGridInfo info);
+ }
+}
\ No newline at end of file
diff --git a/OpenSim/Services/UserAccountService/UserGridService.cs b/OpenSim/Services/UserAccountService/UserGridService.cs
new file mode 100644
index 0000000..2d28b33
--- /dev/null
+++ b/OpenSim/Services/UserAccountService/UserGridService.cs
@@ -0,0 +1,76 @@
+/*
+ * 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.Collections.Generic;
+using System.Reflection;
+using Nini.Config;
+using OpenSim.Data;
+using OpenSim.Services.Interfaces;
+using OpenSim.Framework.Console;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+
+using OpenMetaverse;
+using log4net;
+
+namespace OpenSim.Services.UserAccountService
+{
+ public class UserGridService : UserGridServiceBase, IUserGridService
+ {
+ private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+ public UserGridService(IConfigSource config) : base(config)
+ {
+ m_log.Debug("[USER GRID SERVICE]: Starting user grid service");
+ }
+
+ public UserGridInfo GetUserGridInfo(string userID)
+ {
+ UserGridData d = m_Database.GetUserGridData(userID);
+
+ UserGridInfo info = new UserGridInfo();
+ info.UserID = d.UserID;
+ info.HomeRegionID = new UUID(d.Data["HomeRegionID"]);
+ info.HomePosition = Vector3.Parse(d.Data["HomePosition"]);
+ info.HomeLookAt = Vector3.Parse(d.Data["HomeLookAt"]);
+
+ return info;
+ }
+
+ public bool StoreUserGridInfo(UserGridInfo info)
+ {
+ UserGridData d = new UserGridData();
+
+ d.Data["UserID"] = info.UserID;
+ d.Data["HomeRegionID"] = info.HomeRegionID.ToString();
+ d.Data["HomePosition"] = info.HomePosition.ToString();
+ d.Data["HomeLookAt"] = info.HomeLookAt.ToString();
+
+ return m_Database.StoreUserGridData(d);
+ }
+ }
+}
\ No newline at end of file
diff --git a/OpenSim/Services/UserAccountService/UserGridServiceBase.cs b/OpenSim/Services/UserAccountService/UserGridServiceBase.cs
new file mode 100644
index 0000000..80aaa49
--- /dev/null
+++ b/OpenSim/Services/UserAccountService/UserGridServiceBase.cs
@@ -0,0 +1,82 @@
+/*
+ * 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.Framework;
+using OpenSim.Data;
+using OpenSim.Services.Interfaces;
+using OpenSim.Services.Base;
+
+namespace OpenSim.Services.UserAccountService
+{
+ public class UserGridServiceBase : ServiceBase
+ {
+ protected IUserGridData m_Database = null;
+
+ public UserGridServiceBase(IConfigSource config) : base(config)
+ {
+ string dllName = String.Empty;
+ string connString = String.Empty;
+ string realm = "UserGrid";
+
+ //
+ // Try reading the [DatabaseService] section, if it exists
+ //
+ IConfig dbConfig = config.Configs["DatabaseService"];
+ if (dbConfig != null)
+ {
+ if (dllName == String.Empty)
+ dllName = dbConfig.GetString("StorageProvider", String.Empty);
+ if (connString == String.Empty)
+ connString = dbConfig.GetString("ConnectionString", String.Empty);
+ }
+
+ //
+ // [PresenceService] section overrides [DatabaseService], if it exists
+ //
+ IConfig presenceConfig = config.Configs["PresenceService"];
+ if (presenceConfig != null)
+ {
+ dllName = presenceConfig.GetString("StorageProvider", dllName);
+ connString = presenceConfig.GetString("ConnectionString", connString);
+ realm = presenceConfig.GetString("Realm", realm);
+ }
+
+ //
+ // We tried, but this doesn't exist. We can't proceed.
+ //
+ if (dllName.Equals(String.Empty))
+ throw new Exception("No StorageProvider configured");
+
+ m_Database = LoadPlugin(dllName, new Object[] { connString, realm });
+ if (m_Database == null)
+ throw new Exception("Could not find a storage interface in the given module " + dllName);
+ }
+ }
+}
\ No newline at end of file
--
cgit v1.1