Update svn properties.

0.6.5-rc1
Jeff Ames 2009-05-11 15:14:15 +00:00
parent 85bbcf196f
commit 5164403676
5 changed files with 372 additions and 372 deletions

View File

@ -1,196 +1,196 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the * * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * 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 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Net; using System.Net;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Xml; using System.Xml;
using System.Xml.Serialization; using System.Xml.Serialization;
using log4net; using log4net;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Framework.Statistics; using OpenSim.Framework.Statistics;
namespace OpenSim.Framework.Servers namespace OpenSim.Framework.Servers
{ {
public abstract class BaseGetAssetStreamHandler : BaseStreamHandler public abstract class BaseGetAssetStreamHandler : BaseStreamHandler
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected BaseGetAssetStreamHandler(string httpMethod, string path) : base(httpMethod, path) protected BaseGetAssetStreamHandler(string httpMethod, string path) : base(httpMethod, path)
{ {
} }
protected abstract AssetBase GetAsset(UUID assetID); protected abstract AssetBase GetAsset(UUID assetID);
public override byte[] Handle(string path, Stream request, public override byte[] Handle(string path, Stream request,
OSHttpRequest httpRequest, OSHttpResponse httpResponse) OSHttpRequest httpRequest, OSHttpResponse httpResponse)
{ {
byte[] result = new byte[] { }; byte[] result = new byte[] { };
string[] p = SplitParams(path); string[] p = SplitParams(path);
if (p.Length > 0) if (p.Length > 0)
{ {
UUID assetID = UUID.Zero; UUID assetID = UUID.Zero;
if (!UUID.TryParse(p[0], out assetID)) if (!UUID.TryParse(p[0], out assetID))
{ {
m_log.InfoFormat( m_log.InfoFormat(
"[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]); "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]);
return result; return result;
} }
if (StatsManager.AssetStats != null) if (StatsManager.AssetStats != null)
StatsManager.AssetStats.AddRequest(); StatsManager.AssetStats.AddRequest();
AssetBase asset = GetAsset(assetID); AssetBase asset = GetAsset(assetID);
if (asset != null) if (asset != null)
{ {
// if (asset.ContainsReferences) // if (asset.ContainsReferences)
// { // {
// asset.Data = ProcessOutgoingAssetData(asset.Data); // asset.Data = ProcessOutgoingAssetData(asset.Data);
// } // }
if (p.Length > 1 && p[1] == "data") if (p.Length > 1 && p[1] == "data")
{ {
httpResponse.StatusCode = (int)HttpStatusCode.OK; httpResponse.StatusCode = (int)HttpStatusCode.OK;
httpResponse.ContentType = SLAssetTypeToContentType(asset.Type); httpResponse.ContentType = SLAssetTypeToContentType(asset.Type);
result = asset.Data; result = asset.Data;
} }
else else
{ {
XmlSerializer xs = new XmlSerializer(typeof(AssetBase)); XmlSerializer xs = new XmlSerializer(typeof(AssetBase));
MemoryStream ms = new MemoryStream(); MemoryStream ms = new MemoryStream();
XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8); XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8);
xw.Formatting = Formatting.Indented; xw.Formatting = Formatting.Indented;
xs.Serialize(xw, asset); xs.Serialize(xw, asset);
xw.Flush(); xw.Flush();
ms.Seek(0, SeekOrigin.Begin); ms.Seek(0, SeekOrigin.Begin);
//StreamReader sr = new StreamReader(ms); //StreamReader sr = new StreamReader(ms);
result = ms.GetBuffer(); result = ms.GetBuffer();
Array.Resize<byte>(ref result, (int)ms.Length); Array.Resize<byte>(ref result, (int)ms.Length);
} }
} }
else else
{ {
if (StatsManager.AssetStats != null) if (StatsManager.AssetStats != null)
StatsManager.AssetStats.AddNotFoundRequest(); StatsManager.AssetStats.AddNotFoundRequest();
m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID); m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID);
} }
} }
return result; return result;
} }
public string ProcessAssetDataString(string data) public string ProcessAssetDataString(string data)
{ {
Regex regex = new Regex("(creator_id|owner_id)\\s+(\\S+)"); Regex regex = new Regex("(creator_id|owner_id)\\s+(\\S+)");
// IUserService userService = null; // IUserService userService = null;
data = regex.Replace(data, delegate(Match m) data = regex.Replace(data, delegate(Match m)
{ {
string result = String.Empty; string result = String.Empty;
// string key = m.Groups[1].Captures[0].Value; // string key = m.Groups[1].Captures[0].Value;
// //
// string value = m.Groups[2].Captures[0].Value; // string value = m.Groups[2].Captures[0].Value;
// //
// Guid userUri; // Guid userUri;
// //
// switch (key) // switch (key)
// { // {
// case "creator_id": // case "creator_id":
// userUri = new Guid(value); // userUri = new Guid(value);
// // result = "creator_url " + userService(userService, userUri); // // result = "creator_url " + userService(userService, userUri);
// break; // break;
// //
// case "owner_id": // case "owner_id":
// userUri = new Guid(value); // userUri = new Guid(value);
// // result = "owner_url " + ResolveUserUri(userService, userUri); // // result = "owner_url " + ResolveUserUri(userService, userUri);
// break; // break;
// } // }
return result; return result;
}); });
return data; return data;
} }
private string SLAssetTypeToContentType(int assetType) private string SLAssetTypeToContentType(int assetType)
{ {
switch (assetType) switch (assetType)
{ {
case 0: case 0:
return "image/jp2"; return "image/jp2";
case 1: case 1:
return "application/ogg"; return "application/ogg";
case 2: case 2:
return "application/x-metaverse-callingcard"; return "application/x-metaverse-callingcard";
case 3: case 3:
return "application/x-metaverse-landmark"; return "application/x-metaverse-landmark";
case 5: case 5:
return "application/x-metaverse-clothing"; return "application/x-metaverse-clothing";
case 6: case 6:
return "application/x-metaverse-primitive"; return "application/x-metaverse-primitive";
case 7: case 7:
return "application/x-metaverse-notecard"; return "application/x-metaverse-notecard";
case 8: case 8:
return "application/x-metaverse-folder"; return "application/x-metaverse-folder";
case 10: case 10:
return "application/x-metaverse-lsl"; return "application/x-metaverse-lsl";
case 11: case 11:
return "application/x-metaverse-lso"; return "application/x-metaverse-lso";
case 12: case 12:
return "image/tga"; return "image/tga";
case 13: case 13:
return "application/x-metaverse-bodypart"; return "application/x-metaverse-bodypart";
case 17: case 17:
return "audio/x-wav"; return "audio/x-wav";
case 19: case 19:
return "image/jpeg"; return "image/jpeg";
case 20: case 20:
return "application/x-metaverse-animation"; return "application/x-metaverse-animation";
case 21: case 21:
return "application/x-metaverse-gesture"; return "application/x-metaverse-gesture";
case 22: case 22:
return "application/x-metaverse-simstate"; return "application/x-metaverse-simstate";
default: default:
return "application/octet-stream"; return "application/octet-stream";
} }
} }
} }
} }

View File

@ -1,43 +1,43 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using NUnit.Framework; using NUnit.Framework;
using OpenSim.Tests.Common; using OpenSim.Tests.Common;
namespace OpenSim.Framework.Servers.HttpServer.Tests namespace OpenSim.Framework.Servers.HttpServer.Tests
{ {
[TestFixture] [TestFixture]
public class BaseRequestHandlerTests public class BaseRequestHandlerTests
{ {
private const string BASE_PATH = "/testpath"; private const string BASE_PATH = "/testpath";
private class BaseRequestHandlerImpl : BaseRequestHandler private class BaseRequestHandlerImpl : BaseRequestHandler
{ {
public BaseRequestHandlerImpl(string httpMethod, string path) : base(httpMethod, path) public BaseRequestHandlerImpl(string httpMethod, string path) : base(httpMethod, path)
{ {
} }
} }
[Test] [Test]
public void TestConstructor() public void TestConstructor()
{ {
BaseRequestHandlerImpl handler = new BaseRequestHandlerImpl( null, null ); BaseRequestHandlerImpl handler = new BaseRequestHandlerImpl( null, null );
} }
[Test] [Test]
public void TestGetParams() public void TestGetParams()
{ {
BaseRequestHandlerImpl handler = new BaseRequestHandlerImpl(null, BASE_PATH); BaseRequestHandlerImpl handler = new BaseRequestHandlerImpl(null, BASE_PATH);
BaseRequestHandlerTestHelper.BaseTestGetParams(handler, BASE_PATH); BaseRequestHandlerTestHelper.BaseTestGetParams(handler, BASE_PATH);
} }
[Test] [Test]
public void TestSplitParams() public void TestSplitParams()
{ {
BaseRequestHandlerImpl handler = new BaseRequestHandlerImpl(null, BASE_PATH); BaseRequestHandlerImpl handler = new BaseRequestHandlerImpl(null, BASE_PATH);
BaseRequestHandlerTestHelper.BaseTestSplitParams(handler, BASE_PATH); BaseRequestHandlerTestHelper.BaseTestSplitParams(handler, BASE_PATH);
} }
} }
} }

View File

@ -1,72 +1,72 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using NUnit.Framework; using NUnit.Framework;
using OpenSim.Data; using OpenSim.Data;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Tests.Common; using OpenSim.Tests.Common;
namespace OpenSim.Framework.Servers.Tests namespace OpenSim.Framework.Servers.Tests
{ {
[TestFixture] [TestFixture]
public class CachedGetAssetStreamHandlerTests public class CachedGetAssetStreamHandlerTests
{ {
private const string ASSETS_PATH = "/assets"; private const string ASSETS_PATH = "/assets";
[Test] [Test]
public void TestConstructor() public void TestConstructor()
{ {
TestHelper.InMethod(); TestHelper.InMethod();
CachedGetAssetStreamHandler handler = new CachedGetAssetStreamHandler(null); CachedGetAssetStreamHandler handler = new CachedGetAssetStreamHandler(null);
} }
[Test] [Test]
public void TestGetParams() public void TestGetParams()
{ {
TestHelper.InMethod(); TestHelper.InMethod();
CachedGetAssetStreamHandler handler = new CachedGetAssetStreamHandler(null); CachedGetAssetStreamHandler handler = new CachedGetAssetStreamHandler(null);
BaseRequestHandlerTestHelper.BaseTestGetParams(handler, ASSETS_PATH); BaseRequestHandlerTestHelper.BaseTestGetParams(handler, ASSETS_PATH);
} }
[Test] [Test]
public void TestSplitParams() public void TestSplitParams()
{ {
TestHelper.InMethod(); TestHelper.InMethod();
CachedGetAssetStreamHandler handler = new CachedGetAssetStreamHandler(null); CachedGetAssetStreamHandler handler = new CachedGetAssetStreamHandler(null);
BaseRequestHandlerTestHelper.BaseTestSplitParams(handler, ASSETS_PATH); BaseRequestHandlerTestHelper.BaseTestSplitParams(handler, ASSETS_PATH);
} }
[Test] [Test]
public void TestHandleNoParams() public void TestHandleNoParams()
{ {
TestHelper.InMethod(); TestHelper.InMethod();
CachedGetAssetStreamHandler handler = new CachedGetAssetStreamHandler(null); CachedGetAssetStreamHandler handler = new CachedGetAssetStreamHandler(null);
BaseRequestHandlerTestHelper.BaseTestHandleNoParams(handler, ASSETS_PATH); BaseRequestHandlerTestHelper.BaseTestHandleNoParams(handler, ASSETS_PATH);
} }
[Test] [Test]
public void TestHandleMalformedGuid() public void TestHandleMalformedGuid()
{ {
TestHelper.InMethod(); TestHelper.InMethod();
CachedGetAssetStreamHandler handler = new CachedGetAssetStreamHandler(null); CachedGetAssetStreamHandler handler = new CachedGetAssetStreamHandler(null);
BaseRequestHandlerTestHelper.BaseTestHandleMalformedGuid(handler, ASSETS_PATH); BaseRequestHandlerTestHelper.BaseTestHandleMalformedGuid(handler, ASSETS_PATH);
} }
//[Test] //[Test]
//public void TestHandleFetchMissingAsset() //public void TestHandleFetchMissingAsset()
//{ //{
// byte[] emptyResult = new byte[] { }; // byte[] emptyResult = new byte[] { };
// CachedGetAssetStreamHandler handler = new CachedGetAssetStreamHandler(null); // CachedGetAssetStreamHandler handler = new CachedGetAssetStreamHandler(null);
// Assert.AreEqual(new string[] { }, handler.Handle("/assets/badGuid", null, null, null), "Failed on bad guid."); // Assert.AreEqual(new string[] { }, handler.Handle("/assets/badGuid", null, null, null), "Failed on bad guid.");
//} //}
} }
} }

View File

@ -1,5 +1,5 @@
This folder is for modules that we intend to let users and system admins replace. This folder is for modules that we intend to let users and system admins replace.
This folder should never end up a project. Only subfolders should end up as a project. The idea here is that each folder This folder should never end up a project. Only subfolders should end up as a project. The idea here is that each folder
will produce a project and a separate .dll assembly for the module that will get picked up by the module loader. will produce a project and a separate .dll assembly for the module that will get picked up by the module loader.
To replace the functionality, you simply replace the .dll with a different one. To replace the functionality, you simply replace the .dll with a different one.

View File

@ -1,57 +1,57 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using NUnit.Framework; using NUnit.Framework;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
namespace OpenSim.Tests.Common namespace OpenSim.Tests.Common
{ {
public class BaseRequestHandlerTestHelper public class BaseRequestHandlerTestHelper
{ {
private static string[] m_emptyStringArray = new string[] { }; private static string[] m_emptyStringArray = new string[] { };
public static void BaseTestGetParams(BaseRequestHandler handler, string assetsPath) public static void BaseTestGetParams(BaseRequestHandler handler, string assetsPath)
{ {
Assert.AreEqual(String.Empty, handler.GetParam(null), "Failed on null path."); Assert.AreEqual(String.Empty, handler.GetParam(null), "Failed on null path.");
Assert.AreEqual(String.Empty, handler.GetParam(""), "Failed on empty path."); Assert.AreEqual(String.Empty, handler.GetParam(""), "Failed on empty path.");
Assert.AreEqual(String.Empty, handler.GetParam("s"), "Failed on short url."); Assert.AreEqual(String.Empty, handler.GetParam("s"), "Failed on short url.");
Assert.AreEqual(String.Empty, handler.GetParam("corruptUrl"), "Failed on corruptUrl."); Assert.AreEqual(String.Empty, handler.GetParam("corruptUrl"), "Failed on corruptUrl.");
Assert.AreEqual(String.Empty, handler.GetParam(assetsPath)); Assert.AreEqual(String.Empty, handler.GetParam(assetsPath));
Assert.AreEqual("/", handler.GetParam(assetsPath + "/")); Assert.AreEqual("/", handler.GetParam(assetsPath + "/"));
Assert.AreEqual("/a", handler.GetParam(assetsPath + "/a")); Assert.AreEqual("/a", handler.GetParam(assetsPath + "/a"));
Assert.AreEqual("/b/", handler.GetParam(assetsPath + "/b/")); Assert.AreEqual("/b/", handler.GetParam(assetsPath + "/b/"));
Assert.AreEqual("/c/d", handler.GetParam(assetsPath + "/c/d")); Assert.AreEqual("/c/d", handler.GetParam(assetsPath + "/c/d"));
Assert.AreEqual("/e/f/", handler.GetParam(assetsPath + "/e/f/")); Assert.AreEqual("/e/f/", handler.GetParam(assetsPath + "/e/f/"));
} }
public static void BaseTestSplitParams(BaseRequestHandler handler, string assetsPath) public static void BaseTestSplitParams(BaseRequestHandler handler, string assetsPath)
{ {
Assert.AreEqual(m_emptyStringArray, handler.SplitParams(null), "Failed on null."); Assert.AreEqual(m_emptyStringArray, handler.SplitParams(null), "Failed on null.");
Assert.AreEqual(m_emptyStringArray, handler.SplitParams(""), "Failed on empty path."); Assert.AreEqual(m_emptyStringArray, handler.SplitParams(""), "Failed on empty path.");
Assert.AreEqual(m_emptyStringArray, handler.SplitParams("corruptUrl"), "Failed on corrupt url."); Assert.AreEqual(m_emptyStringArray, handler.SplitParams("corruptUrl"), "Failed on corrupt url.");
Assert.AreEqual(m_emptyStringArray, handler.SplitParams(assetsPath), "Failed on empty params."); Assert.AreEqual(m_emptyStringArray, handler.SplitParams(assetsPath), "Failed on empty params.");
Assert.AreEqual(m_emptyStringArray, handler.SplitParams(assetsPath + "/"), "Failed on single slash."); Assert.AreEqual(m_emptyStringArray, handler.SplitParams(assetsPath + "/"), "Failed on single slash.");
Assert.AreEqual(new string[] { "a" }, handler.SplitParams(assetsPath + "/a"), "Failed on first segment."); Assert.AreEqual(new string[] { "a" }, handler.SplitParams(assetsPath + "/a"), "Failed on first segment.");
Assert.AreEqual(new string[] { "b" }, handler.SplitParams(assetsPath + "/b/"), "Failed on second slash."); Assert.AreEqual(new string[] { "b" }, handler.SplitParams(assetsPath + "/b/"), "Failed on second slash.");
Assert.AreEqual(new string[] { "c", "d" }, handler.SplitParams(assetsPath + "/c/d"), "Failed on second segment."); Assert.AreEqual(new string[] { "c", "d" }, handler.SplitParams(assetsPath + "/c/d"), "Failed on second segment.");
Assert.AreEqual(new string[] { "e", "f" }, handler.SplitParams(assetsPath + "/e/f/"), "Failed on trailing slash."); Assert.AreEqual(new string[] { "e", "f" }, handler.SplitParams(assetsPath + "/e/f/"), "Failed on trailing slash.");
} }
public static byte[] EmptyByteArray = new byte[] {}; public static byte[] EmptyByteArray = new byte[] {};
public static void BaseTestHandleNoParams(BaseGetAssetStreamHandler handler, string assetsPath) public static void BaseTestHandleNoParams(BaseGetAssetStreamHandler handler, string assetsPath)
{ {
Assert.AreEqual(EmptyByteArray, handler.Handle(assetsPath, null, null, null), "Failed on empty params."); Assert.AreEqual(EmptyByteArray, handler.Handle(assetsPath, null, null, null), "Failed on empty params.");
Assert.AreEqual(EmptyByteArray, handler.Handle(assetsPath + "/", null, null, null), "Failed on single slash."); Assert.AreEqual(EmptyByteArray, handler.Handle(assetsPath + "/", null, null, null), "Failed on single slash.");
} }
public static void BaseTestHandleMalformedGuid(BaseGetAssetStreamHandler handler, string assetsPath) public static void BaseTestHandleMalformedGuid(BaseGetAssetStreamHandler handler, string assetsPath)
{ {
Assert.AreEqual(EmptyByteArray, handler.Handle(assetsPath + "/badGuid", null, null, null), "Failed on bad guid."); Assert.AreEqual(EmptyByteArray, handler.Handle(assetsPath + "/badGuid", null, null, null), "Failed on bad guid.");
} }
} }
} }