From 6779abf7f59e518b0cd18e52dd91a500049dfda6 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 17 Sep 2009 23:39:58 +0100
Subject: Remove The legacy inventory and asset servers. Bump interface version
to 6
---
OpenSim/Grid/AssetServer/Main.cs | 146 ---------------------
.../Grid/AssetServer/Properties/AssemblyInfo.cs | 63 ---------
2 files changed, 209 deletions(-)
delete mode 100644 OpenSim/Grid/AssetServer/Main.cs
delete mode 100644 OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
(limited to 'OpenSim/Grid/AssetServer')
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
deleted file mode 100644
index ac8f888..0000000
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ /dev/null
@@ -1,146 +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 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.IO;
-using System.Reflection;
-using log4net;
-using log4net.Config;
-using OpenMetaverse;
-using OpenSim.Data;
-using OpenSim.Framework;
-using OpenSim.Framework.AssetLoader.Filesystem;
-using OpenSim.Framework.Console;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Framework.Statistics;
-
-namespace OpenSim.Grid.AssetServer
-{
- ///
- /// An asset server
- ///
- public class OpenAsset_Main : BaseOpenSimServer
- {
- private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
- public static OpenAsset_Main assetserver;
-
- // Temporarily hardcoded - should be a plugin
- protected IAssetLoader assetLoader = new AssetLoaderFileSystem();
-
- private IAssetDataPlugin m_assetProvider;
-
- public static void Main(string[] args)
- {
- XmlConfigurator.Configure();
-
- assetserver = new OpenAsset_Main();
- assetserver.Startup();
-
- assetserver.Work();
- }
-
- private void Work()
- {
- m_console.Output("Enter help for a list of commands");
-
- while (true)
- {
- m_console.Prompt();
- }
- }
-
- public OpenAsset_Main()
- {
- m_console = new LocalConsole("Asset");
-
- MainConsole.Instance = m_console;
- }
-
- protected override void StartupSpecific()
- {
- AssetConfig config = new AssetConfig("ASSET SERVER", (Path.Combine(Util.configDir(), "AssetServer_Config.xml")));
-
- m_log.Info("[ASSET]: Setting up asset DB");
- setupDB(config);
-
- m_log.Info("[ASSET]: Loading default asset set from '" + config.AssetSetsLocation + "'");
- LoadDefaultAssets(config.AssetSetsLocation);
-
- m_log.Info("[ASSET]: Starting HTTP process");
- m_httpServer = new BaseHttpServer(config.HttpPort);
-
- m_stats = StatsManager.StartCollectingAssetStats();
-
- AddHttpHandlers();
-
- m_httpServer.Start();
-
- base.StartupSpecific();
- }
-
- protected void AddHttpHandlers()
- {
- m_httpServer.AddStreamHandler(new GetAssetStreamHandler(m_assetProvider));
- m_httpServer.AddStreamHandler(new PostAssetStreamHandler(m_assetProvider));
- }
-
- public byte[] GetAssetData(UUID assetID, bool isTexture)
- {
- return null;
- }
-
- public void setupDB(AssetConfig config)
- {
- try
- {
- m_assetProvider = DataPluginFactory.LoadDataPlugin(config.DatabaseProvider, config.DatabaseConnect);
- if (m_assetProvider == null)
- {
- m_log.Error("[ASSET]: Failed to load a database plugin, server halting");
- Environment.Exit(-1);
- }
- }
- catch (Exception e)
- {
- m_log.Warn("[ASSET]: setupDB() - Exception occured");
- m_log.Warn("[ASSET]: " + e.ToString());
- }
- }
-
- public void LoadDefaultAssets(string pAssetSetsLocation)
- {
- assetLoader.ForEachDefaultXmlAsset(pAssetSetsLocation, StoreAsset);
- }
-
- protected void StoreAsset(AssetBase asset)
- {
- m_assetProvider.StoreAsset(asset);
- }
- }
-}
diff --git a/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
deleted file mode 100644
index 5d67e3f..0000000
--- a/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,63 +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 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.Reflection;
-using System.Runtime.InteropServices;
-
-// General information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-
-[assembly : AssemblyTitle("OGS-AssetServer")]
-[assembly : AssemblyDescription("")]
-[assembly : AssemblyConfiguration("")]
-[assembly : AssemblyCompany("http://opensimulator.org")]
-[assembly : AssemblyProduct("OGS-AssetServer")]
-[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2009")]
-[assembly : AssemblyTrademark("")]
-[assembly : AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly : ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-
-[assembly : Guid("b541b244-3d1d-4625-9003-bc2a3a6a39a4")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-
-[assembly : AssemblyVersion("0.6.5.*")]
-[assembly : AssemblyFileVersion("0.6.5.0")]
--
cgit v1.1