5 files changed, 31 insertions, 31 deletions

diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.r921 b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
index fa17367..4ba24f1 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.r921
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
@@ -3,20 +3,20 @@
     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{1E3F341A-0000-0000-0000-000000000000}</ProjectGuid>

+    <ProjectGuid>{6ECC56A9-0000-0000-0000-000000000000}</ProjectGuid>

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

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

     <ApplicationIcon></ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

-    <AssemblyName>OpenGrid.Framework.Data.SQLite</AssemblyName>

+    <AssemblyName>OpenSim.Framework.Data.SQLite</AssemblyName>

     <DefaultClientScript>JScript</DefaultClientScript>

     <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

     <AppDesignerFolder></AppDesignerFolder>

-    <RootNamespace>OpenGrid.Framework.Data.SQLite</RootNamespace>

+    <RootNamespace>OpenSim.Framework.Data.SQLite</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>

@@ -58,12 +58,12 @@
     <NoWarn></NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System" >

-      <HintPath>System.dll</HintPath>

+    <Reference Include="libsecondlife.dll" >

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

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml" >

-      <HintPath>System.Xml.dll</HintPath>

+    <Reference Include="System" >

+      <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

     <Reference Include="System.Data" >

@@ -71,27 +71,27 @@
       <Private>False</Private>

     </Reference>

     <Reference Include="System.Data.SQLite.dll" >

-      <HintPath>..\..\bin\System.Data.SQLite.dll</HintPath>

+      <HintPath>..\..\..\bin\System.Data.SQLite.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="libsecondlife.dll" >

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

+    <Reference Include="System.Xml" >

+      <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

-      <Name>OpenGrid.Framework.Data</Name>

-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">

+      <Name>OpenSim.Framework.Data</Name>

+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="SQLiteManager.cs">

+    <Compile Include="SQLiteGridData.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="SQLiteGridData.cs">

+    <Compile Include="SQLiteManager.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Properties\AssemblyInfo.cs">

diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
index 79b0edf..e28d0a6 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>

-<project name="OpenGrid.Framework.Data.SQLite" default="build">

+<project name="OpenSim.Framework.Data.SQLite" default="build">

     <target name="build">

         <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />

         <mkdir dir="${project::get-base-directory()}/${build.dir}" />

@@ -8,7 +8,7 @@
             </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="OpenGrid.Framework.Data.SQLite" dynamicprefix="true" >

+            <resources prefix="OpenSim.Framework.Data.SQLite" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

                 <include name="SQLiteGridData.cs" />

@@ -20,17 +20,17 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

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

-                <include name="../../bin/OpenGrid.Framework.Data.dll" />

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

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

                 <include name="System.dll" />

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

-                <include name="../../bin/System.Data.SQLite.dll" />

+                <include name="../../../bin/System.Data.SQLite.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/">

+        <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"/>

diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
index 57c4bae..f811825 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 

 // set of attributes. Change these attribute values to modify the information

 // associated with an assembly.

-[assembly: AssemblyTitle("OpenGrid.Framework.Data.SQLite")]

+[assembly: AssemblyTitle("OpenSim.Framework.Data.SQLite")]

 [assembly: AssemblyDescription("")]

 [assembly: AssemblyConfiguration("")]

 [assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("OpenGrid.Framework.Data.SQLite")]

+[assembly: AssemblyProduct("OpenSim.Framework.Data.SQLite")]

 [assembly: AssemblyCopyright("Copyright ©  2007")]

 [assembly: AssemblyTrademark("")]

 [assembly: AssemblyCulture("")]

diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
index d7a5a69..800e26c 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
@@ -28,9 +28,9 @@
 using System;

 using System.Collections.Generic;

 using System.Text;

-using OpenGrid.Framework.Data;

+using OpenSim.Framework.Data;

 

-namespace OpenGrid.Framework.Data.SQLite

+namespace OpenSim.Framework.Data.SQLite

 {

     /// <summary>

     /// A Grid Interface to the SQLite database

diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs b/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
index 9689356..b67b79c 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
@@ -32,9 +32,9 @@ using System.Data;
 

 using System.Data.SQLite;

 

-using OpenGrid.Framework.Data;

+using OpenSim.Framework.Data;

 

-namespace OpenGrid.Framework.Data.SQLite

+namespace OpenSim.Framework.Data.SQLite

 {

     class SQLiteManager

     {