4 files changed, 57 insertions, 11 deletions

diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
index ab3c34c..3bc6f25 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
+++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
@@ -39,7 +39,7 @@ using BerkeleyDb;
 using Kds.Serialization;

 using Kds.Serialization.Buffer;

 

-namespace OpenSim.Storage.LocalStorageBDB

+namespace OpenSim.Region.Storage.LocalStorageBDB

 {

     public class BDBLocalStorage : ILocalStorage

     {

diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj
index 417643f..b956c9b 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj
+++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj
@@ -3,20 +3,20 @@
     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{EE9E5D96-0000-0000-0000-000000000000}</ProjectGuid>

+    <ProjectGuid>{A4691E59-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ApplicationIcon></ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

-    <AssemblyName>OpenSim.Storage.LocalStorageBerkeleyDB</AssemblyName>

+    <AssemblyName>OpenSim.Region.Storage.LocalStorageBerkeleyDB</AssemblyName>

     <DefaultClientScript>JScript</DefaultClientScript>

     <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

     <AppDesignerFolder></AppDesignerFolder>

-    <RootNamespace>OpenSim.Storage.LocalStorageBerkeleyDB</RootNamespace>

+    <RootNamespace>OpenSim.Region.Storage.LocalStorageBerkeleyDB</RootNamespace>

     <StartupObject></StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

@@ -32,7 +32,7 @@
     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

-    <OutputPath>..\..\..\bin\</OutputPath>

+    <OutputPath>..\..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -50,7 +50,7 @@
     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

-    <OutputPath>..\..\..\bin\</OutputPath>

+    <OutputPath>..\..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -59,15 +59,15 @@
   </PropertyGroup>

   <ItemGroup>

     <Reference Include="Kds.Serialization.dll" >

-      <HintPath>..\..\..\bin\Kds.Serialization.dll</HintPath>

+      <HintPath>..\..\..\..\bin\Kds.Serialization.dll</HintPath>

       <Private>False</Private>

     </Reference>

     <Reference Include="libdb_dotNET43.dll" >

-      <HintPath>..\..\..\bin\libdb_dotNET43.dll</HintPath>

+      <HintPath>..\..\..\..\bin\libdb_dotNET43.dll</HintPath>

       <Private>False</Private>

     </Reference>

     <Reference Include="libsecondlife.dll" >

-      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>

+      <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

     <Reference Include="System" >

@@ -84,13 +84,13 @@
     </Reference>

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">

+    <ProjectReference Include="..\..\..\Framework\General\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="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">

+    <ProjectReference Include="..\..\..\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>

diff --git a/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build
new file mode 100644
index 0000000..20f5171
--- /dev/null
+++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build
@@ -0,0 +1,46 @@
+<?xml version="1.0" ?>

+<project name="OpenSim.Region.Storage.LocalStorageBerkeleyDB" 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.Region.Storage.LocalStorageBerkeleyDB" dynamicprefix="true" >

+            </resources>

+            <sources failonempty="true">

+                <include name="BDBLocalStorage.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="../../../../bin/Kds.Serialization.dll" />

+                <include name="../../../../bin/libdb_dotNET43.dll" />

+                <include name="../../../../bin/libsecondlife.dll" />

+                <include name="../../../../bin/OpenSim.Framework.dll" />

+                <include name="../../../../bin/OpenSim.Framework.Console.dll" />

+                <include name="System.dll" />

+                <include name="System.Data.dll" />

+                <include name="System.Xml.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/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
index bc2d8ec..bc2d8ec 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
+++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build