From 3376b82501000692d6dac24b051af738cdaf2737 Mon Sep 17 00:00:00 2001
From: MW
Date: Thu, 24 May 2007 12:16:50 +0000
Subject: Some more code refactoring, plus a restructuring of the directories
 so that the Grid servers can be a separate solution to the region server.

---
 OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs   |  31 ----
 .../LocalStorageDb4o/Db4LocalStorage.cs            | 182 ---------------------
 OpenSim.Storage/LocalStorageDb4o/MapStorage.cs     |  16 --
 .../OpenSim.Storage.LocalStorageDb4o.csproj        | 113 -------------
 .../OpenSim.Storage.LocalStorageDb4o.dll.build     |  47 ------
 OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs      |  25 ---
 6 files changed, 414 deletions(-)
 delete mode 100644 OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs
 delete mode 100644 OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
 delete mode 100644 OpenSim.Storage/LocalStorageDb4o/MapStorage.cs
 delete mode 100644 OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
 delete mode 100644 OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
 delete mode 100644 OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs

(limited to 'OpenSim.Storage/LocalStorageDb4o')

diff --git a/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs b/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs
deleted file mode 100644
index 6610606..0000000
--- a/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("Db4LocalStorage")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Db4LocalStorage")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// This sets the default COM visibility of types in the assembly to invisible.
-// If you need to expose a type to COM, use [ComVisible(true)] on that type.
-[assembly: ComVisible(false)]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
diff --git a/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs b/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
deleted file mode 100644
index 5dceb7f..0000000
--- a/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
+++ /dev/null
@@ -1,182 +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 Db4objects.Db4o;
-using Db4objects.Db4o.Query;
-using libsecondlife;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Terrain;
-
-namespace OpenSim.Storage.LocalStorageDb4o
-{
-	/// <summary>
-	/// 
-	/// </summary>
-	public class Db4LocalStorage : ILocalStorage
-	{
-		private IObjectContainer db;
-        private string datastore;
-		
-		public Db4LocalStorage()
-		{
-			
-		}
-
-        public void Initialise(string dfile)
-        {
-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Db4LocalStorage Opening " + dfile);
-            datastore = dfile;
-            try
-            {
-                db = Db4oFactory.OpenFile(datastore);
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Db4LocalStorage creation");
-            }
-            catch (Exception e)
-            {
-                db.Close();
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Db4LocalStorage :Constructor - Exception occured");
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());
-            }
-        }
-		
-		public void StorePrim(PrimData prim)
-		{
-			IObjectSet result = db.Query(new UUIDQuery(prim.FullID));
-			if(result.Count>0)
-			{
-				//prim already in storage
-				//so update it
-				PrimData found = (PrimData) result.Next();
-				found.PathBegin = prim.PathBegin;
-				found.PathCurve= prim.PathCurve;
-				found.PathEnd = prim.PathEnd;
-				found.PathRadiusOffset = prim.PathRadiusOffset;
-				found.PathRevolutions = prim.PathRevolutions;
-				found.PathScaleX= prim.PathScaleX;
-				found.PathScaleY = prim.PathScaleY;
-				found.PathShearX = prim.PathShearX;
-				found.PathShearY = prim.PathShearY;
-				found.PathSkew = prim.PathSkew;
-				found.PathTaperX = prim.PathTaperX;
-				found.PathTaperY = prim.PathTaperY;
-				found.PathTwist = prim.PathTwist;
-				found.PathTwistBegin = prim.PathTwistBegin;
-				found.PCode = prim.PCode;
-				found.ProfileBegin = prim.ProfileBegin;
-				found.ProfileCurve = prim.ProfileCurve;
-				found.ProfileEnd = prim.ProfileEnd;
-				found.ProfileHollow = prim.ProfileHollow;
-				found.Position = prim.Position;
-				found.Rotation = prim.Rotation;
-                found.Texture = prim.Texture;
-				db.Set(found);
-				db.Commit();
-			}
-			else
-			{
-				//not in storage
-				db.Set(prim);
-				db.Commit();
-			}
-		}
-		
-		public void RemovePrim(LLUUID primID)
-		{
-			IObjectSet result = db.Query(new UUIDQuery(primID));
-			if(result.Count>0)
-			{
-				PrimData found = (PrimData) result.Next();
-				db.Delete(found);
-			}
-		}
-		
-		
-		public void LoadPrimitives(ILocalStorageReceiver receiver)
-		{
-			IObjectSet result = db.Get(typeof(PrimData));
-			OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is "+result.Count);
-			foreach (PrimData prim in result) {
-				receiver.PrimFromStorage(prim);
-			}
-		}
-
-        public float[] LoadWorld()
-        {
-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"LoadWorld() - Loading world....");
-            //World blank = new World();
-            float[] heightmap = null;
-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"LoadWorld() - Looking for a heightmap in local DB");
-            IObjectSet world_result = db.Get(typeof(MapStorage));
-            if (world_result.Count > 0)
-            {
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"LoadWorld() - Found a heightmap in local database, loading");
-                MapStorage map = (MapStorage)world_result.Next();
-                //blank.LandMap = map.Map;
-                heightmap = map.Map;
-            }
-            else
-            {
-                /*
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LoadWorld() - No heightmap found, generating new one");
-                HeightmapGenHills hills = new HeightmapGenHills();
-                // blank.LandMap = hills.GenerateHeightmap(200, 4.0f, 80.0f, false);
-               // heightmap = hills.GenerateHeightmap(200, 4.0f, 80.0f, false);
-                heightmap = new float[256, 256];
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LoadWorld() - Saving heightmap to local database");
-                MapStorage map = new MapStorage();
-                map.Map = heightmap; //blank.LandMap;
-                db.Set(map);
-                db.Commit();
-                 */
-            }
-            return heightmap;
-        }
-
-        public void SaveMap(float[] heightmap)
-        {
-            IObjectSet world_result = db.Get(typeof(MapStorage));
-            if (world_result.Count > 0)
-            {
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"SaveWorld() - updating saved copy of heightmap in local database");
-                MapStorage map = (MapStorage)world_result.Next();
-                db.Delete(map);
-            }
-            MapStorage map1 = new MapStorage();
-            map1.Map = heightmap; //OpenSim_Main.local_world.LandMap;
-            db.Set(map1);
-            db.Commit();
-        }
-
-		public void ShutDown()
-		{
-			db.Commit();
-			db.Close();
-		}
-	}
-}
diff --git a/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs b/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs
deleted file mode 100644
index db590ff..0000000
--- a/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.Storage.LocalStorageDb4o
-{
-    public class MapStorage
-    {
-        public float[] Map;
-
-        public MapStorage()
-        {
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
deleted file mode 100644
index 6504b77..0000000
--- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
+++ /dev/null
@@ -1,113 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E1B79ECF-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Storage.LocalStorageDb4o</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Storage.LocalStorageDb4o</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Db4objects.Db4o.dll" >
-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
-      <Name>OpenSim.Framework</Name>
-      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
-      <Name>OpenSim.Framework.Console</Name>
-      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Db4LocalStorage.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MapStorage.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UUIDQuery.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
deleted file mode 100644
index 8be321d..0000000
--- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OpenSim.Storage.LocalStorageDb4o" default="build">
-    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
-        </copy>
-        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
-                <include name="Db4LocalStorage.cs" />
-                <include name="MapStorage.cs" />
-                <include name="UUIDQuery.cs" />
-            </sources>
-            <references basedir="${project::get-base-directory()}">
-                <lib>
-                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
-                <include name="System.dll" />
-                <include name="System.Xml.dll" />
-                <include name="../../bin/Db4objects.Db4o.dll" />
-                <include name="../../bin/libsecondlife.dll" />
-                <include name="../../bin/OpenSim.Framework.dll" />
-                <include name="../../bin/OpenSim.Framework.Console.dll" />
-            </references>
-        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
-                <include name="*.exe"/>
-            </fileset>
-        </copy>
-    </target>
-    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
-    <target name="doc" description="Creates documentation.">
-    </target>
-</project>
diff --git a/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs b/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs
deleted file mode 100644
index ba9e139..0000000
--- a/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Db4objects.Db4o;
-using Db4objects.Db4o.Query;
-using libsecondlife;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-
-namespace OpenSim.Storage.LocalStorageDb4o
-{
-    public class UUIDQuery : Predicate
-    {
-        private LLUUID _findID;
-
-        public UUIDQuery(LLUUID find)
-        {
-            _findID = find;
-        }
-        public bool Match(PrimData prim)
-        {
-            return (prim.FullID == _findID);
-        }
-    }
-}
-- 
cgit v1.1