Initial update to OpenSim 0.8.2.1 source code.

1 files changed, 26 insertions, 21 deletions

diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/IRestHandler.cs b/OpenSim/Server/Handlers/AgentPreferences/AgentPreferencesServiceConnector.cs
index a88fe88..a581ea2 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/IRestHandler.cs
+++ b/OpenSim/Server/Handlers/AgentPreferences/AgentPreferencesServiceConnector.cs
@@ -25,35 +25,40 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+
+using System;
+using Nini.Config;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Framework.ServiceAuth;
 using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Server.Handlers.Base;
 
-namespace OpenSim.ApplicationPlugins.Rest.Inventory
+namespace OpenSim.Server.Handlers.AgentPreferences
 {
+    public class AgentPreferencesServiceConnector : ServiceConnector
+    {
+        private IAgentPreferencesService m_AgentPreferencesService;
+        private string m_ConfigName = "AgentPreferencesService";
 
-    /// <remarks>
-    /// The handler delegates are not noteworthy. The allocator allows
-    /// a given handler to optionally subclass the base RequestData
-    /// structure to carry any locally required per-request state
-    /// needed.
-    /// </remarks>
+        public AgentPreferencesServiceConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
+        {
+            IConfig serverConfig = config.Configs[m_ConfigName];
+            if (serverConfig == null)
+                throw new Exception(String.Format("No section {0} in config file", m_ConfigName));
 
-    public delegate void        RestMethodHandler(RequestData rdata);
-    public delegate RequestData RestMethodAllocator(OSHttpRequest request, OSHttpResponse response, string path);
+            string service = serverConfig.GetString("LocalServiceModule", String.Empty);
 
-    /// <summary>
-    /// This interface exports the generic plugin-handling services
-    /// available to each loaded REST services module (IRest implementation)
-    /// </summary>
+            if (String.IsNullOrWhiteSpace(service))
+                throw new Exception("No LocalServiceModule in config file");
 
-    internal interface IRestHandler
-    {
+            Object[] args = new Object[] { config };
+            m_AgentPreferencesService = ServerUtils.LoadPlugin<IAgentPreferencesService>(service, args);
 
-        string MsgId     { get; }
-        string RequestId { get; }
-
-        void   AddPathHandler(RestMethodHandler mh, string path, RestMethodAllocator ma);
-        void AddStreamHandler(string httpMethod, string path, RestMethod method);
+            IServiceAuth auth = ServiceAuth.Create(config, m_ConfigName); ;
 
+            server.AddStreamHandler(new AgentPreferencesServerPostHandler(m_AgentPreferencesService, auth));
+        }
     }
-
 }