diff --git a/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs b/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs index 0c5832d4f7..6745bacefe 100644 --- a/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs +++ b/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs @@ -1,26 +1,26 @@ -using System; -using System.Collections.Generic; -using System.Text; -using NUnit.Framework; - -namespace OpenSim.Framework.Servers.Tests -{ - [TestFixture] - public class VersionInfoTests - { - [Test] - public void TestVersionLength() - { - Assert.AreEqual(VersionInfo.VERSIONINFO_VERSION_LENGTH, VersionInfo.Version.Length," VersionInfo.Version string not " + VersionInfo.VERSIONINFO_VERSION_LENGTH + " chars." ); - } - - [Test] - public void TestGetVersionStringLength() - { - foreach (VersionInfo.Flavour flavour in Enum.GetValues(typeof(VersionInfo.Flavour))) - { - Assert.AreEqual(VersionInfo.VERSIONINFO_VERSION_LENGTH, VersionInfo.GetVersionString("0.0.0", flavour).Length, "0.0.0/" + flavour + " failed"); - } - } - } -} +using System; +using System.Collections.Generic; +using System.Text; +using NUnit.Framework; + +namespace OpenSim.Framework.Servers.Tests +{ + [TestFixture] + public class VersionInfoTests + { + [Test] + public void TestVersionLength() + { + Assert.AreEqual(VersionInfo.VERSIONINFO_VERSION_LENGTH, VersionInfo.Version.Length," VersionInfo.Version string not " + VersionInfo.VERSIONINFO_VERSION_LENGTH + " chars." ); + } + + [Test] + public void TestGetVersionStringLength() + { + foreach (VersionInfo.Flavour flavour in Enum.GetValues(typeof(VersionInfo.Flavour))) + { + Assert.AreEqual(VersionInfo.VERSIONINFO_VERSION_LENGTH, VersionInfo.GetVersionString("0.0.0", flavour).Length, "0.0.0/" + flavour + " failed"); + } + } + } +} diff --git a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs index f0a43b06e5..df65226508 100644 --- a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs @@ -1,126 +1,126 @@ -/* - * 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 log4net; -using System; -using System.IO; -using System.Collections.Generic; -using System.Reflection; -using GlynnTucker.Cache; -using Nini.Config; -using OpenSim.Framework; -using OpenSim.Region.Framework.Interfaces; -using OpenSim.Region.Framework.Scenes; -using OpenSim.Services.Interfaces; - -namespace OpenSim.Region.CoreModules.Asset -{ - public class GlynnTuckerAssetCache : ISharedRegionModule, IImprovedAssetCache - { - private static readonly ILog m_log = - LogManager.GetLogger( - MethodBase.GetCurrentMethod().DeclaringType); - - private bool m_Enabled = false; - private ICache m_Cache = new GlynnTucker.Cache.SimpleMemoryCache(); - - public string Name - { - get { return "GlynnTuckerAssetCache"; } - } - - public void Initialise(IConfigSource source) - { - IConfig moduleConfig = source.Configs["Modules"]; - - if (moduleConfig != null) - { - string name = moduleConfig.GetString("AssetCaching", "GlynnTuckerAssetCache"); - m_log.DebugFormat("[XXX] name = {0} (this module's name: {1}", name, Name); - - if (name == Name) - { - m_Enabled = true; - - m_log.Info("[ASSET CACHE]: GlynnTucker asset cache enabled"); - - } - } - } - - public void PostInitialise() - { - } - - public void Close() - { - } - - public void AddRegion(Scene scene) - { - if (m_Enabled) - scene.RegisterModuleInterface(this); - } - - public void RemoveRegion(Scene scene) - { - } - - public void RegionLoaded(Scene scene) - { - } - - //////////////////////////////////////////////////////////// - // IImprovedAssetCache - // - - public void Cache(AssetBase asset) - { - if (asset != null) - m_Cache.AddOrUpdate(asset.ID, asset); - } - - public AssetBase Get(string id) - { - Object asset = null; - m_Cache.TryGet(id, out asset); - return (AssetBase)asset; - } - - public void Expire(string id) - { - Object asset = null; - if (m_Cache.TryGet(id, out asset)) - m_Cache.Remove(id); - } - - public void Clear() - { - m_Cache.Clear(); - } - } -} +/* + * 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 log4net; +using System; +using System.IO; +using System.Collections.Generic; +using System.Reflection; +using GlynnTucker.Cache; +using Nini.Config; +using OpenSim.Framework; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; +using OpenSim.Services.Interfaces; + +namespace OpenSim.Region.CoreModules.Asset +{ + public class GlynnTuckerAssetCache : ISharedRegionModule, IImprovedAssetCache + { + private static readonly ILog m_log = + LogManager.GetLogger( + MethodBase.GetCurrentMethod().DeclaringType); + + private bool m_Enabled = false; + private ICache m_Cache = new GlynnTucker.Cache.SimpleMemoryCache(); + + public string Name + { + get { return "GlynnTuckerAssetCache"; } + } + + public void Initialise(IConfigSource source) + { + IConfig moduleConfig = source.Configs["Modules"]; + + if (moduleConfig != null) + { + string name = moduleConfig.GetString("AssetCaching", "GlynnTuckerAssetCache"); + m_log.DebugFormat("[XXX] name = {0} (this module's name: {1}", name, Name); + + if (name == Name) + { + m_Enabled = true; + + m_log.Info("[ASSET CACHE]: GlynnTucker asset cache enabled"); + + } + } + } + + public void PostInitialise() + { + } + + public void Close() + { + } + + public void AddRegion(Scene scene) + { + if (m_Enabled) + scene.RegisterModuleInterface(this); + } + + public void RemoveRegion(Scene scene) + { + } + + public void RegionLoaded(Scene scene) + { + } + + //////////////////////////////////////////////////////////// + // IImprovedAssetCache + // + + public void Cache(AssetBase asset) + { + if (asset != null) + m_Cache.AddOrUpdate(asset.ID, asset); + } + + public AssetBase Get(string id) + { + Object asset = null; + m_Cache.TryGet(id, out asset); + return (AssetBase)asset; + } + + public void Expire(string id) + { + Object asset = null; + if (m_Cache.TryGet(id, out asset)) + m_Cache.Remove(id); + } + + public void Clear() + { + m_Cache.Clear(); + } + } +} diff --git a/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs b/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs index 363697266a..d79192e9b5 100644 --- a/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs +++ b/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs @@ -1,103 +1,103 @@ -using NUnit.Framework; -using OpenSim.Framework; -using OpenSim.Framework.Servers.HttpServer; -using OpenSim.Server.Handlers.Asset; -using OpenSim.Services.Interfaces; -using OpenSim.Tests.Common; -using OpenSim.Tests.Common.Mock; -using OpenSim.Tests.Common.Setup; - -namespace OpenSim.Server.Handlers.Tests.Asset -{ - [TestFixture] - public class AssetServerGetHandlerTests - { - private const string ASSETS_PATH = "/assets"; - - [Test] - public void TestConstructor() - { - TestHelper.InMethod(); - - AssetServerGetHandler handler = new AssetServerGetHandler( null ); - } - - [Test] - public void TestGetParams() - { - TestHelper.InMethod(); - - AssetServerGetHandler handler = new AssetServerGetHandler(null); - BaseRequestHandlerTestHelper.BaseTestGetParams(handler, ASSETS_PATH); - } - - [Test] - public void TestSplitParams() - { - TestHelper.InMethod(); - - AssetServerGetHandler handler = new AssetServerGetHandler(null); - BaseRequestHandlerTestHelper.BaseTestSplitParams(handler, ASSETS_PATH); - } - - //[Test] - //public void TestHandleNoParams() - //{ - // TestHelper.InMethod(); - - // AssetServerGetHandler handler = new AssetServerGetHandler(null); - - // BaseRequestHandlerTestHelper.BaseTestHandleNoParams(handler, ASSETS_PATH); - //} - - //[Test] - //public void TestHandleMalformedGuid() - //{ - // TestHelper.InMethod(); - - // AssetServerGetHandler handler = new AssetServerGetHandler(null); - - // BaseRequestHandlerTestHelper.BaseTestHandleMalformedGuid(handler, ASSETS_PATH); - //} - - //[Test] - //public void TestHandleFetchMissingAsset() - //{ - // IAssetService assetDataPlugin = new TestAssetDataPlugin(); - // AssetServerGetHandler handler = new AssetServerGetHandler(assetDataPlugin); - - // GetAssetStreamHandlerTestHelpers.BaseFetchMissingAsset(handler); - //} - - //[Test] - //public void TestHandleFetchExistingAssetData() - //{ - // AssetServerGetHandler handler; - // OSHttpResponse response; - // AssetBase asset = CreateTestEnvironment(out handler, out response); - - // GetAssetStreamHandlerTestHelpers.BaseFetchExistingAssetDataTest(asset, handler, response); - //} - - //[Test] - //public void TestHandleFetchExistingAssetXml() - //{ - // AssetServerGetHandler handler; - // OSHttpResponse response; - // AssetBase asset = CreateTestEnvironment(out handler, out response); - - // GetAssetStreamHandlerTestHelpers.BaseFetchExistingAssetXmlTest(asset, handler, response); - //} - - private static AssetBase CreateTestEnvironment(out AssetServerGetHandler handler, out OSHttpResponse response) - { - AssetBase asset = GetAssetStreamHandlerTestHelpers.CreateCommonTestResources(out response); - - IAssetService assetDataPlugin = new TestAssetService(); - handler = new AssetServerGetHandler(assetDataPlugin); - - assetDataPlugin.Store(asset); - return asset; - } - } +using NUnit.Framework; +using OpenSim.Framework; +using OpenSim.Framework.Servers.HttpServer; +using OpenSim.Server.Handlers.Asset; +using OpenSim.Services.Interfaces; +using OpenSim.Tests.Common; +using OpenSim.Tests.Common.Mock; +using OpenSim.Tests.Common.Setup; + +namespace OpenSim.Server.Handlers.Tests.Asset +{ + [TestFixture] + public class AssetServerGetHandlerTests + { + private const string ASSETS_PATH = "/assets"; + + [Test] + public void TestConstructor() + { + TestHelper.InMethod(); + + AssetServerGetHandler handler = new AssetServerGetHandler( null ); + } + + [Test] + public void TestGetParams() + { + TestHelper.InMethod(); + + AssetServerGetHandler handler = new AssetServerGetHandler(null); + BaseRequestHandlerTestHelper.BaseTestGetParams(handler, ASSETS_PATH); + } + + [Test] + public void TestSplitParams() + { + TestHelper.InMethod(); + + AssetServerGetHandler handler = new AssetServerGetHandler(null); + BaseRequestHandlerTestHelper.BaseTestSplitParams(handler, ASSETS_PATH); + } + + //[Test] + //public void TestHandleNoParams() + //{ + // TestHelper.InMethod(); + + // AssetServerGetHandler handler = new AssetServerGetHandler(null); + + // BaseRequestHandlerTestHelper.BaseTestHandleNoParams(handler, ASSETS_PATH); + //} + + //[Test] + //public void TestHandleMalformedGuid() + //{ + // TestHelper.InMethod(); + + // AssetServerGetHandler handler = new AssetServerGetHandler(null); + + // BaseRequestHandlerTestHelper.BaseTestHandleMalformedGuid(handler, ASSETS_PATH); + //} + + //[Test] + //public void TestHandleFetchMissingAsset() + //{ + // IAssetService assetDataPlugin = new TestAssetDataPlugin(); + // AssetServerGetHandler handler = new AssetServerGetHandler(assetDataPlugin); + + // GetAssetStreamHandlerTestHelpers.BaseFetchMissingAsset(handler); + //} + + //[Test] + //public void TestHandleFetchExistingAssetData() + //{ + // AssetServerGetHandler handler; + // OSHttpResponse response; + // AssetBase asset = CreateTestEnvironment(out handler, out response); + + // GetAssetStreamHandlerTestHelpers.BaseFetchExistingAssetDataTest(asset, handler, response); + //} + + //[Test] + //public void TestHandleFetchExistingAssetXml() + //{ + // AssetServerGetHandler handler; + // OSHttpResponse response; + // AssetBase asset = CreateTestEnvironment(out handler, out response); + + // GetAssetStreamHandlerTestHelpers.BaseFetchExistingAssetXmlTest(asset, handler, response); + //} + + private static AssetBase CreateTestEnvironment(out AssetServerGetHandler handler, out OSHttpResponse response) + { + AssetBase asset = GetAssetStreamHandlerTestHelpers.CreateCommonTestResources(out response); + + IAssetService assetDataPlugin = new TestAssetService(); + handler = new AssetServerGetHandler(assetDataPlugin); + + assetDataPlugin.Store(asset); + return asset; + } + } } \ No newline at end of file diff --git a/OpenSim/SimulatorServices/SimulationService.cs b/OpenSim/SimulatorServices/SimulationService.cs index bca51b356f..a28e72fe8b 100644 --- a/OpenSim/SimulatorServices/SimulationService.cs +++ b/OpenSim/SimulatorServices/SimulationService.cs @@ -1,85 +1,85 @@ -using System; -using System.Reflection; -using System.Collections.Generic; -using log4net; -using Nini.Config; -using OpenSim.Framework; -using OpenSim.Framework.Servers.HttpServer; -using OpenSim.Region.Framework.Scenes; -using OpenSim.Region.Framework.Interfaces; -using OpenSim.Server.Base; -using OpenSim.Server.Handlers.Base; - - -namespace OpenSim.SimulatorServices -{ - public class SimulationService : ISharedRegionModule - { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - private static bool m_Enabled = false; - - private IConfigSource m_Config; - bool m_Registered = false; - - #region IRegionModule interface - - public void Initialise(IConfigSource config) - { - m_Config = config; - - IConfig moduleConfig = config.Configs["Modules"]; - if (moduleConfig != null) - { - string name = moduleConfig.GetString("SimulationService", ""); - if (name == Name) - { - m_Enabled = true; - m_log.Info("[SIM SERVICE]: SimulationService enabled"); - - } - } - - } - - public void PostInitialise() - { - } - - public void Close() - { - } - - public string Name - { - get { return "SimulationService"; } - } - - public void AddRegion(Scene scene) - { - if (!m_Enabled) - return; - - if (!m_Registered) - { - m_Registered = true; - - m_log.Info("[SIM SERVICE]: Starting..."); - - Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer, scene }; - - ServerUtils.LoadPlugin("OpenSim.Server.Handlers.dll:SimulationServiceInConnector", args); - } - } - - public void RemoveRegion(Scene scene) - { - } - - public void RegionLoaded(Scene scene) - { - } - - #endregion - - } -} +using System; +using System.Reflection; +using System.Collections.Generic; +using log4net; +using Nini.Config; +using OpenSim.Framework; +using OpenSim.Framework.Servers.HttpServer; +using OpenSim.Region.Framework.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Server.Base; +using OpenSim.Server.Handlers.Base; + + +namespace OpenSim.SimulatorServices +{ + public class SimulationService : ISharedRegionModule + { + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + private static bool m_Enabled = false; + + private IConfigSource m_Config; + bool m_Registered = false; + + #region IRegionModule interface + + public void Initialise(IConfigSource config) + { + m_Config = config; + + IConfig moduleConfig = config.Configs["Modules"]; + if (moduleConfig != null) + { + string name = moduleConfig.GetString("SimulationService", ""); + if (name == Name) + { + m_Enabled = true; + m_log.Info("[SIM SERVICE]: SimulationService enabled"); + + } + } + + } + + public void PostInitialise() + { + } + + public void Close() + { + } + + public string Name + { + get { return "SimulationService"; } + } + + public void AddRegion(Scene scene) + { + if (!m_Enabled) + return; + + if (!m_Registered) + { + m_Registered = true; + + m_log.Info("[SIM SERVICE]: Starting..."); + + Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer, scene }; + + ServerUtils.LoadPlugin("OpenSim.Server.Handlers.dll:SimulationServiceInConnector", args); + } + } + + public void RemoveRegion(Scene scene) + { + } + + public void RegionLoaded(Scene scene) + { + } + + #endregion + + } +}