Inching ahead... This compiles, but very likely does not run.

6 files changed, 626 insertions, 595 deletions

diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index 0f827b0..02ee025 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -85,10 +85,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
             MainServer.Instance = m_httpServer;
 
             InitialiseCommsManager(openSim);
-            if (m_commsManager != null)
-            {
-                m_openSim.ApplicationRegistry.RegisterInterface<IUserService>(m_commsManager.UserService);
-            }
         }
 
         public void PostInitialise()
@@ -107,10 +103,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
 
         private void RegionCreated(IScene scene)
         {
-            if (m_commsManager != null)
-            {
-                scene.RegisterModuleInterface<IUserService>(m_commsManager.UserService);
-            }
         }
 
         protected void InitialiseCommsManager(OpenSimBase openSim)
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 9400788..d6d5700 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -49,6 +49,8 @@ using OpenSim.Region.CoreModules.World.Terrain;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
+using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.ApplicationPlugins.RemoteController
 {
@@ -1032,30 +1034,37 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     if (requestData.Contains("user_email"))
                         email = (string)requestData["user_email"];
 
-                    CachedUserInfo userInfo =
-                        m_app.CommunicationsManager.UserProfileCacheService.GetUserDetails(firstname, lastname);
+                    UUID scopeID = m_app.SceneManager.CurrentOrFirstScene.RegionInfo.ScopeID;
 
-                    if (null != userInfo)
-                        throw new Exception(String.Format("Avatar {0} {1} already exists", firstname, lastname));
+                    UserAccount account = m_app.SceneManager.CurrentOrFirstScene.UserAccountService.GetUserAccount(scopeID, firstname, lastname);
 
-                    UUID userID =
-                        m_app.CommunicationsManager.UserAdminService.AddUser(firstname, lastname,
-                                                                             passwd, email, regX, regY);
+                    if (null != account)
+                        throw new Exception(String.Format("Account {0} {1} already exists", firstname, lastname));
 
-                    if (userID == UUID.Zero)
+                    account = new UserAccount(scopeID, firstname, lastname, email);
+                    // REFACTORING PROBLEM: no method to set the password!
+
+                    bool success = m_app.SceneManager.CurrentOrFirstScene.UserAccountService.StoreUserAccount(account);
+
+                    if (!success)
                         throw new Exception(String.Format("failed to create new user {0} {1}",
                                                           firstname, lastname));
 
+                    GridRegion home = m_app.SceneManager.CurrentOrFirstScene.GridService.GetRegionByPosition(scopeID, 
+                        (int)(regX * Constants.RegionSize), (int)(regY * Constants.RegionSize));
+                    if (home == null)
+                        m_log.WarnFormat("[RADMIN]: Unable to set home region for newly created user account {0} {1}", firstname, lastname);
+
                     // Establish the avatar's initial appearance
 
-                    updateUserAppearance(responseData, requestData, userID);
+                    updateUserAppearance(responseData, requestData, account.PrincipalID);
 
                     responseData["success"] = true;
-                    responseData["avatar_uuid"] = userID.ToString();
+                    responseData["avatar_uuid"] = account.PrincipalID.ToString();
 
                     response.Value = responseData;
 
-                    m_log.InfoFormat("[RADMIN]: CreateUser: User {0} {1} created, UUID {2}", firstname, lastname, userID);
+                    m_log.InfoFormat("[RADMIN]: CreateUser: User {0} {1} created, UUID {2}", firstname, lastname, account.PrincipalID);
                 }
                 catch (Exception e)
                 {
@@ -1124,21 +1133,27 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 string firstname = (string) requestData["user_firstname"];
                 string lastname = (string) requestData["user_lastname"];
 
-                CachedUserInfo userInfo
-                    = m_app.CommunicationsManager.UserProfileCacheService.GetUserDetails(firstname, lastname);
-
                 responseData["user_firstname"] = firstname;
                 responseData["user_lastname"] = lastname;
 
-                if (null == userInfo)
+                UUID scopeID = m_app.SceneManager.CurrentOrFirstScene.RegionInfo.ScopeID;
+
+                UserAccount account = m_app.SceneManager.CurrentOrFirstScene.UserAccountService.GetUserAccount(scopeID, firstname, lastname);
+
+                if (null == account)
                 {
                     responseData["success"] = false;
                     responseData["lastlogin"] = 0;
                 }
                 else
                 {
+                    PresenceInfo[] pinfos = m_app.SceneManager.CurrentOrFirstScene.PresenceService.GetAgents(new string[] { account.PrincipalID.ToString() });
+                    if (pinfos != null && pinfos.Length >= 1)
+                        responseData["lastlogin"] = pinfos[0].Login;
+                    else
+                        responseData["lastlogin"] = 0;
+
                     responseData["success"] = true;
-                    responseData["lastlogin"] = userInfo.UserProfile.LastLogin;
                 }
 
                 response.Value = responseData;
@@ -1200,117 +1215,118 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         public XmlRpcResponse XmlRpcUpdateUserAccountMethod(XmlRpcRequest request, IPEndPoint remoteClient)
         {
             m_log.Info("[RADMIN]: UpdateUserAccount: new request");
+            m_log.Warn("[RADMIN]: This method needs update for 0.7");
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable responseData = new Hashtable();
 
-            lock (rslock)
-            {
-                try
-                {
-                    Hashtable requestData = (Hashtable) request.Params[0];
-
-                    // check completeness
-                    checkStringParameters(request, new string[] {
-                            "password", "user_firstname",
-                            "user_lastname"});
-
-                    // check password
-                    if (!String.IsNullOrEmpty(m_requiredPassword) &&
-                        (string) requestData["password"] != m_requiredPassword) throw new Exception("wrong password");
-
-                    // do the job
-                    string firstname = (string) requestData["user_firstname"];
-                    string lastname = (string) requestData["user_lastname"];
-
-                    string passwd = String.Empty;
-                    uint? regX = null;
-                    uint? regY = null;
-                    uint? ulaX = null;
-                    uint? ulaY = null;
-                    uint? ulaZ = null;
-                    uint? usaX = null;
-                    uint? usaY = null;
-                    uint? usaZ = null;
-                    string aboutFirstLive = String.Empty;
-                    string aboutAvatar = String.Empty;
-
-                    if (requestData.ContainsKey("user_password")) passwd = (string) requestData["user_password"];
-                    if (requestData.ContainsKey("start_region_x"))
-                        regX = Convert.ToUInt32((Int32) requestData["start_region_x"]);
-                    if (requestData.ContainsKey("start_region_y"))
-                        regY = Convert.ToUInt32((Int32) requestData["start_region_y"]);
-
-                    if (requestData.ContainsKey("start_lookat_x"))
-                        ulaX = Convert.ToUInt32((Int32) requestData["start_lookat_x"]);
-                    if (requestData.ContainsKey("start_lookat_y"))
-                        ulaY = Convert.ToUInt32((Int32) requestData["start_lookat_y"]);
-                    if (requestData.ContainsKey("start_lookat_z"))
-                        ulaZ = Convert.ToUInt32((Int32) requestData["start_lookat_z"]);
-
-                    if (requestData.ContainsKey("start_standat_x"))
-                        usaX = Convert.ToUInt32((Int32) requestData["start_standat_x"]);
-                    if (requestData.ContainsKey("start_standat_y"))
-                        usaY = Convert.ToUInt32((Int32) requestData["start_standat_y"]);
-                    if (requestData.ContainsKey("start_standat_z"))
-                        usaZ = Convert.ToUInt32((Int32) requestData["start_standat_z"]);
-                    if (requestData.ContainsKey("about_real_world"))
-                        aboutFirstLive = (string)requestData["about_real_world"];
-                    if (requestData.ContainsKey("about_virtual_world"))
-                        aboutAvatar = (string)requestData["about_virtual_world"];
-
-                    UserProfileData userProfile
-                        = m_app.CommunicationsManager.UserService.GetUserProfile(firstname, lastname);
-
-                    if (null == userProfile)
-                        throw new Exception(String.Format("avatar {0} {1} does not exist", firstname, lastname));
-
-                    if (!String.IsNullOrEmpty(passwd))
-                    {
-                        m_log.DebugFormat("[RADMIN]: UpdateUserAccount: updating password for avatar {0} {1}", firstname, lastname);
-                        string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(passwd) + ":" + String.Empty);
-                        userProfile.PasswordHash = md5PasswdHash;
-                    }
-
-                    if (null != regX) userProfile.HomeRegionX = (uint) regX;
-                    if (null != regY) userProfile.HomeRegionY = (uint) regY;
-
-                    if (null != usaX) userProfile.HomeLocationX = (uint) usaX;
-                    if (null != usaY) userProfile.HomeLocationY = (uint) usaY;
-                    if (null != usaZ) userProfile.HomeLocationZ = (uint) usaZ;
-
-                    if (null != ulaX) userProfile.HomeLookAtX = (uint) ulaX;
-                    if (null != ulaY) userProfile.HomeLookAtY = (uint) ulaY;
-                    if (null != ulaZ) userProfile.HomeLookAtZ = (uint) ulaZ;
-
-                    if (String.Empty != aboutFirstLive) userProfile.FirstLifeAboutText = aboutFirstLive;
-                    if (String.Empty != aboutAvatar) userProfile.AboutText = aboutAvatar;
-
-                    // User has been created. Now establish gender and appearance.
-
-                    updateUserAppearance(responseData, requestData, userProfile.ID);
-
-                    if (!m_app.CommunicationsManager.UserService.UpdateUserProfile(userProfile))
-                        throw new Exception("did not manage to update user profile");
-
-                    responseData["success"] = true;
-
-                    response.Value = responseData;
-
-                    m_log.InfoFormat("[RADMIN]: UpdateUserAccount: account for user {0} {1} updated, UUID {2}",
-                                     firstname, lastname,
-                                     userProfile.ID);
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat("[RADMIN] UpdateUserAccount: failed: {0}", e.Message);
-                    m_log.DebugFormat("[RADMIN] UpdateUserAccount: failed: {0}", e.ToString());
-
-                    responseData["success"] = false;
-                    responseData["error"] = e.Message;
-
-                    response.Value = responseData;
-                }
-            }
+            //lock (rslock)
+            //{
+            //    try
+            //    {
+            //        Hashtable requestData = (Hashtable) request.Params[0];
+
+            //        // check completeness
+            //        checkStringParameters(request, new string[] {
+            //                "password", "user_firstname",
+            //                "user_lastname"});
+
+            //        // check password
+            //        if (!String.IsNullOrEmpty(m_requiredPassword) &&
+            //            (string) requestData["password"] != m_requiredPassword) throw new Exception("wrong password");
+
+            //        // do the job
+            //        string firstname = (string) requestData["user_firstname"];
+            //        string lastname = (string) requestData["user_lastname"];
+
+            //        string passwd = String.Empty;
+            //        uint? regX = null;
+            //        uint? regY = null;
+            //        uint? ulaX = null;
+            //        uint? ulaY = null;
+            //        uint? ulaZ = null;
+            //        uint? usaX = null;
+            //        uint? usaY = null;
+            //        uint? usaZ = null;
+            //        string aboutFirstLive = String.Empty;
+            //        string aboutAvatar = String.Empty;
+
+            //        if (requestData.ContainsKey("user_password")) passwd = (string) requestData["user_password"];
+            //        if (requestData.ContainsKey("start_region_x"))
+            //            regX = Convert.ToUInt32((Int32) requestData["start_region_x"]);
+            //        if (requestData.ContainsKey("start_region_y"))
+            //            regY = Convert.ToUInt32((Int32) requestData["start_region_y"]);
+
+            //        if (requestData.ContainsKey("start_lookat_x"))
+            //            ulaX = Convert.ToUInt32((Int32) requestData["start_lookat_x"]);
+            //        if (requestData.ContainsKey("start_lookat_y"))
+            //            ulaY = Convert.ToUInt32((Int32) requestData["start_lookat_y"]);
+            //        if (requestData.ContainsKey("start_lookat_z"))
+            //            ulaZ = Convert.ToUInt32((Int32) requestData["start_lookat_z"]);
+
+            //        if (requestData.ContainsKey("start_standat_x"))
+            //            usaX = Convert.ToUInt32((Int32) requestData["start_standat_x"]);
+            //        if (requestData.ContainsKey("start_standat_y"))
+            //            usaY = Convert.ToUInt32((Int32) requestData["start_standat_y"]);
+            //        if (requestData.ContainsKey("start_standat_z"))
+            //            usaZ = Convert.ToUInt32((Int32) requestData["start_standat_z"]);
+            //        if (requestData.ContainsKey("about_real_world"))
+            //            aboutFirstLive = (string)requestData["about_real_world"];
+            //        if (requestData.ContainsKey("about_virtual_world"))
+            //            aboutAvatar = (string)requestData["about_virtual_world"];
+
+            //        UserProfileData userProfile
+            //            = m_app.CommunicationsManager.UserService.GetUserProfile(firstname, lastname);
+
+            //        if (null == userProfile)
+            //            throw new Exception(String.Format("avatar {0} {1} does not exist", firstname, lastname));
+
+            //        if (!String.IsNullOrEmpty(passwd))
+            //        {
+            //            m_log.DebugFormat("[RADMIN]: UpdateUserAccount: updating password for avatar {0} {1}", firstname, lastname);
+            //            string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(passwd) + ":" + String.Empty);
+            //            userProfile.PasswordHash = md5PasswdHash;
+            //        }
+
+            //        if (null != regX) userProfile.HomeRegionX = (uint) regX;
+            //        if (null != regY) userProfile.HomeRegionY = (uint) regY;
+
+            //        if (null != usaX) userProfile.HomeLocationX = (uint) usaX;
+            //        if (null != usaY) userProfile.HomeLocationY = (uint) usaY;
+            //        if (null != usaZ) userProfile.HomeLocationZ = (uint) usaZ;
+
+            //        if (null != ulaX) userProfile.HomeLookAtX = (uint) ulaX;
+            //        if (null != ulaY) userProfile.HomeLookAtY = (uint) ulaY;
+            //        if (null != ulaZ) userProfile.HomeLookAtZ = (uint) ulaZ;
+
+            //        if (String.Empty != aboutFirstLive) userProfile.FirstLifeAboutText = aboutFirstLive;
+            //        if (String.Empty != aboutAvatar) userProfile.AboutText = aboutAvatar;
+
+            //        // User has been created. Now establish gender and appearance.
+
+            //        updateUserAppearance(responseData, requestData, userProfile.ID);
+
+            //        if (!m_app.CommunicationsManager.UserService.UpdateUserProfile(userProfile))
+            //            throw new Exception("did not manage to update user profile");
+
+            //        responseData["success"] = true;
+
+            //        response.Value = responseData;
+
+            //        m_log.InfoFormat("[RADMIN]: UpdateUserAccount: account for user {0} {1} updated, UUID {2}",
+            //                         firstname, lastname,
+            //                         userProfile.ID);
+            //    }
+            //    catch (Exception e)
+            //    {
+            //        m_log.ErrorFormat("[RADMIN] UpdateUserAccount: failed: {0}", e.Message);
+            //        m_log.DebugFormat("[RADMIN] UpdateUserAccount: failed: {0}", e.ToString());
+
+            //        responseData["success"] = false;
+            //        responseData["error"] = e.Message;
+
+            //        response.Value = responseData;
+            //    }
+            //}
 
             m_log.Info("[RADMIN]: UpdateUserAccount: request complete");
             return response;
@@ -1327,72 +1343,73 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         private void updateUserAppearance(Hashtable responseData, Hashtable requestData, UUID userid)
         {
             m_log.DebugFormat("[RADMIN] updateUserAppearance");
+            m_log.Warn("[RADMIN]: This method needs update for 0.7");
 
-            string dmale   = m_config.GetString("default_male", "Default Male");
-            string dfemale = m_config.GetString("default_female", "Default Female");
-            string dneut   = m_config.GetString("default_female", "Default Default");
+            //string dmale   = m_config.GetString("default_male", "Default Male");
+            //string dfemale = m_config.GetString("default_female", "Default Female");
+            //string dneut   = m_config.GetString("default_female", "Default Default");
             string model   = String.Empty;
 
-            // Has a gender preference been supplied?
-
-            if (requestData.Contains("gender"))
-            {
-                switch ((string)requestData["gender"])
-                {
-                    case "m" :
-                        model = dmale;
-                        break;
-                    case "f" :
-                        model = dfemale;
-                        break;
-                    case "n" :
-                    default :
-                        model = dneut;
-                        break;
-                }
-            }
-
-            // Has an explicit model been specified?
-
-            if (requestData.Contains("model"))
-            {
-                model = (string)requestData["model"];
-            }
-
-            // No appearance attributes were set
-
-            if (model == String.Empty)
-            {
-                m_log.DebugFormat("[RADMIN] Appearance update not requested");
-                return;
-            }
-
-            m_log.DebugFormat("[RADMIN] Setting appearance for avatar {0}, using model {1}", userid, model);
-
-            string[] nomens = model.Split();
-            if (nomens.Length != 2)
-            {
-                m_log.WarnFormat("[RADMIN] User appearance not set for {0}. Invalid model name : <{1}>", userid, model);
-                // nomens = dmodel.Split();
-                return;
-            }
-
-            UserProfileData mprof = m_app.CommunicationsManager.UserService.GetUserProfile(nomens[0], nomens[1]);
-
-            // Is this the first time one of the default models has been used? Create it if that is the case
-            // otherwise default to male.
-
-            if (mprof == null)
-            {
-                m_log.WarnFormat("[RADMIN] Requested model ({0}) not found. Appearance unchanged", model);
-                return;
-            }
-
-            // Set current user's appearance. This bit is easy. The appearance structure is populated with
-            // actual asset ids, however to complete the magic we need to populate the inventory with the
-            // assets in question.
-
-            establishAppearance(userid, mprof.ID);
+            //// Has a gender preference been supplied?
+
+            //if (requestData.Contains("gender"))
+            //{
+            //    switch ((string)requestData["gender"])
+            //    {
+            //        case "m" :
+            //            model = dmale;
+            //            break;
+            //        case "f" :
+            //            model = dfemale;
+            //            break;
+            //        case "n" :
+            //        default :
+            //            model = dneut;
+            //            break;
+            //    }
+            //}
+
+            //// Has an explicit model been specified?
+
+            //if (requestData.Contains("model"))
+            //{
+            //    model = (string)requestData["model"];
+            //}
+
+            //// No appearance attributes were set
+
+            //if (model == String.Empty)
+            //{
+            //    m_log.DebugFormat("[RADMIN] Appearance update not requested");
+            //    return;
+            //}
+
+            //m_log.DebugFormat("[RADMIN] Setting appearance for avatar {0}, using model {1}", userid, model);
+
+            //string[] nomens = model.Split();
+            //if (nomens.Length != 2)
+            //{
+            //    m_log.WarnFormat("[RADMIN] User appearance not set for {0}. Invalid model name : <{1}>", userid, model);
+            //    // nomens = dmodel.Split();
+            //    return;
+            //}
+
+            //UserProfileData mprof = m_app.CommunicationsManager.UserService.GetUserProfile(nomens[0], nomens[1]);
+
+            //// Is this the first time one of the default models has been used? Create it if that is the case
+            //// otherwise default to male.
+
+            //if (mprof == null)
+            //{
+            //    m_log.WarnFormat("[RADMIN] Requested model ({0}) not found. Appearance unchanged", model);
+            //    return;
+            //}
+
+            //// Set current user's appearance. This bit is easy. The appearance structure is populated with
+            //// actual asset ids, however to complete the magic we need to populate the inventory with the
+            //// assets in question.
+
+            //establishAppearance(userid, mprof.ID);
 
             m_log.DebugFormat("[RADMIN] Finished setting appearance for avatar {0}, using model {1}",
                               userid, model);
@@ -1604,20 +1621,27 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                             passwd = GetStringAttribute(avatar,"password",passwd);
 
                             string[] nomens = name.Split();
-                            UI = m_app.CommunicationsManager.UserProfileCacheService.GetUserDetails(nomens[0], nomens[1]);
-                            if (null == UI)
+                            UUID scopeID = m_app.SceneManager.CurrentOrFirstScene.RegionInfo.ScopeID;
+                            UserAccount account = m_app.SceneManager.CurrentOrFirstScene.UserAccountService.GetUserAccount(scopeID, nomens[0], nomens[1]);
+                            if (null == account)
                             {
-                                ID = m_app.CommunicationsManager.UserAdminService.AddUser(nomens[0], nomens[1],
-                                                                                         passwd, email, regX, regY);
-                                if (ID == UUID.Zero)
+                                account = new UserAccount(scopeID, nomens[0], nomens[1], email);
+                                bool success = m_app.SceneManager.CurrentOrFirstScene.UserAccountService.StoreUserAccount(account);
+                                if (!success)
                                 {
                                     m_log.ErrorFormat("[RADMIN] Avatar {0} {1} was not created", nomens[0], nomens[1]);
                                     return false;
                                 }
+                                // !!! REFACTORING PROBLEM: need to set the password
+
+                                GridRegion home = m_app.SceneManager.CurrentOrFirstScene.GridService.GetRegionByPosition(scopeID, 
+                                    (int)(regX * Constants.RegionSize), (int)(regY * Constants.RegionSize));
+                                if (home != null)
+                                    m_app.SceneManager.CurrentOrFirstScene.PresenceService.SetHomeLocation(account.PrincipalID.ToString(), home.RegionID, new Vector3(128, 128, 0), new Vector3(0, 1, 0));
                             }
                             else
                             {
-                                ID = UI.UserProfile.ID;
+                                ID = account.PrincipalID;
                             }
 
                             m_log.DebugFormat("[RADMIN] User {0}[{1}] created or retrieved", name, ID);
@@ -2391,17 +2415,18 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                 if (requestData.Contains("users"))
                 {
-                    UserProfileCacheService ups = m_app.CommunicationsManager.UserProfileCacheService;
+                    UUID scopeID = m_app.SceneManager.CurrentOrFirstScene.RegionInfo.ScopeID;
+                    IUserAccountService userService = m_app.SceneManager.CurrentOrFirstScene.UserAccountService;
                     Scene s = m_app.SceneManager.CurrentScene;
                     Hashtable users = (Hashtable) requestData["users"];
                     List<UUID> uuids = new List<UUID>();
                     foreach (string name in users.Values)
                     {
                         string[] parts = name.Split();
-                        CachedUserInfo udata = ups.GetUserDetails(parts[0],parts[1]);
-                        if (udata != null)
+                        UserAccount account = userService.GetUserAccount(scopeID, parts[0], parts[1]);
+                        if (account != null)
                         {
-                            uuids.Add(udata.UserProfile.ID);
+                            uuids.Add(account.PrincipalID);
                             m_log.DebugFormat("[RADMIN] adding \"{0}\" to ACL for \"{1}\"", name, s.RegionInfo.RegionName);
                         }
                     }
@@ -2477,21 +2502,23 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                 if (requestData.Contains("users"))
                 {
-                    UserProfileCacheService ups = m_app.CommunicationsManager.UserProfileCacheService;
+                    UUID scopeID = m_app.SceneManager.CurrentOrFirstScene.RegionInfo.ScopeID;
+                    IUserAccountService userService = m_app.SceneManager.CurrentOrFirstScene.UserAccountService;
+                    //UserProfileCacheService ups = m_app.CommunicationsManager.UserProfileCacheService;
                     Scene s = m_app.SceneManager.CurrentScene;
                     Hashtable users = (Hashtable) requestData["users"];
                     List<UUID> uuids = new List<UUID>();
-                   foreach (string name in users.Values)
+                    foreach (string name in users.Values)
                     {
                         string[] parts = name.Split();
-                        CachedUserInfo udata = ups.GetUserDetails(parts[0],parts[1]);
-                       if (udata != null)
+                        UserAccount account = userService.GetUserAccount(scopeID, parts[0], parts[1]);
+                        if (account != null)
                         {
-                            uuids.Add(udata.UserProfile.ID);
+                            uuids.Add(account.PrincipalID);
                         }
                     }
                     List<UUID> acl = new List<UUID>(s.RegionInfo.EstateSettings.EstateAccess);
-                   foreach (UUID uuid in uuids)
+                    foreach (UUID uuid in uuids)
                     {
                        if (acl.Contains(uuid))
                         {
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs
index d3a7e64..10f1a6e 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs
@@ -35,6 +35,9 @@ using System.Xml;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Services.Interfaces;
+
+using OpenMetaverse;
 
 namespace OpenSim.ApplicationPlugins.Rest.Inventory
 {
@@ -658,7 +661,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
         {
 
             int x;
-            string HA1;
             string first;
             string last;
 
@@ -675,17 +677,13 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
                 last  = String.Empty;
             }
 
-            UserProfileData udata = Rest.UserServices.GetUserProfile(first, last);
+            UserAccount account = Rest.UserServices.GetUserAccount(UUID.Zero, first, last);
 
             // If we don't recognize the user id, perhaps it is god?
-
-            if (udata == null)
+            if (account == null)
                 return pass == Rest.GodKey;
 
-            HA1 = HashToString(pass);
-            HA1 = HashToString(String.Format("{0}:{1}",HA1,udata.PasswordSalt));
-
-            return (0 == sc.Compare(HA1, udata.PasswordHash));
+            return (Rest.AuthServices.Authenticate(account.PrincipalID, pass, 1) != string.Empty);
 
         }
 
@@ -897,11 +895,10 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
                 last  = String.Empty;
             }
 
-            UserProfileData udata = Rest.UserServices.GetUserProfile(first, last);
-
+            UserAccount account = Rest.UserServices.GetUserAccount(UUID.Zero, first, last);
             // If we don;t recognize the user id, perhaps it is god?
 
-            if (udata == null)
+            if (account == null)
             {
                 Rest.Log.DebugFormat("{0} Administrator", MsgId);
                 return Rest.GodKey;
@@ -909,7 +906,12 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
             else
             {
                 Rest.Log.DebugFormat("{0} Normal User {1}", MsgId, user);
-                return udata.PasswordHash;
+
+                // !!! REFACTORING PROBLEM
+                // This is what it was. It doesn't work in 0.7
+                // Nothing retrieves the password from the authentication service, there's only authentication.
+                //return udata.PasswordHash;
+                return string.Empty;
             }
 
         }
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
index 8d62423..791cfcd 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
@@ -103,11 +103,16 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
             get { return main.SceneManager.CurrentOrFirstScene.InventoryService; }
         }
 
-        internal static IUserService UserServices
+        internal static IUserAccountService UserServices
         {
-            get { return Comms.UserService; }
+            get { return main.SceneManager.CurrentOrFirstScene.UserAccountService; }
         }
- 
+
+        internal static IAuthenticationService AuthServices
+        {
+            get { return main.SceneManager.CurrentOrFirstScene.AuthenticationService; }
+        }
+        
         internal static IAvatarService AvatarServices
         {
             get { return Comms.AvatarService; }
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
index b2b4aa7..0a45eff 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
@@ -135,152 +135,153 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 
         private void DoAppearance(RequestData hdata)
         {
-
-            AppearanceRequestData rdata = (AppearanceRequestData) hdata;
-
-            Rest.Log.DebugFormat("{0} DoAppearance ENTRY", MsgId);
-
-            // If we're disabled, do nothing.
-
-            if (!enabled)
-            {
-                return;
-            }
-
-            // Now that we know this is a serious attempt to
-            // access inventory data, we should find out who
-            // is asking, and make sure they are authorized
-            // to do so. We need to validate the caller's
-            // identity before revealing anything about the
-            // status quo. Authenticate throws an exception
-            // via Fail if no identity information is present.
-            //
-            // With the present HTTP server we can't use the
-            // builtin authentication mechanisms because they
-            // would be enforced for all in-bound requests.
-            // Instead we look at the headers ourselves and
-            // handle authentication directly.
-
-            try
-            {
-                if (!rdata.IsAuthenticated)
-                {
-                    rdata.Fail(Rest.HttpStatusCodeNotAuthorized,String.Format("user \"{0}\" could not be authenticated", rdata.userName));
-                }
-            }
-            catch (RestException e)
-            {
-                if (e.statusCode == Rest.HttpStatusCodeNotAuthorized)
-                {
-                    Rest.Log.WarnFormat("{0} User not authenticated", MsgId);
-                    Rest.Log.DebugFormat("{0} Authorization header: {1}", MsgId, rdata.request.Headers.Get("Authorization"));
-                }
-                else
-                {
-                    Rest.Log.ErrorFormat("{0} User authentication failed", MsgId);
-                    Rest.Log.DebugFormat("{0} Authorization header: {1}", MsgId, rdata.request.Headers.Get("Authorization"));
-                }
-                throw (e);
-            }
-
-            Rest.Log.DebugFormat("{0} Authenticated {1}", MsgId, rdata.userName);
-
-            // We can only get here if we are authorized
-            //
-            // The requestor may have specified an UUID or
-            // a conjoined FirstName LastName string. We'll
-            // try both. If we fail with the first, UUID,
-            // attempt, we try the other. As an example, the
-            // URI for a valid inventory request might be:
-            //
-            // http://<host>:<port>/admin/inventory/Arthur Dent
-            //
-            // Indicating that this is an inventory request for
-            // an avatar named Arthur Dent. This is ALL that is
-            // required to designate a GET for an entire
-            // inventory.
-            //
-
-            // Do we have at least a user agent name?
-
-            if (rdata.Parameters.Length < 1)
-            {
-                Rest.Log.WarnFormat("{0} Appearance: No user agent identifier specified", MsgId);
-                rdata.Fail(Rest.HttpStatusCodeBadRequest, "no user identity specified");
-            }
-
-            // The first parameter MUST be the agent identification, either an UUID
-            // or a space-separated First-name Last-Name specification. We check for
-            // an UUID first, if anyone names their character using a valid UUID
-            // that identifies another existing avatar will cause this a problem...
-
-            try
-            {
-                rdata.uuid = new UUID(rdata.Parameters[PARM_USERID]);
-                Rest.Log.DebugFormat("{0} UUID supplied", MsgId);
-                rdata.userProfile = Rest.UserServices.GetUserProfile(rdata.uuid);
-            }
-            catch
-            {
-                string[] names = rdata.Parameters[PARM_USERID].Split(Rest.CA_SPACE);
-                if (names.Length == 2)
-                {
-                    Rest.Log.DebugFormat("{0} Agent Name supplied [2]", MsgId);
-                    rdata.userProfile = Rest.UserServices.GetUserProfile(names[0],names[1]);
-                }
-                else
-                {
-                    Rest.Log.WarnFormat("{0} A Valid UUID or both first and last names must be specified", MsgId);
-                    rdata.Fail(Rest.HttpStatusCodeBadRequest, "invalid user identity");
-                }
-            }
-
-            // If the user profile is null then either the server is broken, or the
-            // user is not known. We always assume the latter case.
-
-            if (rdata.userProfile != null)
-            {
-                Rest.Log.DebugFormat("{0} User profile obtained for agent {1} {2}",
-                                     MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName);
-            }
-            else
-            {
-                Rest.Log.WarnFormat("{0} No user profile for {1}", MsgId, rdata.path);
-                rdata.Fail(Rest.HttpStatusCodeNotFound, "unrecognized user identity");
-            }
-
-            // If we get to here, then we have effectively validated the user's
-
-            switch (rdata.method)
-            {
-                case Rest.HEAD   : // Do the processing, set the status code, suppress entity
-                    DoGet(rdata);
-                    rdata.buffer = null;
-                    break;
-
-                case Rest.GET    : // Do the processing, set the status code, return entity
-                    DoGet(rdata);
-                    break;
-
-                case Rest.PUT    : // Update named element
-                    DoUpdate(rdata);
-                    break;
-
-                case Rest.POST   : // Add new information to identified context.
-                    DoExtend(rdata);
-                    break;
-
-                case Rest.DELETE : // Delete information
-                    DoDelete(rdata);
-                    break;
-
-                default :
-                    Rest.Log.WarnFormat("{0} Method {1} not supported for {2}",
-                                         MsgId, rdata.method, rdata.path);
-                    rdata.Fail(Rest.HttpStatusCodeMethodNotAllowed, 
-                               String.Format("{0} not supported", rdata.method));
-                    break;
-            }
+            // !!! REFACTORIMG PROBLEM. This needs rewriting for 0.7
+
+            //AppearanceRequestData rdata = (AppearanceRequestData) hdata;
+
+            //Rest.Log.DebugFormat("{0} DoAppearance ENTRY", MsgId);
+
+            //// If we're disabled, do nothing.
+
+            //if (!enabled)
+            //{
+            //    return;
+            //}
+
+            //// Now that we know this is a serious attempt to
+            //// access inventory data, we should find out who
+            //// is asking, and make sure they are authorized
+            //// to do so. We need to validate the caller's
+            //// identity before revealing anything about the
+            //// status quo. Authenticate throws an exception
+            //// via Fail if no identity information is present.
+            ////
+            //// With the present HTTP server we can't use the
+            //// builtin authentication mechanisms because they
+            //// would be enforced for all in-bound requests.
+            //// Instead we look at the headers ourselves and
+            //// handle authentication directly.
+
+            //try
+            //{
+            //    if (!rdata.IsAuthenticated)
+            //    {
+            //        rdata.Fail(Rest.HttpStatusCodeNotAuthorized,String.Format("user \"{0}\" could not be authenticated", rdata.userName));
+            //    }
+            //}
+            //catch (RestException e)
+            //{
+            //    if (e.statusCode == Rest.HttpStatusCodeNotAuthorized)
+            //    {
+            //        Rest.Log.WarnFormat("{0} User not authenticated", MsgId);
+            //        Rest.Log.DebugFormat("{0} Authorization header: {1}", MsgId, rdata.request.Headers.Get("Authorization"));
+            //    }
+            //    else
+            //    {
+            //        Rest.Log.ErrorFormat("{0} User authentication failed", MsgId);
+            //        Rest.Log.DebugFormat("{0} Authorization header: {1}", MsgId, rdata.request.Headers.Get("Authorization"));
+            //    }
+            //    throw (e);
+            //}
+
+            //Rest.Log.DebugFormat("{0} Authenticated {1}", MsgId, rdata.userName);
+
+            //// We can only get here if we are authorized
+            ////
+            //// The requestor may have specified an UUID or
+            //// a conjoined FirstName LastName string. We'll
+            //// try both. If we fail with the first, UUID,
+            //// attempt, we try the other. As an example, the
+            //// URI for a valid inventory request might be:
+            ////
+            //// http://<host>:<port>/admin/inventory/Arthur Dent
+            ////
+            //// Indicating that this is an inventory request for
+            //// an avatar named Arthur Dent. This is ALL that is
+            //// required to designate a GET for an entire
+            //// inventory.
+            ////
+
+            //// Do we have at least a user agent name?
+
+            //if (rdata.Parameters.Length < 1)
+            //{
+            //    Rest.Log.WarnFormat("{0} Appearance: No user agent identifier specified", MsgId);
+            //    rdata.Fail(Rest.HttpStatusCodeBadRequest, "no user identity specified");
+            //}
+
+            //// The first parameter MUST be the agent identification, either an UUID
+            //// or a space-separated First-name Last-Name specification. We check for
+            //// an UUID first, if anyone names their character using a valid UUID
+            //// that identifies another existing avatar will cause this a problem...
+
+            //try
+            //{
+            //    rdata.uuid = new UUID(rdata.Parameters[PARM_USERID]);
+            //    Rest.Log.DebugFormat("{0} UUID supplied", MsgId);
+            //    rdata.userProfile = Rest.UserServices.GetUserProfile(rdata.uuid);
+            //}
+            //catch
+            //{
+            //    string[] names = rdata.Parameters[PARM_USERID].Split(Rest.CA_SPACE);
+            //    if (names.Length == 2)
+            //    {
+            //        Rest.Log.DebugFormat("{0} Agent Name supplied [2]", MsgId);
+            //        rdata.userProfile = Rest.UserServices.GetUserProfile(names[0],names[1]);
+            //    }
+            //    else
+            //    {
+            //        Rest.Log.WarnFormat("{0} A Valid UUID or both first and last names must be specified", MsgId);
+            //        rdata.Fail(Rest.HttpStatusCodeBadRequest, "invalid user identity");
+            //    }
+            //}
+
+            //// If the user profile is null then either the server is broken, or the
+            //// user is not known. We always assume the latter case.
+
+            //if (rdata.userProfile != null)
+            //{
+            //    Rest.Log.DebugFormat("{0} User profile obtained for agent {1} {2}",
+            //                         MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName);
+            //}
+            //else
+            //{
+            //    Rest.Log.WarnFormat("{0} No user profile for {1}", MsgId, rdata.path);
+            //    rdata.Fail(Rest.HttpStatusCodeNotFound, "unrecognized user identity");
+            //}
+
+            //// If we get to here, then we have effectively validated the user's
+
+            //switch (rdata.method)
+            //{
+            //    case Rest.HEAD   : // Do the processing, set the status code, suppress entity
+            //        DoGet(rdata);
+            //        rdata.buffer = null;
+            //        break;
+
+            //    case Rest.GET    : // Do the processing, set the status code, return entity
+            //        DoGet(rdata);
+            //        break;
+
+            //    case Rest.PUT    : // Update named element
+            //        DoUpdate(rdata);
+            //        break;
+
+            //    case Rest.POST   : // Add new information to identified context.
+            //        DoExtend(rdata);
+            //        break;
+
+            //    case Rest.DELETE : // Delete information
+            //        DoDelete(rdata);
+            //        break;
+
+            //    default :
+            //        Rest.Log.WarnFormat("{0} Method {1} not supported for {2}",
+            //                             MsgId, rdata.method, rdata.path);
+            //        rdata.Fail(Rest.HttpStatusCodeMethodNotAllowed, 
+            //                   String.Format("{0} not supported", rdata.method));
+            //        break;
+            //}
         }
 
         #endregion Interface
@@ -391,37 +392,39 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
         private void DoUpdate(AppearanceRequestData rdata)
         {
 
-            bool  created  = false;
-            bool  modified = false;
+            // REFACTORING PROBLEM This was commented out. It doesn't work for 0.7
 
+            //bool  created  = false;
+            //bool  modified = false;
 
-            rdata.userAppearance = Rest.AvatarServices.GetUserAppearance(rdata.userProfile.ID);
 
-            // If the user exists then this is considered a modification regardless
-            // of what may, or may not be, specified in the payload.
+            //rdata.userAppearance = Rest.AvatarServices.GetUserAppearance(rdata.userProfile.ID);
 
-            if (rdata.userAppearance != null)
-            {
-                modified = true;
-                Rest.AvatarServices.UpdateUserAppearance(rdata.userProfile.ID, rdata.userAppearance);
-                Rest.UserServices.UpdateUserProfile(rdata.userProfile);
-            }
+            //// If the user exists then this is considered a modification regardless
+            //// of what may, or may not be, specified in the payload.
 
-            if (created)
-            {
-                rdata.Complete(Rest.HttpStatusCodeCreated);
-            }
-            else
-            {
-                if (modified)
-                {
-                    rdata.Complete(Rest.HttpStatusCodeOK);
-                }
-                else
-                {
-                    rdata.Complete(Rest.HttpStatusCodeNoContent);
-                }
-            }
+            //if (rdata.userAppearance != null)
+            //{
+            //    modified = true;
+            //    Rest.AvatarServices.UpdateUserAppearance(rdata.userProfile.ID, rdata.userAppearance);
+            //    Rest.UserServices.UpdateUserProfile(rdata.userProfile);
+            //}
+
+            //if (created)
+            //{
+            //    rdata.Complete(Rest.HttpStatusCodeCreated);
+            //}
+            //else
+            //{
+            //    if (modified)
+            //    {
+            //        rdata.Complete(Rest.HttpStatusCodeOK);
+            //    }
+            //    else
+            //    {
+            //        rdata.Complete(Rest.HttpStatusCodeNoContent);
+            //    }
+            //}
 
             rdata.Respond(String.Format("Appearance {0} : Normal completion", rdata.method));
 
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
index 01bfe00..098c54d 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
@@ -143,203 +143,205 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 
             Rest.Log.DebugFormat("{0} DoInventory ENTRY", MsgId);
 
-            // If we're disabled, do nothing.
-
-            if (!enabled)
-            {
-                return;
-            }
-
-            // Now that we know this is a serious attempt to
-            // access inventory data, we should find out who
-            // is asking, and make sure they are authorized
-            // to do so. We need to validate the caller's
-            // identity before revealing anything about the
-            // status quo. Authenticate throws an exception
-            // via Fail if no identity information is present.
-            //
-            // With the present HTTP server we can't use the
-            // builtin authentication mechanisms because they
-            // would be enforced for all in-bound requests.
-            // Instead we look at the headers ourselves and
-            // handle authentication directly.
-
-            try
-            {
-                if (!rdata.IsAuthenticated)
-                {
-                    rdata.Fail(Rest.HttpStatusCodeNotAuthorized,String.Format("user \"{0}\" could not be authenticated", rdata.userName));
-                }
-            }
-            catch (RestException e)
-            {
-                if (e.statusCode == Rest.HttpStatusCodeNotAuthorized)
-                {
-                    Rest.Log.WarnFormat("{0} User not authenticated", MsgId);
-                    Rest.Log.DebugFormat("{0} Authorization header: {1}", MsgId, rdata.request.Headers.Get("Authorization"));
-                }
-                else
-                {
-                    Rest.Log.ErrorFormat("{0} User authentication failed", MsgId);
-                    Rest.Log.DebugFormat("{0} Authorization header: {1}", MsgId, rdata.request.Headers.Get("Authorization"));
-                }
-                throw (e);
-            }
-
-            Rest.Log.DebugFormat("{0} Authenticated {1}", MsgId, rdata.userName);
-
-            // We can only get here if we are authorized
-            //
-            // The requestor may have specified an UUID or
-            // a conjoined FirstName LastName string. We'll
-            // try both. If we fail with the first, UUID,
-            // attempt, we try the other. As an example, the
-            // URI for a valid inventory request might be:
-            //
-            // http://<host>:<port>/admin/inventory/Arthur Dent
-            //
-            // Indicating that this is an inventory request for
-            // an avatar named Arthur Dent. This is ALL that is
-            // required to designate a GET for an entire
-            // inventory.
-            //
-
-
-            // Do we have at least a user agent name?
-
-            if (rdata.Parameters.Length < 1)
-            {
-                Rest.Log.WarnFormat("{0} Inventory: No user agent identifier specified", MsgId);
-                rdata.Fail(Rest.HttpStatusCodeBadRequest, "no user identity specified");
-            }
-
-            // The first parameter MUST be the agent identification, either an UUID
-            // or a space-separated First-name Last-Name specification. We check for
-            // an UUID first, if anyone names their character using a valid UUID
-            // that identifies another existing avatar will cause this a problem...
-
-            try
-            {
-                rdata.uuid = new UUID(rdata.Parameters[PARM_USERID]);
-                Rest.Log.DebugFormat("{0} UUID supplied", MsgId);
-                rdata.userProfile = Rest.UserServices.GetUserProfile(rdata.uuid);
-            }
-            catch
-            {
-                string[] names = rdata.Parameters[PARM_USERID].Split(Rest.CA_SPACE);
-                if (names.Length == 2)
-                {
-                    Rest.Log.DebugFormat("{0} Agent Name supplied [2]", MsgId);
-                    rdata.userProfile = Rest.UserServices.GetUserProfile(names[0],names[1]);
-                }
-                else
-                {
-                    Rest.Log.WarnFormat("{0} A Valid UUID or both first and last names must be specified", MsgId);
-                    rdata.Fail(Rest.HttpStatusCodeBadRequest, "invalid user identity");
-                }
-            }
-
-            // If the user profile is null then either the server is broken, or the
-            // user is not known. We always assume the latter case.
-
-            if (rdata.userProfile != null)
-            {
-                Rest.Log.DebugFormat("{0} Profile obtained for agent {1} {2}",
-                                     MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName);
-            }
-            else
-            {
-                Rest.Log.WarnFormat("{0} No profile for {1}", MsgId, rdata.path);
-                rdata.Fail(Rest.HttpStatusCodeNotFound, "unrecognized user identity");
-            }
-
-            // If we get to here, then we have effectively validated the user's
-            // identity. Now we need to get the inventory. If the server does not
-            // have the inventory, we reject the request with an appropriate explanation.
-            //
-            // Note that inventory retrieval is an asynchronous event, we use the rdata
-            // class instance as the basis for our synchronization.
-            //
-
-            rdata.uuid = rdata.userProfile.ID;
-
-            if (Rest.InventoryServices.HasInventoryForUser(rdata.uuid))
-            {
-                rdata.root = Rest.InventoryServices.GetRootFolder(rdata.uuid);
-
-                Rest.Log.DebugFormat("{0} Inventory Root retrieved for {1} {2}",
-                                     MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName);
-
-                Rest.InventoryServices.GetUserInventory(rdata.uuid, rdata.GetUserInventory);
-
-                Rest.Log.DebugFormat("{0} Inventory catalog requested for {1} {2}",
-                                     MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName);
-
-                lock (rdata)
-                {
-                    if (!rdata.HaveInventory)
-                    {
-                        rdata.startWD(1000);
-                        rdata.timeout = false;
-                        Monitor.Wait(rdata);
-                    }
-                }
-
-                if (rdata.timeout)
-                {
-                    Rest.Log.WarnFormat("{0} Inventory not available for {1} {2}. No response from service.",
-                                         MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName);
-                    rdata.Fail(Rest.HttpStatusCodeServerError, "inventory server not responding");
-                }
-
-                if (rdata.root == null)
-                {
-                    Rest.Log.WarnFormat("{0} Inventory is not available [1] for agent {1} {2}",
-                                         MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName);
-                    rdata.Fail(Rest.HttpStatusCodeServerError, "inventory retrieval failed");
-                }
-
-            }
-            else
-            {
-                Rest.Log.WarnFormat("{0} Inventory is not locally available for agent {1} {2}",
-                                     MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName);
-                rdata.Fail(Rest.HttpStatusCodeNotFound, "no local inventory for user");
-            }
-
-            // If we get here, then we have successfully retrieved the user's information
-            // and inventory information is now available locally.
-
-            switch (rdata.method)
-            {
-                case Rest.HEAD   : // Do the processing, set the status code, suppress entity
-                    DoGet(rdata);
-                    rdata.buffer = null;
-                    break;
-
-                case Rest.GET    : // Do the processing, set the status code, return entity
-                    DoGet(rdata);
-                    break;
-
-                case Rest.PUT    : // Update named element
-                    DoUpdate(rdata);
-                    break;
-
-                case Rest.POST   : // Add new information to identified context.
-                    DoExtend(rdata);
-                    break;
-
-                case Rest.DELETE : // Delete information
-                    DoDelete(rdata);
-                    break;
-
-                default :
-                    Rest.Log.WarnFormat("{0} Method {1} not supported for {2}",
-                                        MsgId, rdata.method, rdata.path);
-                    rdata.Fail(Rest.HttpStatusCodeMethodNotAllowed,
-                               String.Format("{0} not supported", rdata.method));
-                    break;
-            }
+            // !!! REFACTORING PROBLEM
+
+            //// If we're disabled, do nothing.
+
+            //if (!enabled)
+            //{
+            //    return;
+            //}
+
+            //// Now that we know this is a serious attempt to
+            //// access inventory data, we should find out who
+            //// is asking, and make sure they are authorized
+            //// to do so. We need to validate the caller's
+            //// identity before revealing anything about the
+            //// status quo. Authenticate throws an exception
+            //// via Fail if no identity information is present.
+            ////
+            //// With the present HTTP server we can't use the
+            //// builtin authentication mechanisms because they
+            //// would be enforced for all in-bound requests.
+            //// Instead we look at the headers ourselves and
+            //// handle authentication directly.
+
+            //try
+            //{
+            //    if (!rdata.IsAuthenticated)
+            //    {
+            //        rdata.Fail(Rest.HttpStatusCodeNotAuthorized,String.Format("user \"{0}\" could not be authenticated", rdata.userName));
+            //    }
+            //}
+            //catch (RestException e)
+            //{
+            //    if (e.statusCode == Rest.HttpStatusCodeNotAuthorized)
+            //    {
+            //        Rest.Log.WarnFormat("{0} User not authenticated", MsgId);
+            //        Rest.Log.DebugFormat("{0} Authorization header: {1}", MsgId, rdata.request.Headers.Get("Authorization"));
+            //    }
+            //    else
+            //    {
+            //        Rest.Log.ErrorFormat("{0} User authentication failed", MsgId);
+            //        Rest.Log.DebugFormat("{0} Authorization header: {1}", MsgId, rdata.request.Headers.Get("Authorization"));
+            //    }
+            //    throw (e);
+            //}
+
+            //Rest.Log.DebugFormat("{0} Authenticated {1}", MsgId, rdata.userName);
+
+            //// We can only get here if we are authorized
+            ////
+            //// The requestor may have specified an UUID or
+            //// a conjoined FirstName LastName string. We'll
+            //// try both. If we fail with the first, UUID,
+            //// attempt, we try the other. As an example, the
+            //// URI for a valid inventory request might be:
+            ////
+            //// http://<host>:<port>/admin/inventory/Arthur Dent
+            ////
+            //// Indicating that this is an inventory request for
+            //// an avatar named Arthur Dent. This is ALL that is
+            //// required to designate a GET for an entire
+            //// inventory.
+            ////
+
+
+            //// Do we have at least a user agent name?
+
+            //if (rdata.Parameters.Length < 1)
+            //{
+            //    Rest.Log.WarnFormat("{0} Inventory: No user agent identifier specified", MsgId);
+            //    rdata.Fail(Rest.HttpStatusCodeBadRequest, "no user identity specified");
+            //}
+
+            //// The first parameter MUST be the agent identification, either an UUID
+            //// or a space-separated First-name Last-Name specification. We check for
+            //// an UUID first, if anyone names their character using a valid UUID
+            //// that identifies another existing avatar will cause this a problem...
+
+            //try
+            //{
+            //    rdata.uuid = new UUID(rdata.Parameters[PARM_USERID]);
+            //    Rest.Log.DebugFormat("{0} UUID supplied", MsgId);
+            //    rdata.userProfile = Rest.UserServices.GetUserProfile(rdata.uuid);
+            //}
+            //catch
+            //{
+            //    string[] names = rdata.Parameters[PARM_USERID].Split(Rest.CA_SPACE);
+            //    if (names.Length == 2)
+            //    {
+            //        Rest.Log.DebugFormat("{0} Agent Name supplied [2]", MsgId);
+            //        rdata.userProfile = Rest.UserServices.GetUserProfile(names[0],names[1]);
+            //    }
+            //    else
+            //    {
+            //        Rest.Log.WarnFormat("{0} A Valid UUID or both first and last names must be specified", MsgId);
+            //        rdata.Fail(Rest.HttpStatusCodeBadRequest, "invalid user identity");
+            //    }
+            //}
+
+            //// If the user profile is null then either the server is broken, or the
+            //// user is not known. We always assume the latter case.
+
+            //if (rdata.userProfile != null)
+            //{
+            //    Rest.Log.DebugFormat("{0} Profile obtained for agent {1} {2}",
+            //                         MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName);
+            //}
+            //else
+            //{
+            //    Rest.Log.WarnFormat("{0} No profile for {1}", MsgId, rdata.path);
+            //    rdata.Fail(Rest.HttpStatusCodeNotFound, "unrecognized user identity");
+            //}
+
+            //// If we get to here, then we have effectively validated the user's
+            //// identity. Now we need to get the inventory. If the server does not
+            //// have the inventory, we reject the request with an appropriate explanation.
+            ////
+            //// Note that inventory retrieval is an asynchronous event, we use the rdata
+            //// class instance as the basis for our synchronization.
+            ////
+
+            //rdata.uuid = rdata.userProfile.ID;
+
+            //if (Rest.InventoryServices.HasInventoryForUser(rdata.uuid))
+            //{
+            //    rdata.root = Rest.InventoryServices.GetRootFolder(rdata.uuid);
+
+            //    Rest.Log.DebugFormat("{0} Inventory Root retrieved for {1} {2}",
+            //                         MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName);
+
+            //    Rest.InventoryServices.GetUserInventory(rdata.uuid, rdata.GetUserInventory);
+
+            //    Rest.Log.DebugFormat("{0} Inventory catalog requested for {1} {2}",
+            //                         MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName);
+
+            //    lock (rdata)
+            //    {
+            //        if (!rdata.HaveInventory)
+            //        {
+            //            rdata.startWD(1000);
+            //            rdata.timeout = false;
+            //            Monitor.Wait(rdata);
+            //        }
+            //    }
+
+            //    if (rdata.timeout)
+            //    {
+            //        Rest.Log.WarnFormat("{0} Inventory not available for {1} {2}. No response from service.",
+            //                             MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName);
+            //        rdata.Fail(Rest.HttpStatusCodeServerError, "inventory server not responding");
+            //    }
+
+            //    if (rdata.root == null)
+            //    {
+            //        Rest.Log.WarnFormat("{0} Inventory is not available [1] for agent {1} {2}",
+            //                             MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName);
+            //        rdata.Fail(Rest.HttpStatusCodeServerError, "inventory retrieval failed");
+            //    }
+
+            //}
+            //else
+            //{
+            //    Rest.Log.WarnFormat("{0} Inventory is not locally available for agent {1} {2}",
+            //                         MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName);
+            //    rdata.Fail(Rest.HttpStatusCodeNotFound, "no local inventory for user");
+            //}
+
+            //// If we get here, then we have successfully retrieved the user's information
+            //// and inventory information is now available locally.
+
+            //switch (rdata.method)
+            //{
+            //    case Rest.HEAD   : // Do the processing, set the status code, suppress entity
+            //        DoGet(rdata);
+            //        rdata.buffer = null;
+            //        break;
+
+            //    case Rest.GET    : // Do the processing, set the status code, return entity
+            //        DoGet(rdata);
+            //        break;
+
+            //    case Rest.PUT    : // Update named element
+            //        DoUpdate(rdata);
+            //        break;
+
+            //    case Rest.POST   : // Add new information to identified context.
+            //        DoExtend(rdata);
+            //        break;
+
+            //    case Rest.DELETE : // Delete information
+            //        DoDelete(rdata);
+            //        break;
+
+            //    default :
+            //        Rest.Log.WarnFormat("{0} Method {1} not supported for {2}",
+            //                            MsgId, rdata.method, rdata.path);
+            //        rdata.Fail(Rest.HttpStatusCodeMethodNotAllowed,
+            //                   String.Format("{0} not supported", rdata.method));
+            //        break;
+            //}
         }
 
         #endregion Interface