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

Fix Simian regression

avinationmerge
Melanie 2010-09-07 20:19:52 +01:00
parent 2684ca0838
commit 50cc22c9e6
7 changed files with 140 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
View File

@ -81,7 +81,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
public SimianAssetServiceConnector(IConfigSource source) public SimianAssetServiceConnector(IConfigSource source)
{ {
Initialise(source); CommonInit(source);
} }
public void Initialise(IConfigSource source) public void Initialise(IConfigSource source)
@ -91,25 +91,28 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ {
string name = moduleConfig.GetString("AssetServices", ""); string name = moduleConfig.GetString("AssetServices", "");
if (name == Name) if (name == Name)
{ CommonInit(source);
IConfig gridConfig = source.Configs["AssetService"]; }
if (gridConfig != null) }
{
string serviceUrl = gridConfig.GetString("AssetServerURI");
if (!String.IsNullOrEmpty(serviceUrl))
{
if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
serviceUrl = serviceUrl + '/';
m_serverUrl = serviceUrl;
}
}
if (String.IsNullOrEmpty(m_serverUrl)) private void CommonInit(IConfigSource source)
m_log.Info("[SIMIAN ASSET CONNECTOR]: No AssetServerURI specified, disabling connector"); {
else IConfig gridConfig = source.Configs["AssetService"];
m_Enabled = true; if (gridConfig != null)
{
string serviceUrl = gridConfig.GetString("AssetServerURI");
if (!String.IsNullOrEmpty(serviceUrl))
{
if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
serviceUrl = serviceUrl + '/';
m_serverUrl = serviceUrl;
} }
} }
if (String.IsNullOrEmpty(m_serverUrl))
m_log.Info("[SIMIAN ASSET CONNECTOR]: No AssetServerURI specified, disabling connector");
else
m_Enabled = true;
} }
#region IAssetService #region IAssetService

35
OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
View File

@ -69,7 +69,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
public SimianAuthenticationServiceConnector(IConfigSource source) public SimianAuthenticationServiceConnector(IConfigSource source)
{ {
Initialise(source); CommonInit(source);
} }
public void Initialise(IConfigSource source) public void Initialise(IConfigSource source)
@ -79,24 +79,27 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ {
string name = moduleConfig.GetString("AuthenticationServices", ""); string name = moduleConfig.GetString("AuthenticationServices", "");
if (name == Name) if (name == Name)
{ CommonInit(source);
IConfig gridConfig = source.Configs["AuthenticationService"]; }
if (gridConfig != null) }
{
string serviceUrl = gridConfig.GetString("AuthenticationServerURI");
if (!String.IsNullOrEmpty(serviceUrl))
{
if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
serviceUrl = serviceUrl + '/';
m_serverUrl = serviceUrl;
m_Enabled = true;
}
}
if (String.IsNullOrEmpty(m_serverUrl)) private void CommonInit(IConfigSource source)
m_log.Info("[SIMIAN AUTH CONNECTOR]: No AuthenticationServerURI specified, disabling connector"); {
IConfig gridConfig = source.Configs["AuthenticationService"];
if (gridConfig != null)
{
string serviceUrl = gridConfig.GetString("AuthenticationServerURI");
if (!String.IsNullOrEmpty(serviceUrl))
{
if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
serviceUrl = serviceUrl + '/';
m_serverUrl = serviceUrl;
m_Enabled = true;
} }
} }
if (String.IsNullOrEmpty(m_serverUrl))
m_log.Info("[SIMIAN AUTH CONNECTOR]: No AuthenticationServerURI specified, disabling connector");
} }
public string Authenticate(UUID principalID, string password, int lifetime) public string Authenticate(UUID principalID, string password, int lifetime)

35
OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
View File

@ -74,7 +74,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
public SimianAvatarServiceConnector(IConfigSource source) public SimianAvatarServiceConnector(IConfigSource source)
{ {
Initialise(source); CommonInit(source);
} }
public void Initialise(IConfigSource source) public void Initialise(IConfigSource source)
@ -84,24 +84,27 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ {
string name = moduleConfig.GetString("AvatarServices", ""); string name = moduleConfig.GetString("AvatarServices", "");
if (name == Name) if (name == Name)
{ CommonInit(source);
IConfig gridConfig = source.Configs["AvatarService"]; }
if (gridConfig != null) }
{
string serviceUrl = gridConfig.GetString("AvatarServerURI");
if (!String.IsNullOrEmpty(serviceUrl))
{
if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
serviceUrl = serviceUrl + '/';
m_serverUrl = serviceUrl;
m_Enabled = true;
}
}
if (String.IsNullOrEmpty(m_serverUrl)) private void CommonInit(IConfigSource source)
m_log.Info("[SIMIAN AVATAR CONNECTOR]: No AvatarServerURI specified, disabling connector"); {
IConfig gridConfig = source.Configs["AvatarService"];
if (gridConfig != null)
{
string serviceUrl = gridConfig.GetString("AvatarServerURI");
if (!String.IsNullOrEmpty(serviceUrl))
{
if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
serviceUrl = serviceUrl + '/';
m_serverUrl = serviceUrl;
m_Enabled = true;
} }
} }
if (String.IsNullOrEmpty(m_serverUrl))
m_log.Info("[SIMIAN AVATAR CONNECTOR]: No AvatarServerURI specified, disabling connector");
} }
#region IAvatarService #region IAvatarService

35
OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
View File

@ -98,7 +98,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
public SimianGridServiceConnector(IConfigSource source) public SimianGridServiceConnector(IConfigSource source)
{ {
Initialise(source); CommonInit(source);
} }
public void Initialise(IConfigSource source) public void Initialise(IConfigSource source)
@ -108,24 +108,27 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ {
string name = moduleConfig.GetString("GridServices", ""); string name = moduleConfig.GetString("GridServices", "");
if (name == Name) if (name == Name)
{ CommonInit(source);
IConfig gridConfig = source.Configs["GridService"]; }
if (gridConfig != null) }
{
string serviceUrl = gridConfig.GetString("GridServerURI");
if (!String.IsNullOrEmpty(serviceUrl))
{
if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
serviceUrl = serviceUrl + '/';
m_serverUrl = serviceUrl;
m_Enabled = true;
}
}
if (String.IsNullOrEmpty(m_serverUrl)) private void CommonInit(IConfigSource source)
m_log.Info("[SIMIAN GRID CONNECTOR]: No GridServerURI specified, disabling connector"); {
IConfig gridConfig = source.Configs["GridService"];
if (gridConfig != null)
{
string serviceUrl = gridConfig.GetString("GridServerURI");
if (!String.IsNullOrEmpty(serviceUrl))
{
if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
serviceUrl = serviceUrl + '/';
m_serverUrl = serviceUrl;
m_Enabled = true;
} }
} }
if (String.IsNullOrEmpty(m_serverUrl))
m_log.Info("[SIMIAN GRID CONNECTOR]: No GridServerURI specified, disabling connector");
} }
#region IGridService #region IGridService

47
OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
View File

@ -88,7 +88,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
public SimianInventoryServiceConnector(IConfigSource source) public SimianInventoryServiceConnector(IConfigSource source)
{ {
Initialise(source); CommonInit(source);
} }
public void Initialise(IConfigSource source) public void Initialise(IConfigSource source)
@ -98,36 +98,39 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ {
string name = moduleConfig.GetString("InventoryServices", ""); string name = moduleConfig.GetString("InventoryServices", "");
if (name == Name) if (name == Name)
CommonInit(source);
}
}
private void CommonInit(IConfigSource source)
{
IConfig gridConfig = source.Configs["InventoryService"];
if (gridConfig != null)
{
string serviceUrl = gridConfig.GetString("InventoryServerURI");
if (!String.IsNullOrEmpty(serviceUrl))
{ {
IConfig gridConfig = source.Configs["InventoryService"]; if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
serviceUrl = serviceUrl + '/';
m_serverUrl = serviceUrl;
gridConfig = source.Configs["UserAccountService"];
if (gridConfig != null) if (gridConfig != null)
{ {
string serviceUrl = gridConfig.GetString("InventoryServerURI"); serviceUrl = gridConfig.GetString("UserAccountServerURI");
if (!String.IsNullOrEmpty(serviceUrl)) if (!String.IsNullOrEmpty(serviceUrl))
{ {
if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("=")) m_userServerUrl = serviceUrl;
serviceUrl = serviceUrl + '/'; m_Enabled = true;
m_serverUrl = serviceUrl;
gridConfig = source.Configs["UserAccountService"];
if (gridConfig != null)
{
serviceUrl = gridConfig.GetString("UserAccountServerURI");
if (!String.IsNullOrEmpty(serviceUrl))
{
m_userServerUrl = serviceUrl;
m_Enabled = true;
}
}
} }
} }
if (String.IsNullOrEmpty(m_serverUrl))
m_log.Info("[SIMIAN INVENTORY CONNECTOR]: No InventoryServerURI specified, disabling connector");
else if (String.IsNullOrEmpty(m_userServerUrl))
m_log.Info("[SIMIAN INVENTORY CONNECTOR]: No UserAccountServerURI specified, disabling connector");
} }
} }
if (String.IsNullOrEmpty(m_serverUrl))
m_log.Info("[SIMIAN INVENTORY CONNECTOR]: No InventoryServerURI specified, disabling connector");
else if (String.IsNullOrEmpty(m_userServerUrl))
m_log.Info("[SIMIAN INVENTORY CONNECTOR]: No UserAccountServerURI specified, disabling connector");
} }
/// <summary> /// <summary>

35
OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
View File

@ -99,7 +99,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
public SimianPresenceServiceConnector(IConfigSource source) public SimianPresenceServiceConnector(IConfigSource source)
{ {
Initialise(source); CommonInit(source);
} }
public void Initialise(IConfigSource source) public void Initialise(IConfigSource source)
@ -109,24 +109,27 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ {
string name = moduleConfig.GetString("PresenceServices", ""); string name = moduleConfig.GetString("PresenceServices", "");
if (name == Name) if (name == Name)
{ CommonInit(source);
IConfig gridConfig = source.Configs["PresenceService"]; }
if (gridConfig != null) }
{
string serviceUrl = gridConfig.GetString("PresenceServerURI");
if (!String.IsNullOrEmpty(serviceUrl))
{
if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
serviceUrl = serviceUrl + '/';
m_serverUrl = serviceUrl;
m_Enabled = true;
}
}
if (String.IsNullOrEmpty(m_serverUrl)) private void CommonInit(IConfigSource source)
m_log.Info("[SIMIAN PRESENCE CONNECTOR]: No PresenceServerURI specified, disabling connector"); {
IConfig gridConfig = source.Configs["PresenceService"];
if (gridConfig != null)
{
string serviceUrl = gridConfig.GetString("PresenceServerURI");
if (!String.IsNullOrEmpty(serviceUrl))
{
if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
serviceUrl = serviceUrl + '/';
m_serverUrl = serviceUrl;
m_Enabled = true;
} }
} }
if (String.IsNullOrEmpty(m_serverUrl))
m_log.Info("[SIMIAN PRESENCE CONNECTOR]: No PresenceServerURI specified, disabling connector");
} }
#region IPresenceService #region IPresenceService

35
OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
View File

@ -73,7 +73,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
public SimianUserAccountServiceConnector(IConfigSource source) public SimianUserAccountServiceConnector(IConfigSource source)
{ {
Initialise(source); CommonInit(source);
} }
public void Initialise(IConfigSource source) public void Initialise(IConfigSource source)
@ -83,24 +83,27 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ {
string name = moduleConfig.GetString("UserAccountServices", ""); string name = moduleConfig.GetString("UserAccountServices", "");
if (name == Name) if (name == Name)
{ CommonInit(source);
IConfig gridConfig = source.Configs["UserAccountService"]; }
if (gridConfig != null) }
{
string serviceUrl = gridConfig.GetString("UserAccountServerURI");
if (!String.IsNullOrEmpty(serviceUrl))
{
if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
serviceUrl = serviceUrl + '/';
m_serverUrl = serviceUrl;
m_Enabled = true;
}
}
if (String.IsNullOrEmpty(m_serverUrl)) private void CommonInit(IConfigSource source)
m_log.Info("[SIMIAN ACCOUNT CONNECTOR]: No UserAccountServerURI specified, disabling connector"); {
IConfig gridConfig = source.Configs["UserAccountService"];
if (gridConfig != null)
{
string serviceUrl = gridConfig.GetString("UserAccountServerURI");
if (!String.IsNullOrEmpty(serviceUrl))
{
if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
serviceUrl = serviceUrl + '/';
m_serverUrl = serviceUrl;
m_Enabled = true;
} }
} }
if (String.IsNullOrEmpty(m_serverUrl))
m_log.Info("[SIMIAN ACCOUNT CONNECTOR]: No UserAccountServerURI specified, disabling connector");
} }
public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName) public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)