From 3aa6fd0d2c199e9b8f4a62a4f30092d8d1b45d25 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Thu, 14 May 2009 11:26:14 +0000
Subject: Move the server request handlers into a separate lib nunit can digest

---
 OpenSim/Servers/User/UserServerConnector.cs | 57 -----------------------------
 OpenSim/Servers/User/UserServerMain.cs      | 49 -------------------------
 2 files changed, 106 deletions(-)
 delete mode 100644 OpenSim/Servers/User/UserServerConnector.cs
 delete mode 100644 OpenSim/Servers/User/UserServerMain.cs

(limited to 'OpenSim/Servers/User')

diff --git a/OpenSim/Servers/User/UserServerConnector.cs b/OpenSim/Servers/User/UserServerConnector.cs
deleted file mode 100644
index 15b09bc..0000000
--- a/OpenSim/Servers/User/UserServerConnector.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim 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 Nini.Config;
-using OpenSim.Servers.Base;
-using OpenSim.Services.Interfaces;
-using OpenSim.Framework.Servers.HttpServer;
-
-namespace OpenSim.Servers.UserServer
-{
-    public class UserServiceConnector
-    {
-        private IUserService m_UserService;
-
-        public UserServiceConnector(IConfigSource config, IHttpServer server)
-        {
-            IConfig serverConfig = config.Configs["UserService"];
-            if (serverConfig == null)
-                throw new Exception("No section 'Server' in config file");
-
-            string userService = serverConfig.GetString("LocalServiceModule",
-                    String.Empty);
-
-            if (userService == String.Empty)
-                throw new Exception("No UserService in config file");
-            
-            Object[] args = new Object[] { config };
-            m_UserService =
-                    ServerUtils.LoadPlugin<IUserService>(userService, args);
-        }
-    }
-}
diff --git a/OpenSim/Servers/User/UserServerMain.cs b/OpenSim/Servers/User/UserServerMain.cs
deleted file mode 100644
index 7dea5d7..0000000
--- a/OpenSim/Servers/User/UserServerMain.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim 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 OpenSim.Servers.Base;
-
-namespace OpenSim.Servers.UserServer
-{
-    public class UserServer
-    {
-        protected static HttpServerBase m_Server = null;
-
-        protected static UserServiceConnector m_UserServiceConnector;
-
-        static int Main(string[] args)
-        {
-            m_Server = new HttpServerBase("User", args);
-
-            m_UserServiceConnector = new UserServiceConnector(m_Server.Config,
-                    m_Server.HttpServer);
-
-            return m_Server.Run();
-        }
-    }
-}
-- 
cgit v1.1