From 3d8219f6c7faa256d6a13ab7925f75d83af95b78 Mon Sep 17 00:00:00 2001 From: MW Date: Mon, 29 Oct 2007 21:46:25 +0000 Subject: as per the "Filesystem cleanup for OpenSim repository" mailing list thread. Have flattened the OpenSim.Framework project/namespace. The problem is that the namespace is still wrong as its "OpenSim.Framework" while the directory is "OpenSim\Framework\General" , so we need to decide if we change the directory or correct the namespace. Note this has lead to a big flat project, but I think a lot of the files we most likely don't even use any longer. And others belong in other projects/namespaces anyway. --- .../Framework/Communications/Cache/AssetCache.cs | 3 +- .../Framework/Communications/Cache/AssetServer.cs | 3 +- .../Communications/Cache/AssetServerBase.cs | 32 +++++++++++----------- .../Cache/AssetTransactionManager.cs | 3 +- .../Communications/Cache/AssetTransactions.cs | 3 +- .../Communications/Cache/CachedUserInfo.cs | 2 +- .../Communications/Cache/GridAssetClient.cs | 3 +- .../Communications/Cache/InventoryFolder.cs | 3 +- .../Communications/Cache/LibraryRootFolder.cs | 3 +- .../Communications/Cache/SQLAssetServer.cs | 5 +--- .../Communications/Cache/UserProfileCache.cs | 4 +-- 11 files changed, 27 insertions(+), 37 deletions(-) (limited to 'OpenSim/Framework/Communications/Cache') diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index 1f5b336..39e2887 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs @@ -34,8 +34,7 @@ using System.Threading; using libsecondlife; using libsecondlife.Packets; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Types; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; using OpenSim.Framework.Console; namespace OpenSim.Framework.Communications.Cache diff --git a/OpenSim/Framework/Communications/Cache/AssetServer.cs b/OpenSim/Framework/Communications/Cache/AssetServer.cs index aebda00..c927571 100644 --- a/OpenSim/Framework/Communications/Cache/AssetServer.cs +++ b/OpenSim/Framework/Communications/Cache/AssetServer.cs @@ -36,8 +36,7 @@ using Nini.Config; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Console; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Types; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; namespace OpenSim.Framework.Communications.Cache { diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs index dc9c1ad..0771a20 100644 --- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs +++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs @@ -6,8 +6,7 @@ using libsecondlife; using Nini.Config; using OpenSim.Framework.Console; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Types; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; namespace OpenSim.Framework.Communications.Cache { @@ -18,18 +17,18 @@ namespace OpenSim.Framework.Communications.Cache protected Thread _localAssetServerThread; protected IAssetProvider m_assetProviderPlugin; protected object syncLock = new object(); - + protected abstract void StoreAsset(AssetBase asset); protected abstract void CommitAssets(); protected abstract void RunRequests(); - + public void LoadDefaultAssets() { MainLog.Instance.Verbose("SQL ASSET SERVER", "Setting up asset database"); - ForEachDefaultAsset(StoreAsset ); - ForEachXmlAsset(StoreAsset ); + ForEachDefaultAsset(StoreAsset); + ForEachXmlAsset(StoreAsset); CommitAssets(); } @@ -37,10 +36,11 @@ namespace OpenSim.Framework.Communications.Cache public AssetServerBase() { + OpenSim.Framework.Console.MainLog.Instance.Verbose("ASSETSERVER","Starting asset storage system"); this._assetRequests = new BlockingQueue(); - this._localAssetServerThread = new Thread( RunRequests ); + this._localAssetServerThread = new Thread(RunRequests); this._localAssetServerThread.IsBackground = true; this._localAssetServerThread.Start(); } @@ -96,13 +96,13 @@ namespace OpenSim.Framework.Communications.Cache } public virtual void Close() - { - _localAssetServerThread.Abort( ); - } + { + _localAssetServerThread.Abort(); + } public void SetServerInfo(string ServerUrl, string ServerKey) { - + } public virtual List GetDefaultAssets() @@ -149,13 +149,13 @@ namespace OpenSim.Framework.Communications.Cache if (!String.IsNullOrEmpty(filename)) { - MainLog.Instance.Verbose("ASSETS", "Loading: [{0}][{1}]", name, filename ); + MainLog.Instance.Verbose("ASSETS", "Loading: [{0}][{1}]", name, filename); LoadAsset(asset, isImage, filename); } else { - MainLog.Instance.Verbose("ASSETS", "Instantiated: [{0}]", name ); + MainLog.Instance.Verbose("ASSETS", "Instantiated: [{0}]", name); } return asset; @@ -164,7 +164,7 @@ namespace OpenSim.Framework.Communications.Cache public void ForEachXmlAsset(Action action) { List assets = new List(); - // System.Console.WriteLine("trying loading asset into database"); + // System.Console.WriteLine("trying loading asset into database"); string filePath = Path.Combine(Util.configDir(), "OpenSimAssetSet.xml"); if (File.Exists(filePath)) { @@ -172,7 +172,7 @@ namespace OpenSim.Framework.Communications.Cache for (int i = 0; i < source.Configs.Count; i++) { - // System.Console.WriteLine("loading asset into database"); + // System.Console.WriteLine("loading asset into database"); string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToStringHyphenated()); string name = source.Configs[i].GetString("name", ""); sbyte type = (sbyte)source.Configs[i].GetInt("assetType", 0); @@ -183,7 +183,7 @@ namespace OpenSim.Framework.Communications.Cache newAsset.Type = type; newAsset.InvType = invType; - assets.Add(newAsset); + assets.Add(newAsset); } } assets.ForEach(action); diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs b/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs index 2c1e5c8..d622e02 100644 --- a/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs +++ b/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs @@ -32,8 +32,7 @@ using System.Text; using System.IO; using libsecondlife; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Types; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; using OpenSim.Framework.Data; namespace OpenSim.Framework.Communications.Cache diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs index f23441d..e78f4f7 100644 --- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs +++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs @@ -34,8 +34,7 @@ using libsecondlife; using libsecondlife.Packets; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Types; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; using OpenSim.Region.Capabilities; using OpenSim.Framework.Servers; diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index 92b21a8..2d639d6 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs @@ -26,7 +26,7 @@ * */ using libsecondlife; -using OpenSim.Framework.Types; +using OpenSim.Framework; namespace OpenSim.Framework.Communications.Cache { diff --git a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs index 7483582..4904293 100644 --- a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs +++ b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs @@ -36,8 +36,7 @@ using libsecondlife; using Nini.Config; using OpenSim.Framework.Console; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Types; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; using OpenSim.Framework.Communications; namespace OpenSim.Framework.Communications.Cache diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolder.cs b/OpenSim/Framework/Communications/Cache/InventoryFolder.cs index af3346f..0905af8 100644 --- a/OpenSim/Framework/Communications/Cache/InventoryFolder.cs +++ b/OpenSim/Framework/Communications/Cache/InventoryFolder.cs @@ -32,8 +32,7 @@ using System.Text; using System.IO; using libsecondlife; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Types; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; namespace OpenSim.Framework.Communications.Cache { diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index 86e26f0..60f9b6b 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs @@ -31,8 +31,7 @@ using System.IO; using System.Collections.Generic; using System.Text; using libsecondlife; -using OpenSim.Framework.Types; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; using Nini.Config; namespace OpenSim.Framework.Communications.Cache diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs index 296c612..0953e19 100644 --- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs +++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs @@ -33,8 +33,7 @@ using libsecondlife; using Nini.Config; using OpenSim.Framework.Console; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Types; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; namespace OpenSim.Framework.Communications.Cache { @@ -42,14 +41,12 @@ namespace OpenSim.Framework.Communications.Cache { public SQLAssetServer(string pluginName) { - // _assetRequests = new BlockingQueue(); AddPlugin(pluginName); } public SQLAssetServer(IAssetProvider assetProvider) { m_assetProviderPlugin = assetProvider; - } public void AddPlugin(string FileName) diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs index bd7aeef..8105556 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs @@ -33,8 +33,8 @@ using System.IO; using libsecondlife; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Types; -using OpenSim.Framework.Utilities; +using OpenSim.Framework; + namespace OpenSim.Framework.Communications.Cache { -- cgit v1.1