From 8ff1d0968ff3c4173b036398359ef62a356ad2b2 Mon Sep 17 00:00:00 2001 From: mingchen Date: Tue, 26 Jun 2007 17:50:27 +0000 Subject: *Added support for reservations in OpenGridServices (mysql only for now) *SQL file coming soon (as soon as I can figure out how to get the --- .../OpenGrid.Framework.Data.DB4o/DB4oGridData.cs | 5 +++ Common/OpenGrid.Framework.Data/GridData.cs | 3 ++ .../OpenGrid.Framework.Data.csproj | 34 +++++++++------ Common/OpenGrid.Framework.Data/ReservationData.cs | 51 ++++++++++++++++++++++ 4 files changed, 80 insertions(+), 13 deletions(-) create mode 100644 Common/OpenGrid.Framework.Data/ReservationData.cs (limited to 'Common') diff --git a/Common/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs b/Common/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs index 2b23131..0e73ab2 100644 --- a/Common/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs +++ b/Common/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs @@ -157,5 +157,10 @@ namespace OpenGrid.Framework.Data.DB4o { return "0.1"; } + + public ReservationData GetReservationAtPoint(uint x, uint y) + { + return null; + } } } diff --git a/Common/OpenGrid.Framework.Data/GridData.cs b/Common/OpenGrid.Framework.Data/GridData.cs index e9fb215..b2cce78 100644 --- a/Common/OpenGrid.Framework.Data/GridData.cs +++ b/Common/OpenGrid.Framework.Data/GridData.cs @@ -106,5 +106,8 @@ namespace OpenGrid.Framework.Data /// The profile to add /// RESPONSE_OK if successful, error if not. DataResponse AddProfile(SimProfileData profile); + + ReservationData GetReservationAtPoint(uint x, uint y); + } } diff --git a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj index 0b53b02..d99b012 100644 --- a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj +++ b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj @@ -1,4 +1,4 @@ - + Local 8.0.50727 @@ -6,7 +6,8 @@ {62CDF671-0000-0000-0000-000000000000} Debug AnyCPU - + + OpenGrid.Framework.Data @@ -15,9 +16,11 @@ IE50 false Library - + + OpenGrid.Framework.Data - + + @@ -28,7 +31,8 @@ TRACE;DEBUG - + + True 4096 False @@ -37,7 +41,8 @@ False False 4 - + + False @@ -46,7 +51,8 @@ TRACE - + + False 4096 True @@ -55,22 +61,23 @@ False False 4 - + + - + ..\..\bin\libsecondlife.dll False - + System.dll False - + System.Data.dll False - + System.Xml.dll False @@ -90,6 +97,7 @@ Code + Code @@ -110,4 +118,4 @@ - + \ No newline at end of file diff --git a/Common/OpenGrid.Framework.Data/ReservationData.cs b/Common/OpenGrid.Framework.Data/ReservationData.cs new file mode 100644 index 0000000..89c6105 --- /dev/null +++ b/Common/OpenGrid.Framework.Data/ReservationData.cs @@ -0,0 +1,51 @@ +/* +* Copyright (c) Contributors, http://www.openmetaverse.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 System.Collections.Generic; +using System.Text; + +using libsecondlife; + +namespace OpenGrid.Framework.Data +{ + public class ReservationData + { + public LLUUID userUUID = new LLUUID(); + public int reservationMinX = 0; + public int reservationMinY = 0; + public int reservationMaxX = 65536; + public int reservationMaxY = 65536; + + public string reservationName = ""; + public string reservationCompany = ""; + public bool status = true; + + public string gridSendKey = ""; + public string gridRecvKey = ""; + } +} -- cgit v1.1