Let stuff be broken!

3 files changed, 138 insertions, 18 deletions

diff --git a/OpenGridServices.UserServer/Main.cs b/OpenGridServices.UserServer/Main.cs
index ed7b768..1c6ad8c 100644
--- a/OpenGridServices.UserServer/Main.cs
+++ b/OpenGridServices.UserServer/Main.cs
@@ -50,6 +50,8 @@ namespace OpenGridServices.UserServer
         private string ConfigDll = "OpenUser.Config.UserConfigDb4o.dll";

         private UserConfig Cfg;

 

+        public UserManager m_userManager; // Replaces below.

+

         private UserProfileManager m_userProfileManager;

 

         public Dictionary<LLUUID, UserProfile> UserSessions = new Dictionary<LLUUID, UserProfile>();

@@ -62,6 +64,7 @@ namespace OpenGridServices.UserServer
             Console.WriteLine("Starting...\n");

 

             OpenUser_Main userserver = new OpenUser_Main();

+

             userserver.Startup();

             userserver.Work();

         }

@@ -88,6 +91,9 @@ namespace OpenGridServices.UserServer
             Cfg = this.LoadConfigDll(this.ConfigDll);

             Cfg.InitConfig();

 

+            MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Establishing data connection");

+            m_userManager = new UserManager();

+

             MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Creating user profile manager");

             m_userProfileManager = new UserProfileManager();

             m_userProfileManager.InitUserProfiles();

diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
index 888b62d..75642b3 100644
--- a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
+++ b/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,7 +6,8 @@
     <ProjectGuid>{66591469-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenGridServices.UserServer</AssemblyName>

@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Exe</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>OpenGridServices.UserServer</RootNamespace>

-    <StartupObject></StartupObject>

+    <StartupObject>

+    </StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -55,54 +61,59 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System" >

+    <Reference Include="System">

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Data" >

+    <Reference Include="System.Data">

       <HintPath>System.Data.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml" >

+    <Reference Include="System.Xml">

       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="libsecondlife.dll" >

+    <Reference Include="libsecondlife.dll">

       <HintPath>..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="Db4objects.Db4o.dll" >

+    <Reference Include="Db4objects.Db4o.dll">

       <HintPath>..\bin\Db4objects.Db4o.dll</HintPath>

       <Private>False</Private>

     </Reference>

   </ItemGroup>

   <ItemGroup>

+    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

+      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>

+      <Name>OpenGrid.Framework.Data</Name>

+    </ProjectReference>

     <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">

       <Name>OpenSim.Framework</Name>

       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">

       <Name>OpenSim.Framework.Console</Name>

       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj">

       <Name>OpenSim.Servers</Name>

       <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">

       <Name>XMLRPC</Name>

       <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

@@ -112,6 +123,7 @@
     <Compile Include="Properties\AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="UserManager.cs" />

   </ItemGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

   <PropertyGroup>

@@ -120,4 +132,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/OpenGridServices.UserServer/UserManager.cs b/OpenGridServices.UserServer/UserManager.cs
new file mode 100644
index 0000000..7473685
--- /dev/null
+++ b/OpenGridServices.UserServer/UserManager.cs
@@ -0,0 +1,102 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+using OpenGrid.Framework.Data;

+using libsecondlife;

+using System.Reflection;

+

+using System.Xml;

+using Nwc.XmlRpc;

+using OpenSim.Framework.Sims;

+using OpenSim.Framework.Inventory;

+using OpenSim.Framework.Utilities;

+

+namespace OpenGridServices.UserServer

+{

+    public class UserManager

+    {

+        Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>();

+

+        /// <summary>

+        /// Adds a new user server plugin - user servers will be requested in the order they were loaded.

+        /// </summary>

+        /// <param name="FileName">The filename to the user server plugin DLL</param>

+        public void AddPlugin(string FileName)

+        {

+            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Storage: Attempting to load " + FileName);

+            Assembly pluginAssembly = Assembly.LoadFrom(FileName);

+

+            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");

+            foreach (Type pluginType in pluginAssembly.GetTypes())

+            {

+                if (!pluginType.IsAbstract)

+                {

+                    Type typeInterface = pluginType.GetInterface("IUserData", true);

+

+                    if (typeInterface != null)

+                    {

+                        IUserData plug = (IUserData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));

+                        plug.Initialise();

+                        this._plugins.Add(plug.getName(), plug);

+                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Storage: Added IUserData Interface");

+                    }

+

+                    typeInterface = null;

+                }

+            }

+

+            pluginAssembly = null;

+        }

+

+        public UserProfileData getUserProfile(LLUUID uuid)

+        {

+            foreach (KeyValuePair<string, IUserData> plugin in _plugins)

+            {

+                try

+                {

+                    return plugin.Value.getUserByUUID(uuid);

+                }

+                catch (Exception e)

+                {

+                    OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

+                }

+            }

+

+            return null;

+        }

+

+        public UserProfileData getUserProfile(string name)

+        {

+            foreach (KeyValuePair<string, IUserData> plugin in _plugins)

+            {

+                try

+                {

+                    return plugin.Value.getUserByName(name);

+                }

+                catch (Exception e)

+                {

+                    OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

+                }

+            }

+

+            return null;

+        }

+

+        public UserProfileData getUserProfile(string fname, string lname)

+        {

+            foreach (KeyValuePair<string, IUserData> plugin in _plugins)

+            {

+                try

+                {

+                    return plugin.Value.getUserByName(fname,lname);

+                }

+                catch (Exception e)

+                {

+                    OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

+                }

+            }

+

+            return null;

+        }

+    }

+}