From 7daa3955bc3a1918e40962851f9e8d38597a245e Mon Sep 17 00:00:00 2001 From: gareth Date: Thu, 22 Mar 2007 10:11:15 +0000 Subject: brought zircon branch into trunk --- src/LocalServers/LocalGridServers/AssemblyInfo.cs | 21 -- src/LocalServers/LocalGridServers/LocalGrid.cs | 211 --------------------- .../LocalGridServers/LocalGridServers.csproj | 48 ----- src/LocalServers/default.build | 51 ----- 4 files changed, 331 deletions(-) delete mode 100644 src/LocalServers/LocalGridServers/AssemblyInfo.cs delete mode 100644 src/LocalServers/LocalGridServers/LocalGrid.cs delete mode 100644 src/LocalServers/LocalGridServers/LocalGridServers.csproj delete mode 100644 src/LocalServers/default.build (limited to 'src/LocalServers') diff --git a/src/LocalServers/LocalGridServers/AssemblyInfo.cs b/src/LocalServers/LocalGridServers/AssemblyInfo.cs deleted file mode 100644 index 4b17ba2..0000000 --- a/src/LocalServers/LocalGridServers/AssemblyInfo.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Reflection; -using System.Runtime.InteropServices; - -// ------------------------------------------------------------------------------ -// <autogenerated> -// This code was generated by a tool. -// Mono Runtime Version: 2.0.50727.42 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// </autogenerated> -// ------------------------------------------------------------------------------ - -[assembly: ComVisibleAttribute(false)] -[assembly: CLSCompliantAttribute(false)] -[assembly: AssemblyVersionAttribute("0.1.0.240")] -[assembly: AssemblyTitleAttribute("opensim-localservers")] -[assembly: AssemblyDescriptionAttribute("local grid servers")] -[assembly: AssemblyCopyrightAttribute("Copyright � OGS development team 2007")] - diff --git a/src/LocalServers/LocalGridServers/LocalGrid.cs b/src/LocalServers/LocalGridServers/LocalGrid.cs deleted file mode 100644 index bd377d3..0000000 --- a/src/LocalServers/LocalGridServers/LocalGrid.cs +++ /dev/null @@ -1,211 +0,0 @@ -/* -* Copyright (c) OpenSim project, http://sim.opensecondlife.org/ -* -* 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 <organization> 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 <copyright holder> ``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 <copyright holder> 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.Collections.Generic; -using System.Threading; -using OpenSim.GridServers; -using libsecondlife; - -namespace LocalGridServers -{ - /// <summary> - /// - /// </summary> - /// - public class LocalGridPlugin : IGridPlugin - { - public LocalGridPlugin() - { - - } - - public IGridServer GetGridServer() - { - return(new LocalGridServer()); - } - } - - public class LocalAssetPlugin : IAssetPlugin - { - public LocalAssetPlugin() - { - - } - - public IAssetServer GetAssetServer() - { - return(new LocalAssetServer()); - } - } - - public class LocalAssetServer : IAssetServer - { - private IAssetReceiver _receiver; - private BlockingQueue<ARequest> _assetRequests; - - public LocalAssetServer() - { - this._assetRequests = new BlockingQueue<ARequest>(); - ServerConsole.MainConsole.Instance.WriteLine("Local Asset Server class created"); - } - - public void SetReceiver(IAssetReceiver receiver) - { - this._receiver = receiver; - } - - public void RequestAsset(LLUUID assetID, bool isTexture) - { - ARequest req = new ARequest(); - req.AssetID = assetID; - req.IsTexture = isTexture; - //this._assetRequests.Enqueue(req); - } - - public void UpdateAsset(AssetBase asset) - { - - } - - public void UploadNewAsset(AssetBase asset) - { - - } - - public void SetServerInfo(string ServerUrl, string SendKey) - { - - } - - private void RunRequests() - { - while(true) - { - Thread.Sleep(1000); - } - } - } - - public class LocalGridServer : LocalGridBase - { - public List<Login> Sessions = new List<Login>(); - - public LocalGridServer() - { - Sessions = new List<Login>(); - ServerConsole.MainConsole.Instance.WriteLine("Local Grid Server class created"); - } - - public override string GetName() - { - return "Local"; - } - - public override bool RequestConnection() - { - return true; - } - public override AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode) - { - //we are running local - AuthenticateResponse user = new AuthenticateResponse(); - - lock(this.Sessions) - { - - for(int i = 0; i < Sessions.Count; i++) - { - if((Sessions[i].Agent == agentID) && (Sessions[i].Session == sessionID)) - { - user.Authorised = true; - user.LoginInfo = Sessions[i]; - } - } - } - return(user); - } - - public override bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode) - { - return(true); - } - - public override UUIDBlock RequestUUIDBlock() - { - UUIDBlock uuidBlock = new UUIDBlock(); - return(uuidBlock); - } - - public override neighbourinfo[] RequestNeighbours(ulong regionhandle) - { - return new neighbourinfo[8]; - } - - public override void SetServerInfo(string GridServerUrl, string GridSendKey, string GridRecvKey, string UserServerUrl, string UserSendKey, string UserRecvKey) - { - - } - - /// <summary> - /// used by the local login server to inform us of new sessions - /// </summary> - /// <param name="session"></param> - public override void AddNewSession(Login session) - { - lock(this.Sessions) - { - this.Sessions.Add(session); - } - } - } - - public class BlockingQueue< T > { - private Queue< T > _queue = new Queue< T >(); - private object _queueSync = new object(); - - public void Enqueue(T value) - { - lock(_queueSync) - { - _queue.Enqueue(value); - Monitor.Pulse(_queueSync); - } - } - - public T Dequeue() - { - lock(_queueSync) - { - if( _queue.Count < 1) - Monitor.Wait(_queueSync); - - return _queue.Dequeue(); - } - } - } - -} diff --git a/src/LocalServers/LocalGridServers/LocalGridServers.csproj b/src/LocalServers/LocalGridServers/LocalGridServers.csproj deleted file mode 100644 index 7a5ce3d..0000000 --- a/src/LocalServers/LocalGridServers/LocalGridServers.csproj +++ /dev/null @@ -1,48 +0,0 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <OutputType>Library</OutputType> - <RootNamespace>LocalGridServers</RootNamespace> - <AssemblyName>LocalGridServers</AssemblyName> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{D7F0395B-FADC-4936-80A0-D95AACE92F62}</ProjectGuid> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> - <OutputPath>bin\Debug\</OutputPath> - <Optimize>False</Optimize> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <DebugSymbols>True</DebugSymbols> - <DebugType>Full</DebugType> - <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)' == 'Release' "> - <OutputPath>bin\Release\</OutputPath> - <Optimize>True</Optimize> - <DefineConstants>TRACE</DefineConstants> - <DebugSymbols>False</DebugSymbols> - <DebugType>None</DebugType> - <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> - </PropertyGroup> - <ItemGroup> - <Reference Include="System" /> - <Reference Include="System.Xml" /> - <Reference Include="libsecondlife"> - <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> - <SpecificVersion>False</SpecificVersion> - </Reference> - </ItemGroup> - <ItemGroup> - <Compile Include="LocalGrid.cs" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\ServerConsole\ServerConsole\ServerConsole.csproj"> - <Project>{C9A6026D-8E0C-4FE4-8691-FB2A566AA245}</Project> - <Name>ServerConsole</Name> - </ProjectReference> - <ProjectReference Include="..\..\GridInterfaces\GridInterfaces.csproj"> - <Project>{5DA3174D-42F9-416D-9F0B-AF41FA2BE2F9}</Project> - <Name>GridInterfaces</Name> - </ProjectReference> - </ItemGroup> - <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" /> -</Project> \ No newline at end of file diff --git a/src/LocalServers/default.build b/src/LocalServers/default.build deleted file mode 100644 index 14c52cd..0000000 --- a/src/LocalServers/default.build +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0"?> - <project name="OpenSim" default="build" basedir="."> - <description>nant buildfile for OpenSim</description> - <property name="debug" value="true" overwrite="false" /> - <target name="clean" description="remove all generated files"> - <delete file="../../bin/LocalGridServers.dll" failonerror="false" /> - </target> - - <target name="svnupdate" description="updates to latest SVN"> - <exec program="svn"> - <arg value="update" /> - </exec> - </target> - - <target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build"> - - </target> - - <target name="build" description="compiles the source code"> - - <loadfile file="../../VERSION" property="svnver"/> - <asminfo output="LocalGridServers/AssemblyInfo.cs" language="CSharp"> - <imports> - <import namespace="System" /> - <import namespace="System.Reflection" /> - <import namespace="System.Runtime.InteropServices" /> - </imports> - <attributes> - <attribute type="ComVisibleAttribute" value="false" /> - <attribute type="CLSCompliantAttribute" value="false" /> - <attribute type="AssemblyVersionAttribute" value="${svnver}" /> - <attribute type="AssemblyTitleAttribute" value="opensim-localservers" /> - <attribute type="AssemblyDescriptionAttribute" value="local grid servers" /> - <attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/> - </attributes> - </asminfo> - - <csc target="library" output="../../bin/LocalGridServers.dll" debug="${debug}" verbose="true" warninglevel="4"> - <references basedir="../../bin" failonempty="true"> - <include name="System.dll" /> - <include name="System.Xml.dll" /> - <include name="libsecondlife.dll" /> - <include name="GridInterfaces.dll" /> - <include name="ServerConsole.dll" /> - </references> - <sources basedir="LocalGridServers/"> - <include name="*.cs" /> - </sources> - </csc> - </target> -</project> -- cgit v1.1