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

Move the connectors under services for reasons of application logic. Remove 

the user server skeleton in preparation for introducing a generic server
0.6.6-post-fixes
Melanie Thielker 2009-05-18 11:43:37 +00:00
parent e3f2cfa1ca
commit cb2ce61876
7 changed files with 10 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,7 @@ using System.Collections.Generic;
using System.Reflection;
using Nini.Config;
using OpenSim.Framework;
using OpenSim.Servers.Connectors;
using OpenSim.Services.Connectors;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces;

5
OpenSim/Servers/Base/ServicesServerBase.cs
View File

@ -125,7 +125,10 @@ namespace OpenSim.Servers.Base
// Refresh the startupConfig post merge
//
startupConfig = argvConfig.Configs["Startup"];
if (m_Config.Configs["Startup"] != null)
{
startupConfig = m_Config.Configs["Startup"];
}
// Allow derived classes to load config before the console is
// opened.

57
OpenSim/Servers/UserServer/UserServerConnector.cs
View File

@ -1,57 +0,0 @@
/*
* Copyright (c) Contributors, http://opensimulator.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 Nini.Config;
using OpenSim.Servers.Base;
using OpenSim.Services.Interfaces;
using OpenSim.Framework.Servers.HttpServer;
namespace OpenSim.Servers.UserServer
{
public class UserServiceConnector
{
private IUserService m_UserService;
public UserServiceConnector(IConfigSource config, IHttpServer server)
{
IConfig serverConfig = config.Configs["UserService"];
if (serverConfig == null)
throw new Exception("No section 'Server' in config file");
string userService = serverConfig.GetString("LocalServiceModule",
String.Empty);
if (userService == String.Empty)
throw new Exception("No UserService in config file");
Object[] args = new Object[] { config };
m_UserService =
ServerUtils.LoadPlugin<IUserService>(userService, args);
}
}
}

49
OpenSim/Servers/UserServer/UserServerMain.cs
View File

@ -1,49 +0,0 @@
/*
* Copyright (c) Contributors, http://opensimulator.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 OpenSim.Servers.Base;
namespace OpenSim.Servers.UserServer
{
public class UserServer
{
protected static HttpServerBase m_Server = null;
protected static UserServiceConnector m_UserServiceConnector;
static int Main(string[] args)
{
m_Server = new HttpServerBase("User", args);
m_UserServiceConnector = new UserServiceConnector(m_Server.Config,
m_Server.HttpServer);
return m_Server.Run();
}
}
}

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

@ -31,8 +31,8 @@ using System;
using System.Collections.Generic;
using System.Reflection;
using OpenSim.Framework;
using OpenSim.Servers.Connectors;
using OpenSim.Services.Interfaces;
using OpenSim.Services.Connectors;
namespace OpenSim.Services.AssetService
{

2
OpenSim/Servers/Connectors/Asset/AssetServiceConnector.cs → OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
View File

@ -36,7 +36,7 @@ using OpenSim.Framework.Communications;
using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Services.Interfaces;
namespace OpenSim.Servers.Connectors
namespace OpenSim.Services.Connectors
{
public class AssetServicesConnector : IAssetService
{

36
prebuild.xml
View File

@ -1297,7 +1297,7 @@
</Files>
</Project>
<Project name="OpenSim.Servers.Connectors" path="OpenSim/Servers/Connectors" type="Library">
<Project name="OpenSim.Services.Connectors" path="OpenSim/Services/Connectors" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@ -1349,7 +1349,7 @@
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
<Reference name="OpenSim.Services.Interfaces"/>
<Reference name="OpenSim.Services.Base"/>
<Reference name="OpenSim.Servers.Connectors"/>
<Reference name="OpenSim.Services.Connectors"/>
<Reference name="OpenSim.Data"/>
<Reference name="Nini.dll" />
<Reference name="log4net.dll"/>
@ -1387,36 +1387,6 @@
</Files>
</Project>
<Project name="OpenSim.Servers.UserServer" path="OpenSim/Servers/UserServer" type="Exe">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
</Options>
</Configuration>
<Configuration name="Release">
<Options>
<OutputPath>../../../bin/</OutputPath>
</Options>
</Configuration>
<ReferencePath>../../../bin/</ReferencePath>
<Reference name="System"/>
<Reference name="OpenMetaverseTypes.dll"/>
<Reference name="OpenMetaverse.dll"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
<Reference name="OpenSim.Servers.Base"/>
<Reference name="OpenSim.Services.Base" />
<Reference name="OpenSim.Services.Interfaces"/>
<Reference name="Nini.dll" />
<Reference name="log4net.dll"/>
<Files>
<Match pattern="*.cs" recurse="true"/>
</Files>
</Project>
<Project name="OpenSim.Servers.AssetServer.Handlers" path="OpenSim/Servers/AssetServer/Handlers" type="Library">
<Configuration name="Debug">
<Options>
@ -1506,7 +1476,7 @@
<Reference name="OpenSim.Data" />
<Reference name="OpenSim.Region.Framework" />
<Reference name="OpenSim.Servers.Base" />
<Reference name="OpenSim.Servers.Connectors" />
<Reference name="OpenSim.Services.Connectors" />
<Reference name="OpenSim.Services.Base" />
<Reference name="OpenSim.Services.Interfaces" />
<Reference name="OpenSim.Framework.Serialization"/>