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

Renaming [ServiceConnectors] back to [Modules].

0.6.6-post-fixes
diva 2009-05-17 15:37:50 +00:00
parent 5cfd84c924
commit 720e2bc5d9
9 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
View File

@ -56,8 +56,7 @@ namespace OpenSim.Region.CoreModules.Asset
public void Initialise(IConfigSource source)
{
IConfig moduleConfig = source.Configs["ServiceConnectors"];
m_log.DebugFormat("[XXX] moduleConfig null? {0}", ((moduleConfig == null) ? "yes" : "no"));
IConfig moduleConfig = source.Configs["Modules"];
if (moduleConfig != null)
{

2
OpenSim/Region/CoreModules/ServiceConnectors/Asset/HGAssetBroker.cs
View File

@ -59,7 +59,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Asset
public void Initialise(IConfigSource source)
{
IConfig moduleConfig = source.Configs["ServiceConnectors"];
IConfig moduleConfig = source.Configs["Modules"];
if (moduleConfig != null)
{
string name = moduleConfig.GetString("AssetServices", "");

2
OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs
View File

@ -58,7 +58,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Asset
public void Initialise(IConfigSource source)
{
IConfig moduleConfig = source.Configs["ServiceConnectors"];
IConfig moduleConfig = source.Configs["Modules"];
if (moduleConfig != null)
{
string name = moduleConfig.GetString("AssetServices", "");

2
OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs
View File

@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Asset
public override void Initialise(IConfigSource source)
{
IConfig moduleConfig = source.Configs["ServiceConnectors"];
IConfig moduleConfig = source.Configs["Modules"];
if (moduleConfig != null)
{
string name = moduleConfig.GetString("AssetServices", "");

2
OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServiceConnector.cs
View File

@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.User
public void Initialise(IConfigSource source)
{
IConfig moduleConfig = source.Configs["ServiceConnectors"];
IConfig moduleConfig = source.Configs["Modules"];
if (moduleConfig != null)
{
string name = moduleConfig.GetString("UserServices", "");

2
OpenSim/Region/CoreModules/ServiceConnectors/User/RemoteUserServiceConnector.cs
View File

@ -43,7 +43,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.User
public void Initialise(IConfigSource source)
{
IConfig moduleConfig = source.Configs["ServiceConnectors"];
IConfig moduleConfig = source.Configs["Modules"];
if (moduleConfig != null)
{
string name = moduleConfig.GetString("UserServices", "");

15
OpenSim/Services/AssetService/HGAssetService.cs
View File

@ -46,7 +46,7 @@ namespace OpenSim.Services.AssetService
public HGAssetService(IConfigSource source)
{
IConfig moduleConfig = source.Configs["ServiceConnectors"];
IConfig moduleConfig = source.Configs["Modules"];
if (moduleConfig != null)
{
string name = moduleConfig.GetString("AssetServices", "");
@ -95,9 +95,7 @@ namespace OpenSim.Services.AssetService
// work in general, because the remote grid may be running
// an asset server that has a different protocol.
// Eventually we will want a piece of meta-protocol asking
// the remote server about its kind, and even asking it
// to send its own connector, which we would instantiate
// dynamically. Definitely coo, thing to do!
// the remote server about its kind. Definitely cool thing to do!
connector = new AssetServicesConnector(url);
m_connectors.Add(url, connector);
}
@ -121,6 +119,15 @@ namespace OpenSim.Services.AssetService
public AssetMetadata GetMetadata(string id)
{
string url = string.Empty;
string assetID = string.Empty;
if (StringToUrlAndAssetID(id, out url, out assetID))
{
IAssetService connector = GetConnector(url);
return connector.GetMetadata(assetID);
}
return null;
}

4
OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
View File

@ -127,9 +127,9 @@ namespace OpenSim.Tests.Common.Setup
ISharedRegionModule assetService = new LocalAssetServicesConnector();
IniConfigSource config = new IniConfigSource();
config.AddConfig("ServiceConnectors");
config.AddConfig("Modules");
config.AddConfig("AssetService");
config.Configs["ServiceConnectors"].Set("AssetServices", "LocalAssetServicesConnector");
config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector");
config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService");
config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Data.Null.dll");
assetService.Initialise(config);

2
bin/OpenSim.ini.example
View File

@ -1269,7 +1269,7 @@
; format your hard drive and make all meat in your fridge spoil.
; You have been warned.
; Some of this is starting to work!
[ServiceConnectors]
[Modules]
; Choose one
AssetServices = "LocalAssetServicesConnector"
;AssetServices = "RemoteAssetServicesConnector"