OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Very early first implementation of grid based assets. 

Run this on a major grid, and weep
afrisby
Tleiades Hax 2007-10-26 11:46:27 +00:00
parent acde4910b4
commit 5e7dba7268
12 changed files with 643 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Framework/Communications/Cache/AssetCache.cs
View File

@ -36,6 +36,7 @@ using libsecondlife.Packets;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types; using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities; using OpenSim.Framework.Utilities;
using OpenSim.Framework.Console;
namespace OpenSim.Framework.Communications.Cache namespace OpenSim.Framework.Communications.Cache
{ {
@ -319,17 +320,19 @@ namespace OpenSim.Framework.Communications.Cache
public void AssetNotFound(LLUUID assetID) public void AssetNotFound(LLUUID assetID)
{ {
/*
if (this.RequestedTextures.ContainsKey(assetID)) if (this.RequestedTextures.ContainsKey(assetID))
{ {
MainLog.Instance.Warn("ASSET CACHE", "sending image not found for {0}", assetID);
AssetRequest req = this.RequestedTextures[assetID]; AssetRequest req = this.RequestedTextures[assetID];
ImageNotInDatabasePacket notFound = new ImageNotInDatabasePacket(); ImageNotInDatabasePacket notFound = new ImageNotInDatabasePacket();
notFound.ImageID.ID = assetID; notFound.ImageID.ID = assetID;
req.RequestUser.OutPacket(notFound); req.RequestUser.OutPacket(notFound);
//Console.WriteLine("sending image not found for " + assetID);
this.RequestedTextures.Remove(assetID); this.RequestedTextures.Remove(assetID);
}*/ }
else
{
MainLog.Instance.Error("ASSET CACHE", "Cound not send image not found for {0}", assetID);
}
} }
#region Assets #region Assets

32
OpenSim/Framework/Communications/Cache/AssetServerBase.cs
View File

@ -108,23 +108,23 @@ namespace OpenSim.Framework.Communications.Cache
public virtual List<AssetBase> GetDefaultAssets() public virtual List<AssetBase> GetDefaultAssets()
{ {
List<AssetBase> assets = new List<AssetBase>(); List<AssetBase> assets = new List<AssetBase>();
// These assets have been moved into the OpenSimAssetSet.XML file
//assets.Add(CreateImageAsset("00000000-0000-1111-9999-000000000001", "Bricks", "bricks.jp2"));
//assets.Add(CreateImageAsset("00000000-0000-1111-9999-000000000002", "Plywood", "plywood.jp2"));
//assets.Add(CreateImageAsset("00000000-0000-1111-9999-000000000003", "Rocks", "rocks.jp2"));
//assets.Add(CreateImageAsset("00000000-0000-1111-9999-000000000004", "Granite", "granite.jp2"));
//assets.Add(CreateImageAsset("00000000-0000-1111-9999-000000000005", "Hardwood", "hardwood.jp2"));
//assets.Add(CreateImageAsset("00000000-0000-1111-5005-000000000005", "Prim Base Texture", "plywood.jp2"));
//assets.Add(CreateImageAsset("00000000-0000-1111-9999-000000000006", "Map Base Texture", "map_base.jp2"));
//assets.Add(CreateImageAsset("00000000-0000-1111-9999-000000000007", "Map Texture", "map1.jp2"));
//assets.Add(CreateImageAsset("00000000-0000-1111-9999-000000000010", "Female Body Texture", "femalebody.jp2"));
//assets.Add(CreateImageAsset("00000000-0000-1111-9999-000000000011", "Female Bottom Texture", "femalebottom.jp2"));
//assets.Add(CreateImageAsset("00000000-0000-1111-9999-000000000012", "Female Face Texture", "femaleface.jp2"));
assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000001", "Bricks", "bricks.jp2")); //assets.Add(CreateAsset("77c41e39-38f9-f75a-024e-585989bbabbb", "Skin", "base_skin.dat", false));
assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000002", "Plywood", "plywood.jp2")); //assets.Add(CreateAsset("66c41e39-38f9-f75a-024e-585989bfab73", "Shape", "base_shape.dat", false));
assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000003", "Rocks", "rocks.jp2")); //assets.Add(CreateAsset("00000000-38f9-1111-024e-222222111110", "Shirt", "newshirt.dat", false));
assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000004", "Granite", "granite.jp2")); //assets.Add(CreateAsset("00000000-38f9-1111-024e-222222111120", "Shirt", "newpants.dat", false));
assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000005", "Hardwood", "hardwood.jp2"));
assets.Add(CreateImageAsset("00000000-0000-0000-5005-000000000005", "Prim Base Texture", "plywood.jp2"));
assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000006", "Map Base Texture", "map_base.jp2"));
assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000007", "Map Texture", "map1.jp2"));
assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000010", "Female Body Texture", "femalebody.jp2"));
assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000011", "Female Bottom Texture", "femalebottom.jp2"));
assets.Add(CreateImageAsset("00000000-0000-0000-9999-000000000012", "Female Face Texture", "femaleface.jp2"));
assets.Add(CreateAsset("77c41e39-38f9-f75a-024e-585989bbabbb", "Skin", "base_skin.dat", false));
assets.Add(CreateAsset("66c41e39-38f9-f75a-024e-585989bfab73", "Shape", "base_shape.dat", false));
assets.Add(CreateAsset("00000000-38f9-1111-024e-222222111110", "Shirt", "newshirt.dat", false));
assets.Add(CreateAsset("00000000-38f9-1111-024e-222222111120", "Shirt", "newpants.dat", false));
return assets; return assets;
} }

160
OpenSim/Framework/Communications/Cache/GridAssetClient.cs Normal file
View File

@ -0,0 +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<AssetBase> 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<AssetBase> 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<AssetBase> action)
{
throw new Exception("The method or operation is not implemented.");
}
#endregion
}
}

2
OpenSim/Framework/Communications/RestClient/GenericAsyncResult.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
namespace OpenSim.Framework.RestClient namespace OpenSim.Framework.Communications
{ {
internal class SimpleAsyncResult : IAsyncResult internal class SimpleAsyncResult : IAsyncResult
{ {

99
OpenSim/Framework/Communications/RestClient/RestClient.cs
View File

@ -6,7 +6,9 @@ using System.Text;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading; using System.Threading;
namespace OpenSim.Framework.RestClient using OpenSim.Framework.Console;
namespace OpenSim.Framework.Communications
{ {
/// <summary> /// <summary>
/// Implementation of a generic REST client /// Implementation of a generic REST client
@ -27,6 +29,9 @@ namespace OpenSim.Framework.RestClient
/// </remarks> /// </remarks>
public class RestClient public class RestClient
{ {
string realuri;
#region member variables
/// <summary> /// <summary>
/// The base Uri of the web-service e.g. http://www.google.com /// The base Uri of the web-service e.g. http://www.google.com
/// </summary> /// </summary>
@ -55,7 +60,7 @@ namespace OpenSim.Framework.RestClient
/// <summary> /// <summary>
/// MemoryStream representing the resultiong resource /// MemoryStream representing the resultiong resource
/// </summary> /// </summary>
MemoryStream _resource; Stream _resource;
/// <summary> /// <summary>
/// WebRequest object, held as a member variable /// WebRequest object, held as a member variable
@ -89,6 +94,9 @@ namespace OpenSim.Framework.RestClient
/// </summary> /// </summary>
private Exception _asyncException; private Exception _asyncException;
#endregion member variables
#region constructors
/// <summary> /// <summary>
/// Instantiate a new RestClient /// Instantiate a new RestClient
/// </summary> /// </summary>
@ -100,8 +108,12 @@ namespace OpenSim.Framework.RestClient
_resource = new MemoryStream(); _resource = new MemoryStream();
_request = null; _request = null;
_response = null; _response = null;
_lock = new object();
} }
object _lock;
#endregion constructors
/// <summary> /// <summary>
/// Add a path element to the query, e.g. assets /// Add a path element to the query, e.g. assets
/// </summary> /// </summary>
@ -124,6 +136,15 @@ namespace OpenSim.Framework.RestClient
_parameterElements.Add(HttpUtility.UrlEncode(name), HttpUtility.UrlEncode(value)); _parameterElements.Add(HttpUtility.UrlEncode(name), HttpUtility.UrlEncode(value));
} }
/// <summary>
/// Add a query parameter to the Url
/// </summary>
/// <param name="name">Name of the parameter, e.g. min</param>
public void AddQueryParameter(string name)
{
_parameterElements.Add(HttpUtility.UrlEncode(name), null);
}
/// <summary> /// <summary>
/// Web-Request method, e.g. GET, PUT, POST, DELETE /// Web-Request method, e.g. GET, PUT, POST, DELETE
/// </summary> /// </summary>
@ -185,9 +206,10 @@ namespace OpenSim.Framework.RestClient
sb.Append(kv.Value); sb.Append(kv.Value);
} }
} }
realuri = sb.ToString();
return new Uri(sb.ToString()); return new Uri(sb.ToString());
} }
#region Async communications with server
/// <summary> /// <summary>
/// Async method, invoked when a block of data has been received from the service /// Async method, invoked when a block of data has been received from the service
/// </summary> /// </summary>
@ -199,7 +221,6 @@ namespace OpenSim.Framework.RestClient
Stream s = (Stream)ar.AsyncState; Stream s = (Stream)ar.AsyncState;
int read = s.EndRead(ar); int read = s.EndRead(ar);
// Read the HTML page and then print it to the console.
if (read > 0) if (read > 0)
{ {
_resource.Write(_readbuf, 0, read); _resource.Write(_readbuf, 0, read);
@ -207,7 +228,6 @@ namespace OpenSim.Framework.RestClient
// TODO! Implement timeout, without killing the server // TODO! Implement timeout, without killing the server
//ThreadPool.RegisterWaitForSingleObject(asynchronousResult.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), _request, DefaultTimeout, true); //ThreadPool.RegisterWaitForSingleObject(asynchronousResult.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), _request, DefaultTimeout, true);
return;
} }
else else
{ {
@ -261,32 +281,83 @@ namespace OpenSim.Framework.RestClient
} }
} }
} }
#endregion Async communications with server
/// <summary> /// <summary>
/// Perform synchroneous request /// Perform synchroneous request
/// </summary> /// </summary>
public Stream Request() public Stream Request()
{
lock (_lock)
{
_request = (HttpWebRequest)WebRequest.Create(buildUri());
_request.KeepAlive = false;
_request.ContentType = "application/xml";
_request.Timeout = 200000;
_asyncException = null;
// IAsyncResult responseAsyncResult = _request.BeginGetResponse(new AsyncCallback(ResponseIsReadyDelegate), _request);
_response = (HttpWebResponse)_request.GetResponse();
Stream src = _response.GetResponseStream();
int length = src.Read(_readbuf, 0, BufferSize);
while(length > 0)
{
_resource.Write(_readbuf, 0, length);
length = src.Read(_readbuf, 0, BufferSize);
}
// TODO! Implement timeout, without killing the server
// this line implements the timeout, if there is a timeout, the callback fires and the request becomes aborted
//ThreadPool.RegisterWaitForSingleObject(responseAsyncResult.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), _request, DefaultTimeout, true);
// _allDone.WaitOne();
if (_response != null)
_response.Close();
if (_asyncException != null)
throw _asyncException;
if (_resource != null)
{
_resource.Flush();
_resource.Seek(0, SeekOrigin.Begin);
}
return _resource;
}
}
public Stream Request(Stream src)
{ {
_request = (HttpWebRequest)WebRequest.Create(buildUri()); _request = (HttpWebRequest)WebRequest.Create(buildUri());
_request.KeepAlive = false; _request.KeepAlive = false;
_request.ContentType = "text/html"; _request.ContentType = "application/xml";
_request.Timeout = 200; _request.Timeout = 900000;
_request.Method = RequestMethod;
_asyncException = null; _asyncException = null;
_request.ContentLength = src.Length;
IAsyncResult responseAsyncResult = _request.BeginGetResponse(new AsyncCallback(ResponseIsReadyDelegate), _request); src.Seek(0, SeekOrigin.Begin);
Stream dst = _request.GetRequestStream();
byte[] buf = new byte[1024];
int length = src.Read(buf,0, 1024);
while (length > 0)
{
dst.Write(buf, 0, length);
length = src.Read(buf, 0, 1024);
}
_response = (HttpWebResponse)_request.GetResponse();
// IAsyncResult responseAsyncResult = _request.BeginGetResponse(new AsyncCallback(ResponseIsReadyDelegate), _request);
// TODO! Implement timeout, without killing the server // TODO! Implement timeout, without killing the server
// this line implements the timeout, if there is a timeout, the callback fires and the request becomes aborted // this line implements the timeout, if there is a timeout, the callback fires and the request becomes aborted
//ThreadPool.RegisterWaitForSingleObject(responseAsyncResult.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), _request, DefaultTimeout, true); //ThreadPool.RegisterWaitForSingleObject(responseAsyncResult.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), _request, DefaultTimeout, true);
_allDone.WaitOne(); return null;
if(_response != null)
_response.Close();
if (_asyncException != null)
throw _asyncException;
return _resource;
} }
#region Async Invocation #region Async Invocation
public IAsyncResult BeginRequest(AsyncCallback callback, object state) public IAsyncResult BeginRequest(AsyncCallback callback, object state)
{ {

30
OpenSim/Framework/Data.MySQL/MySQLAssetData.cs
View File

@ -71,22 +71,24 @@ namespace OpenSim.Framework.Data.MySQL
public AssetBase FetchAsset(LLUUID assetID) public AssetBase FetchAsset(LLUUID assetID)
{ {
AssetBase asset = null; AssetBase asset = null;
lock (_dbConnection)
MySqlCommand cmd = new MySqlCommand("SELECT name, description, assetType, invType, local, temporary, data FROM assets WHERE id=?id", _dbConnection.Connection);
MySqlParameter p = cmd.Parameters.Add("?id", MySqlDbType.Binary, 16);
p.Value = assetID.GetBytes();
using (MySqlDataReader dbReader = cmd.ExecuteReader(System.Data.CommandBehavior.SingleRow))
{ {
if (dbReader.Read()) MySqlCommand cmd = new MySqlCommand("SELECT name, description, assetType, invType, local, temporary, data FROM assets WHERE id=?id", _dbConnection.Connection);
MySqlParameter p = cmd.Parameters.Add("?id", MySqlDbType.Binary, 16);
p.Value = assetID.GetBytes();
using (MySqlDataReader dbReader = cmd.ExecuteReader(System.Data.CommandBehavior.SingleRow))
{ {
asset = new AssetBase(); if (dbReader.Read())
asset.Data = (byte[])dbReader["data"]; {
asset.Description = (string)dbReader["description"]; asset = new AssetBase();
asset.FullID = assetID; asset.Data = (byte[])dbReader["data"];
asset.InvType = (sbyte)dbReader["invType"]; asset.Description = (string)dbReader["description"];
asset.Local = ((sbyte)dbReader["local"]) != 0 ? true : false; asset.FullID = assetID;
asset.Name = (string)dbReader["name"]; asset.InvType = (sbyte)dbReader["invType"];
asset.Type = (sbyte)dbReader["assetType"]; asset.Local = ((sbyte)dbReader["local"]) != 0 ? true : false;
asset.Name = (string)dbReader["name"];
asset.Type = (sbyte)dbReader["assetType"];
}
} }
} }
return asset; return asset;

2
OpenSim/Framework/General/Types/AssetBase.cs
View File

@ -25,10 +25,12 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*/ */
using System;
using libsecondlife; using libsecondlife;
namespace OpenSim.Framework.Types namespace OpenSim.Framework.Types
{ {
[Serializable]
public class AssetBase public class AssetBase
{ {
public byte[] Data; public byte[] Data;

184
OpenSim/Grid/AssetServer/Main.cs
View File

@ -28,15 +28,18 @@
using System; using System;
using System.IO; using System.IO;
using System.Reflection;
using libsecondlife; using libsecondlife;
using Nini.Config;
using OpenSim.Framework.Types;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Configuration; using OpenSim.Framework.Configuration;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Configuration;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Utilities; using OpenSim.Framework.Utilities;
using OpenSim.Framework.Servers;
/* /*
using System.Text; using System.Text;
@ -57,7 +60,7 @@ namespace OpenSim.Grid.AssetServer
public static OpenAsset_Main assetserver; public static OpenAsset_Main assetserver;
private LogBase m_console; private LogBase m_console;
private IAssetServer m_assetServer; private IAssetProvider m_assetProvider;
[STAThread] [STAThread]
public static void Main(string[] args) public static void Main(string[] args)
@ -97,11 +100,14 @@ namespace OpenSim.Grid.AssetServer
m_console.Verbose("ASSET", "Setting up asset DB"); m_console.Verbose("ASSET", "Setting up asset DB");
setupDB(m_config); setupDB(m_config);
m_console.Verbose("ASSET", "Loading default asset set..");
LoadDefaultAssets();
m_console.Verbose("ASSET", "Starting HTTP process"); m_console.Verbose("ASSET", "Starting HTTP process");
BaseHttpServer httpServer = new BaseHttpServer((int)m_config.HttpPort); BaseHttpServer httpServer = new BaseHttpServer((int)m_config.HttpPort);
httpServer.AddStreamHandler(new GetAssetStreamHandler(this)); httpServer.AddStreamHandler(new GetAssetStreamHandler(this, m_assetProvider));
httpServer.AddStreamHandler(new PostAssetStreamHandler( this )); httpServer.AddStreamHandler(new PostAssetStreamHandler(this, m_assetProvider));
httpServer.Start(); httpServer.Start();
} }
@ -111,14 +117,49 @@ namespace OpenSim.Grid.AssetServer
return null; return null;
} }
public IAssetProvider LoadDatabasePlugin(string FileName)
{
MainLog.Instance.Verbose("ASSET SERVER", "LoadDatabasePlugin: Attempting to load " + FileName);
Assembly pluginAssembly = Assembly.LoadFrom(FileName);
IAssetProvider assetPlugin = null;
foreach (Type pluginType in pluginAssembly.GetTypes())
{
if (!pluginType.IsAbstract)
{
Type typeInterface = pluginType.GetInterface("IAssetProvider", true);
if (typeInterface != null)
{
IAssetProvider plug = (IAssetProvider)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
assetPlugin = plug;
assetPlugin.Initialise();
MainLog.Instance.Verbose("ASSET SERVER", "Added " + assetPlugin.Name + " " + assetPlugin.Version);
break;
}
typeInterface = null;
}
}
pluginAssembly = null;
return assetPlugin;
}
public void setupDB(AssetConfig config) public void setupDB(AssetConfig config)
{ {
try try
{ {
SQLAssetServer assetServer = new SQLAssetServer(config.DatabaseProvider ); m_assetProvider = LoadDatabasePlugin(config.DatabaseProvider);
assetServer.LoadDefaultAssets(); if (m_assetProvider == null)
{
MainLog.Instance.Error("ASSET", "Failed to load a database plugin, server halting");
Environment.Exit(-1);
}
// assetServer.LoadDefaultAssets();
m_assetServer = assetServer; // m_assetServer = assetServer;
} }
catch (Exception e) catch (Exception e)
{ {
@ -127,6 +168,72 @@ namespace OpenSim.Grid.AssetServer
} }
} }
public void LoadAsset(AssetBase info, bool image, string filename)
{
//should request Asset from storage manager
//but for now read from file
string dataPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder;
string fileName = Path.Combine(dataPath, filename);
FileInfo fInfo = new FileInfo(fileName);
long numBytes = fInfo.Length;
FileStream fStream = new FileStream(fileName, FileMode.Open, FileAccess.Read);
byte[] idata = new byte[numBytes];
BinaryReader br = new BinaryReader(fStream);
idata = br.ReadBytes((int)numBytes);
br.Close();
fStream.Close();
info.Data = idata;
//info.loaded=true;
}
public AssetBase CreateAsset(string assetIdStr, string name, string filename, bool isImage)
{
AssetBase asset = new AssetBase(
new LLUUID(assetIdStr),
name
);
if (!String.IsNullOrEmpty(filename))
{
MainLog.Instance.Verbose("ASSETS", "Loading: [{0}][{1}]", name, filename);
LoadAsset(asset, isImage, filename);
}
else
{
MainLog.Instance.Verbose("ASSETS", "Instantiated: [{0}]", name);
}
return asset;
}
public void LoadDefaultAssets()
{
string filePath = Path.Combine(Util.configDir(), "OpenSimAssetSet.xml");
if (File.Exists(filePath))
{
XmlConfigSource source = new XmlConfigSource(filePath);
for (int i = 0; i < source.Configs.Count; i++)
{
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);
sbyte invType = (sbyte)source.Configs[i].GetInt("inventoryType", 0);
string fileName = source.Configs[i].GetString("fileName", "");
AssetBase newAsset = CreateAsset(assetIdStr, name, fileName, false);
newAsset.Type = type;
newAsset.InvType = invType;
m_assetProvider.CreateAsset(newAsset);
}
}
}
public void RunCmd(string cmd, string[] cmdparams) public void RunCmd(string cmd, string[] cmdparams)
{ {
switch (cmd) switch (cmd)
@ -146,65 +253,4 @@ namespace OpenSim.Grid.AssetServer
{ {
} }
} }
public class GetAssetStreamHandler : BaseStreamHandler
{
OpenAsset_Main m_assetManager;
override public byte[] Handle(string path, Stream request)
{
string param = GetParam(path);
byte[] assetdata = m_assetManager.GetAssetData(new LLUUID(param), false);
if (assetdata != null)
{
return assetdata;
}
else
{
return new byte[]{};
}
}
public GetAssetStreamHandler(OpenAsset_Main assetManager) : base("/assets/", "GET")
{
m_assetManager = assetManager;
}
}
public class PostAssetStreamHandler : BaseStreamHandler
{
OpenAsset_Main m_assetManager;
override public byte[] Handle(string path, Stream request)
{
string param = GetParam(path);
LLUUID assetId = new LLUUID(param);
byte[] txBuffer = new byte[4096];
using( BinaryReader binReader = new BinaryReader( request ) )
{
using (MemoryStream memoryStream = new MemoryStream(4096))
{
int count;
while ((count = binReader.Read(txBuffer, 0, 4096)) > 0)
{
memoryStream.Write(txBuffer, 0, count);
}
byte[] assetData = memoryStream.ToArray();
// m_assetManager.CreateAsset(assetId, assetData);
}
}
return new byte[]{};
}
public PostAssetStreamHandler( OpenAsset_Main assetManager )
: base("/assets/", "POST")
{
m_assetManager = assetManager;
}
}
} }

109
OpenSim/Grid/AssetServer/RestService.cs Normal file
View File

@ -0,0 +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<byte>(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;
}
}
}

4
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -301,6 +301,10 @@ namespace OpenSim
{ {
assetServer = new LocalAssetServer(); assetServer = new LocalAssetServer();
} }
else if (m_assetStorage == "grid")
{
assetServer = new GridAssetClient(m_networkServersInfo.AssetURL);
}
else else
{ {
SQLAssetServer sqlAssetServer = new SQLAssetServer(standaloneAssetPlugin); SQLAssetServer sqlAssetServer = new SQLAssetServer(standaloneAssetPlugin);

128
bin/OpenSimAssetSet.xml
View File

@ -2,16 +2,16 @@
<Section Name="Welcome notecard"> <Section Name="Welcome notecard">
<Key Name="assetID" Value="00000000-0000-2222-3333-000000000001" /> <Key Name="assetID" Value="00000000-0000-2222-3333-000000000001" />
<Key Name="name" Value="WelcomeNote" /> <Key Name="name" Value="WelcomeNote" />
<Key Name="assetType" Value="7" /> <Key Name="assetType" Value="7" />
<Key Name="inventoryType" Value="7" /> <Key Name="inventoryType" Value="7" />
<Key Name="fileName" Value="welcomeNote.dat" /> <Key Name="fileName" Value="welcomeNote.dat" />
</Section> </Section>
<Section Name="texture1"> <Section Name="texture1">
<Key Name="assetID" Value="00000000-0000-2222-3333-000000000099" /> <Key Name="assetID" Value="00000000-0000-2222-3333-000000000099" />
<Key Name="name" Value="femface" /> <Key Name="name" Value="femface" />
<Key Name="assetType" Value="0" /> <Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" /> <Key Name="inventoryType" Value="0" />
<Key Name="fileName" Value="femaleface.jp2" /> <Key Name="fileName" Value="femaleface.jp2" />
</Section> </Section>
<Section Name="4-tile2 Texture"> <Section Name="4-tile2 Texture">
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001000" /> <Key Name="assetID" Value="00000000-0000-2222-3333-100000001000" />
@ -335,4 +335,120 @@
<Key Name="inventoryType" Value="0" /> <Key Name="inventoryType" Value="0" />
<Key Name="fileName" Value="peaches.jp2" /> <Key Name="fileName" Value="peaches.jp2" />
</Section> </Section>
<!-- Copied from hardcoded values -->
<Section Name="Bricks">
<Key Name="assetID" Value="00000000-0000-1111-9999-000000000001"/>
<Key Name="Name" Value="Bricks"/>
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="fileName" Value="bricks.jp2"/>
</Section>
<Section Name="Plywood">
<Key Name="assetID" Value="00000000-0000-1111-9999-000000000002"/>
<Key Name="Name" Value="Plywood"/>
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="fileName" Value="plywood.jp2"/>
</Section>
<Section Name="Rocks">
<Key Name="assetID" Value="00000000-0000-1111-9999-000000000003"/>
<Key Name="Name" Value="Rocks"/>
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="fileName" Value="rocks.jp2"/>
</Section>
<Section Name="Granite">
<Key Name="assetID" Value="00000000-0000-1111-9999-000000000004"/>
<Key Name="Name" Value="Granite"/>
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="fileName" Value="granite.jp2"/>
</Section>
<Section Name="Hardwood">
<Key Name="assetID" Value="00000000-0000-1111-9999-000000000005"/>
<Key Name="Name" Value="Hardwood"/>
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="fileName" Value="hardwood.jp2"/>
</Section>
<Section Name="Prim Base Texture">
<Key Name="assetID" Value="00000000-0000-1111-5005-000000000005"/>
<Key Name="Name" Value="Prim Base Texture"/>
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="fileName" Value="plywood.jp2"/>
</Section>
<Section Name="Map Base Texture">
<Key Name="assetID" Value="00000000-0000-1111-9999-000000000006"/>
<Key Name="Name" Value="Map Base Texture"/>
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="fileName" Value="map_base.jp2"/>
</Section>
<Section Name="Map Texture">
<Key Name="assetID" Value="00000000-0000-1111-9999-000000000007"/>
<Key Name="Name" Value="Map Texture"/>
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="fileName" Value="map1.jp2"/>
</Section>
<Section Name="Female Body Texture">
<Key Name="assetID" Value="00000000-0000-1111-9999-000000000010"/>
<Key Name="Name" Value="Female Body Texture"/>
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="fileName" Value="femalebody.jp2"/>
</Section>
<Section Name="Female Bottom Texture">
<Key Name="assetID" Value="00000000-0000-1111-9999-000000000011"/>
<Key Name="Name" Value="Female Bottom Texture"/>
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="fileName" Value="femalebottom.jp2"/>
</Section>
<Section Name="Female Face Texture">
<Key Name="assetID" Value="00000000-0000-1111-9999-000000000012"/>
<Key Name="Name" Value="Female Face Texture"/>
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="fileName" Value="femaleface.jp2"/>
</Section>
<Section Name="Skin">
<Key Name="assetID" Value="77c41e39-38f9-f75a-024e-585989bbabbb"/>
<Key Name="Name" Value="Skin"/>
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="fileName" Value="base_skin.dat"/>
</Section>
<Section Name="Shape">
<Key Name="assetID" Value="66c41e39-38f9-f75a-024e-585989bfab73"/>
<Key Name="Name" Value="Shape"/>
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="fileName" Value="base_shape.dat"/>
</Section>
<Section Name="Shirt">
<Key Name="assetID" Value="00000000-38f9-1111-024e-222222111110"/>
<Key Name="Name" Value="Shirt"/>
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="fileName" Value="newshirt.dat"/>
</Section>
<Section Name="Pants">
<Key Name="assetID" Value="00000000-38f9-1111-024e-222222111120"/>
<Key Name="Name" Value="Pants"/>
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="fileName" Value="newpants.dat"/>
</Section>
</Nini> </Nini>

5
prebuild.xml
View File

@ -808,8 +808,7 @@
<Reference name="OpenSim.Framework.Servers"/> <Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenSim.Framework.Communications"/> <Reference name="OpenSim.Framework.Communications"/>
<Reference name="libsecondlife.dll"/> <Reference name="libsecondlife.dll"/>
<Reference name="Db4objects.Db4o.dll"/> <Reference name="Nini.dll" />
<Reference name="XMLRPC.dll"/>
<Files> <Files>
<Match pattern="*.cs" recurse="true"/> <Match pattern="*.cs" recurse="true"/>
@ -1053,3 +1052,5 @@