brought zircon branch into trunk

OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs

@@ -0,0 +1,31 @@
+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.*")]

OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs

@@ -0,0 +1,126 @@
+/*
+* 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.Assets;
+
+namespace OpenSim.Storage.LocalStorageDb4o
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public class Db4LocalStorage : ILocalStorage
+	{
+		private IObjectContainer db;
+		
+		public Db4LocalStorage()
+		{
+			try 
+			{
+				db = Db4oFactory.OpenFile("localworld.yap");
+				OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Db4LocalStorage creation");
+			}
+			catch(Exception e) 
+			{
+				db.Close();
+				OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Db4LocalStorage :Constructor - Exception occured");
+				OpenSim.Framework.Console.MainConsole.Instance.WriteLine(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("Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is "+result.Count);
+			foreach (PrimData prim in result) {
+				receiver.PrimFromStorage(prim);
+			}
+		}
+		
+		public void ShutDown()
+		{
+			db.Commit();
+			db.Close();
+		}
+	}
+}

OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj

@@ -0,0 +1,104 @@
+<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>{2B5E9FF0-DE71-41DA-AC6A-B8E2D2D0AE09}</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>
+    </Reference>
+    <Reference Include="System.Xml.dll" >
+      <HintPath>\System.Xml.dll.dll</HintPath>
+    </Reference>
+    <Reference Include="Db4objects.Db4o.dll" >
+      <HintPath>\Db4objects.Db4o.dll.dll</HintPath>
+    </Reference>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>\libsecondlife.dll.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{1D2865A9-CF8E-45F7-B96D-91ED128A32CF}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+    </ProjectReference>
+    <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
+      <Name>OpenSim.Framework.Console</Name>
+      <Project>{C8405E1A-EC19-48B6-9C8C-CA03624B9916}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Db4LocalStorage.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>

OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build

@@ -0,0 +1,46 @@
+<?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="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.dll" />
+                <include name="../../bin/Db4objects.Db4o.dll" />
+                <include name="../../bin/libsecondlife.dll" />
+                <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" />
+                <include name="../../OpenSim.Framework.Console/${build.dir}/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>

OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs

@@ -0,0 +1,25 @@
+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.Assets;
+
+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);
+        }
+    }
+}