From 7c6ef95f2f8a4fb06a1359e9625e80e4cb216a5d Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Mon, 29 Oct 2007 07:57:38 +0000 Subject: [PATCH] normalized line endings --- .../Communications/Cache/GridAssetClient.cs | 320 +++++++++--------- OpenSim/Grid/AssetServer/RestService.cs | 218 ++++++------ .../Environment/Interfaces/IAvatarFactory.cs | 26 +- .../Modules/AvatarFactoryModule.cs | 114 +++---- 4 files changed, 339 insertions(+), 339 deletions(-) diff --git a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs index fc7743112f..7483582126 100644 --- a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs +++ b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs @@ -1,160 +1,160 @@ -/* -* Copyright (c) Contributors, http://www.openmetaverse.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 System.IO; -using System.Threading; -using System.Reflection; -using System.Xml.Serialization; - -using libsecondlife; - -using Nini.Config; -using OpenSim.Framework.Console; -using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Types; -using OpenSim.Framework.Utilities; -using OpenSim.Framework.Communications; - -namespace OpenSim.Framework.Communications.Cache -{ - public class GridAssetClient : IAssetServer - { - private string _assetServerUrl; - private IAssetReceiver _receiver; - - public GridAssetClient(string serverUrl) - { - _assetServerUrl = serverUrl; - } - - #region IAssetServer Members - - public void SetReceiver(IAssetReceiver receiver) - { - _receiver = receiver; - } - - public void FetchAsset(LLUUID assetID, bool isTexture) - { - Stream s = null; - try - { - - MainLog.Instance.Debug("ASSETCACHE", "Querying for {0}", assetID.ToString()); - - RestClient rc = new RestClient(_assetServerUrl); - rc.AddResourcePath("assets"); - rc.AddResourcePath(assetID.ToString()); - if (isTexture) - rc.AddQueryParameter("texture"); - - rc.RequestMethod = "GET"; - s = rc.Request(); - - if (s.Length > 0) - { - XmlSerializer xs = new XmlSerializer(typeof(AssetBase)); - AssetBase asset = (AssetBase)xs.Deserialize(s); - - _receiver.AssetReceived(asset, isTexture); - } - else - { - MainLog.Instance.Debug("ASSETCACHE", "Asset not found {0}", assetID.ToString()); - _receiver.AssetNotFound(assetID); - } - } - catch (Exception e) - { - MainLog.Instance.Error("ASSETCACHE", e.Message); - MainLog.Instance.Error("ASSETCACHE", e.StackTrace); - } - } - - public void UpdateAsset(AssetBase asset) - { - throw new Exception("The method or operation is not implemented."); - } - - public void StoreAndCommitAsset(AssetBase asset) - { - try - { - MemoryStream s = new MemoryStream(); - - XmlSerializer xs = new XmlSerializer(typeof(AssetBase)); - xs.Serialize(s, asset); - RestClient rc = new RestClient(_assetServerUrl); - rc.AddResourcePath("assets"); - rc.RequestMethod = "POST"; - rc.Request(s); - } - catch (Exception e) - { - MainLog.Instance.Error("ASSETS", e.Message); - } - } - - public void Close() - { - throw new Exception("The method or operation is not implemented."); - } - - public void LoadAsset(AssetBase info, bool image, string filename) - { - throw new Exception("The method or operation is not implemented."); - } - - public System.Collections.Generic.List GetDefaultAssets() - { - throw new Exception("The method or operation is not implemented."); - } - - public AssetBase CreateImageAsset(string assetIdStr, string name, string filename) - { - throw new Exception("The method or operation is not implemented."); - } - - public void ForEachDefaultAsset(Action action) - { - throw new Exception("The method or operation is not implemented."); - } - - public AssetBase CreateAsset(string assetIdStr, string name, string filename, bool isImage) - { - throw new Exception("The method or operation is not implemented."); - } - - public void ForEachXmlAsset(Action action) - { - throw new Exception("The method or operation is not implemented."); - } - - #endregion - } -} +/* +* Copyright (c) Contributors, http://www.openmetaverse.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 System.IO; +using System.Threading; +using System.Reflection; +using System.Xml.Serialization; + +using libsecondlife; + +using Nini.Config; +using OpenSim.Framework.Console; +using OpenSim.Framework.Interfaces; +using OpenSim.Framework.Types; +using OpenSim.Framework.Utilities; +using OpenSim.Framework.Communications; + +namespace OpenSim.Framework.Communications.Cache +{ + public class GridAssetClient : IAssetServer + { + private string _assetServerUrl; + private IAssetReceiver _receiver; + + public GridAssetClient(string serverUrl) + { + _assetServerUrl = serverUrl; + } + + #region IAssetServer Members + + public void SetReceiver(IAssetReceiver receiver) + { + _receiver = receiver; + } + + public void FetchAsset(LLUUID assetID, bool isTexture) + { + Stream s = null; + try + { + + MainLog.Instance.Debug("ASSETCACHE", "Querying for {0}", assetID.ToString()); + + RestClient rc = new RestClient(_assetServerUrl); + rc.AddResourcePath("assets"); + rc.AddResourcePath(assetID.ToString()); + if (isTexture) + rc.AddQueryParameter("texture"); + + rc.RequestMethod = "GET"; + s = rc.Request(); + + if (s.Length > 0) + { + XmlSerializer xs = new XmlSerializer(typeof(AssetBase)); + AssetBase asset = (AssetBase)xs.Deserialize(s); + + _receiver.AssetReceived(asset, isTexture); + } + else + { + MainLog.Instance.Debug("ASSETCACHE", "Asset not found {0}", assetID.ToString()); + _receiver.AssetNotFound(assetID); + } + } + catch (Exception e) + { + MainLog.Instance.Error("ASSETCACHE", e.Message); + MainLog.Instance.Error("ASSETCACHE", e.StackTrace); + } + } + + public void UpdateAsset(AssetBase asset) + { + throw new Exception("The method or operation is not implemented."); + } + + public void StoreAndCommitAsset(AssetBase asset) + { + try + { + MemoryStream s = new MemoryStream(); + + XmlSerializer xs = new XmlSerializer(typeof(AssetBase)); + xs.Serialize(s, asset); + RestClient rc = new RestClient(_assetServerUrl); + rc.AddResourcePath("assets"); + rc.RequestMethod = "POST"; + rc.Request(s); + } + catch (Exception e) + { + MainLog.Instance.Error("ASSETS", e.Message); + } + } + + public void Close() + { + throw new Exception("The method or operation is not implemented."); + } + + public void LoadAsset(AssetBase info, bool image, string filename) + { + throw new Exception("The method or operation is not implemented."); + } + + public System.Collections.Generic.List GetDefaultAssets() + { + throw new Exception("The method or operation is not implemented."); + } + + public AssetBase CreateImageAsset(string assetIdStr, string name, string filename) + { + throw new Exception("The method or operation is not implemented."); + } + + public void ForEachDefaultAsset(Action action) + { + throw new Exception("The method or operation is not implemented."); + } + + public AssetBase CreateAsset(string assetIdStr, string name, string filename, bool isImage) + { + throw new Exception("The method or operation is not implemented."); + } + + public void ForEachXmlAsset(Action action) + { + throw new Exception("The method or operation is not implemented."); + } + + #endregion + } +} diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs index 88a1668ea2..e4f770d24e 100644 --- a/OpenSim/Grid/AssetServer/RestService.cs +++ b/OpenSim/Grid/AssetServer/RestService.cs @@ -1,109 +1,109 @@ -using System; -using System.IO; -using System.Xml; -using System.Xml.Serialization; -using System.Text; - -using libsecondlife; -using OpenSim.Framework.Types; -using OpenSim.Framework.Servers; -using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Console; - -namespace OpenSim.Grid.AssetServer -{ - public class GetAssetStreamHandler : BaseStreamHandler - { - OpenAsset_Main m_assetManager; - IAssetProvider m_assetProvider; - - override public byte[] Handle(string path, Stream request) - { - string param = GetParam(path); - byte[] result = new byte[] { }; - try { - - string[] p = param.Split(new char[] { '/', '?', '&' }, StringSplitOptions.RemoveEmptyEntries); - - if (p.Length > 0) - { - LLUUID assetID; - bool isTexture = false; - LLUUID.TryParse(p[0], out assetID); - if (p.Length > 1) - { - if (string.Compare(p[1], "texture", true) == 0) - isTexture = true; - } - - - AssetBase asset = m_assetProvider.FetchAsset(assetID); - if (asset != null) - { - MainLog.Instance.Debug("REST", "GET:/asset found {0}, {1}", assetID, asset.Name); - - XmlSerializer xs = new XmlSerializer(typeof(AssetBase)); - MemoryStream ms = new MemoryStream(); - XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8); - xw.Formatting = Formatting.Indented; - xs.Serialize(xw, asset); - xw.Flush(); - - ms.Seek(0, SeekOrigin.Begin); - StreamReader sr = new StreamReader(ms); - - result = ms.GetBuffer(); - Array.Resize(ref result, (int)ms.Length); - } - else - { - MainLog.Instance.Verbose("REST", "GET:/asset failed to find {0}", assetID); - } - } - } - catch (Exception e) - { - MainLog.Instance.Error(e.ToString()); - } - return result; - } - - public GetAssetStreamHandler(OpenAsset_Main assetManager, IAssetProvider assetProvider) - : base("GET", "/assets" ) - { - m_assetManager = assetManager; - m_assetProvider = assetProvider; - } - } - - public class PostAssetStreamHandler : BaseStreamHandler - { - OpenAsset_Main m_assetManager; - IAssetProvider m_assetProvider; - - override public byte[] Handle(string path, Stream request) - { - string param = GetParam(path); - - LLUUID assetId; - if(param.Length > 0) - LLUUID.TryParse(param, out assetId); - byte[] txBuffer = new byte[4096]; - - XmlSerializer xs = new XmlSerializer(typeof(AssetBase)); - AssetBase asset = (AssetBase)xs.Deserialize(request); - - MainLog.Instance.Verbose("REST", "StoreAndCommitAsset {0}", asset.FullID); - m_assetProvider.CreateAsset(asset); - - return new byte[] { }; - } - - public PostAssetStreamHandler(OpenAsset_Main assetManager, IAssetProvider assetProvider) - : base("POST", "/assets") - { - m_assetManager = assetManager; - m_assetProvider = assetProvider; - } - } -} +using System; +using System.IO; +using System.Xml; +using System.Xml.Serialization; +using System.Text; + +using libsecondlife; +using OpenSim.Framework.Types; +using OpenSim.Framework.Servers; +using OpenSim.Framework.Interfaces; +using OpenSim.Framework.Console; + +namespace OpenSim.Grid.AssetServer +{ + public class GetAssetStreamHandler : BaseStreamHandler + { + OpenAsset_Main m_assetManager; + IAssetProvider m_assetProvider; + + override public byte[] Handle(string path, Stream request) + { + string param = GetParam(path); + byte[] result = new byte[] { }; + try { + + string[] p = param.Split(new char[] { '/', '?', '&' }, StringSplitOptions.RemoveEmptyEntries); + + if (p.Length > 0) + { + LLUUID assetID; + bool isTexture = false; + LLUUID.TryParse(p[0], out assetID); + if (p.Length > 1) + { + if (string.Compare(p[1], "texture", true) == 0) + isTexture = true; + } + + + AssetBase asset = m_assetProvider.FetchAsset(assetID); + if (asset != null) + { + MainLog.Instance.Debug("REST", "GET:/asset found {0}, {1}", assetID, asset.Name); + + XmlSerializer xs = new XmlSerializer(typeof(AssetBase)); + MemoryStream ms = new MemoryStream(); + XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8); + xw.Formatting = Formatting.Indented; + xs.Serialize(xw, asset); + xw.Flush(); + + ms.Seek(0, SeekOrigin.Begin); + StreamReader sr = new StreamReader(ms); + + result = ms.GetBuffer(); + Array.Resize(ref result, (int)ms.Length); + } + else + { + MainLog.Instance.Verbose("REST", "GET:/asset failed to find {0}", assetID); + } + } + } + catch (Exception e) + { + MainLog.Instance.Error(e.ToString()); + } + return result; + } + + public GetAssetStreamHandler(OpenAsset_Main assetManager, IAssetProvider assetProvider) + : base("GET", "/assets" ) + { + m_assetManager = assetManager; + m_assetProvider = assetProvider; + } + } + + public class PostAssetStreamHandler : BaseStreamHandler + { + OpenAsset_Main m_assetManager; + IAssetProvider m_assetProvider; + + override public byte[] Handle(string path, Stream request) + { + string param = GetParam(path); + + LLUUID assetId; + if(param.Length > 0) + LLUUID.TryParse(param, out assetId); + byte[] txBuffer = new byte[4096]; + + XmlSerializer xs = new XmlSerializer(typeof(AssetBase)); + AssetBase asset = (AssetBase)xs.Deserialize(request); + + MainLog.Instance.Verbose("REST", "StoreAndCommitAsset {0}", asset.FullID); + m_assetProvider.CreateAsset(asset); + + return new byte[] { }; + } + + public PostAssetStreamHandler(OpenAsset_Main assetManager, IAssetProvider assetProvider) + : base("POST", "/assets") + { + m_assetManager = assetManager; + m_assetProvider = assetProvider; + } + } +} diff --git a/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs b/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs index b6f24c3b40..28a5b4ff65 100644 --- a/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs +++ b/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs @@ -1,13 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Text; -using libsecondlife; -using OpenSim.Framework.Types; - -namespace OpenSim.Region.Environment.Interfaces -{ - public interface IAvatarFactory : IRegionModule - { - bool TryGetIntialAvatarAppearance(LLUUID avatarId, out AvatarWearable[] wearables, out byte[] visualParams); - } -} +using System; +using System.Collections.Generic; +using System.Text; +using libsecondlife; +using OpenSim.Framework.Types; + +namespace OpenSim.Region.Environment.Interfaces +{ + public interface IAvatarFactory : IRegionModule + { + bool TryGetIntialAvatarAppearance(LLUUID avatarId, out AvatarWearable[] wearables, out byte[] visualParams); + } +} diff --git a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs index f825b7acba..cb8c758177 100644 --- a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs +++ b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs @@ -1,57 +1,57 @@ -using System; -using System.Collections.Generic; -using System.Text; -using libsecondlife; -using Nini.Config; -using OpenSim.Framework.Types; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; - -namespace OpenSim.Region.Environment.Modules -{ - public class AvatarFactoryModule : IAvatarFactory - { - public bool TryGetIntialAvatarAppearance(LLUUID avatarId, out AvatarWearable[] wearables, out byte[] visualParams) - { - GetDefaultAvatarAppearance(out wearables, out visualParams); - return true; - } - - public void Initialise(Scene scene, IConfigSource source) - { - scene.RegisterModuleInterface(this); - } - - public void PostInitialise() - { - } - - public void Close() - { - } - - public string Name - { - get { return "Default Avatar Factory"; } - } - - public bool IsSharedModule - { - get { return true; } - } - - public static void GetDefaultAvatarAppearance(out AvatarWearable[] wearables, out byte[] visualParams) - { - visualParams = new byte[218]; - for (int i = 0; i < 218; i++) - { - visualParams[i] = 100; - } - - wearables = AvatarWearable.DefaultWearables; - } - } - - - -} +using System; +using System.Collections.Generic; +using System.Text; +using libsecondlife; +using Nini.Config; +using OpenSim.Framework.Types; +using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Environment.Scenes; + +namespace OpenSim.Region.Environment.Modules +{ + public class AvatarFactoryModule : IAvatarFactory + { + public bool TryGetIntialAvatarAppearance(LLUUID avatarId, out AvatarWearable[] wearables, out byte[] visualParams) + { + GetDefaultAvatarAppearance(out wearables, out visualParams); + return true; + } + + public void Initialise(Scene scene, IConfigSource source) + { + scene.RegisterModuleInterface(this); + } + + public void PostInitialise() + { + } + + public void Close() + { + } + + public string Name + { + get { return "Default Avatar Factory"; } + } + + public bool IsSharedModule + { + get { return true; } + } + + public static void GetDefaultAvatarAppearance(out AvatarWearable[] wearables, out byte[] visualParams) + { + visualParams = new byte[218]; + for (int i = 0; i < 218; i++) + { + visualParams[i] = 100; + } + + wearables = AvatarWearable.DefaultWearables; + } + } + + + +}