attempt to fix up all refernces to new directory structure

OpenSim/Data/AssetDataBase.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
 
-namespace OpenSim.Framework.Data
+namespace OpenSim.Data
 {
     public abstract class AssetDataBase : IAssetProvider
     {

OpenSim/Data/Base/BaseDataReader.cs

@@ -29,7 +29,7 @@ using System;
 using System.Data;
 using System.IO;
 
-namespace OpenSim.Framework.Data.Base
+namespace OpenSim.Data.Base
 {
     public abstract class BaseDataReader
     {

OpenSim/Data/Base/BaseDatabaseConnector.cs

@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
 
-namespace OpenSim.Framework.Data.Base
+namespace OpenSim.Data.Base
 {
     public abstract class BaseDatabaseConnector
     {

OpenSim/Data/Base/BaseFieldMapper.cs

@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Data.Common;
 
-namespace OpenSim.Framework.Data.Base
+namespace OpenSim.Data.Base
 {  
     public delegate TField ObjectGetAccessor<TObj, TField>(TObj obj);
     public delegate void ObjectSetAccessor<TObj, TField>(TObj obj, TField value);

OpenSim/Data/Base/BaseRowMapper.cs

@@ -25,9 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Framework.Data.Base;
+using OpenSim.Data.Base;
 
-namespace OpenSim.Framework.Data.Base
+namespace OpenSim.Data.Base
 {
     public abstract class BaseRowMapper
     {

OpenSim/Data/Base/BaseSchema.cs

@@ -26,9 +26,9 @@
  */
 
 using System.Collections.Generic;
-using OpenSim.Framework.Data.Base;
+using OpenSim.Data.Base;
 
-namespace OpenSim.Framework.Data.Base
+namespace OpenSim.Data.Base
 {
     public class BaseSchema
     {

OpenSim/Data/Base/BaseTableMapper.cs

@@ -28,9 +28,9 @@
 using System;
 using System.Data;
 using System.Data.Common;
-using OpenSim.Framework.Data.Base;
+using OpenSim.Data.Base;
 
-namespace OpenSim.Framework.Data.Base
+namespace OpenSim.Data.Base
 {
     public abstract class BaseTableMapper
     {

OpenSim/Data/Base/Properties/AssemblyInfo.cs

@@ -33,11 +33,11 @@ using System.Security;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
-[assembly : AssemblyTitle("OpenSim.Framework.Data.Base")]
+[assembly : AssemblyTitle("OpenSim.Data.Base")]
 [assembly : AssemblyDescription("Generic Database Abstraction Layer")]
 [assembly : AssemblyConfiguration("")]
 [assembly : AssemblyCompany("OpenSim Project (www.opensimulator.org)")]
-[assembly: AssemblyProduct("OpenSim.Framework.Data.Base")]
+[assembly: AssemblyProduct("OpenSim.Data.Base")]
 [assembly: AssemblyCopyright("Copyright (c) 2007 OpenSim Project (www.opensimulator.org)")]
 [assembly : AssemblyTrademark("")]
 [assembly : AssemblyCulture("")]

OpenSim/Data/DB4o/DB4oGridData.cs

@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using libsecondlife;
 
-namespace OpenSim.Framework.Data.DB4o
+namespace OpenSim.Data.DB4o
 {
     /// <summary>
     /// A grid server storage mechanism employing the DB4o database system

OpenSim/Data/DB4o/DB4oManager.cs

@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using Db4objects.Db4o;
 using libsecondlife;
 
-namespace OpenSim.Framework.Data.DB4o
+namespace OpenSim.Data.DB4o
 {
     /// <summary>
     /// A Database manager for Db4o

OpenSim/Data/DB4o/DB4oUserData.cs

@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.IO;
 using libsecondlife;
 
-namespace OpenSim.Framework.Data.DB4o
+namespace OpenSim.Data.DB4o
 {
     /// <summary>
     /// A User storage interface for the DB4o database system

OpenSim/Data/DB4o/Properties/AssemblyInfo.cs

@@ -32,11 +32,11 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
-[assembly : AssemblyTitle("OpenSim.Framework.Data.DB4o")]
+[assembly : AssemblyTitle("OpenSim.Data.DB4o")]
 [assembly : AssemblyDescription("")]
 [assembly : AssemblyConfiguration("")]
 [assembly : AssemblyCompany("")]
-[assembly : AssemblyProduct("OpenSim.Framework.Data.DB4o")]
+[assembly : AssemblyProduct("OpenSim.Data.DB4o")]
 [assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2008")]
 [assembly : AssemblyTrademark("")]
 [assembly : AssemblyCulture("")]

OpenSim/Data/DataStoreBase.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace OpenSim.Framework.Data
+namespace OpenSim.Data
 {
     public abstract class DataStoreBase
     {

OpenSim/Data/GridDataBase.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
 
-namespace OpenSim.Framework.Data
+namespace OpenSim.Data
 {
     public abstract class GridDataBase : IGridData
     {

OpenSim/Data/IGridData.cs

@@ -28,7 +28,7 @@
 using System.Collections.Generic;
 using libsecondlife;
 
-namespace OpenSim.Framework.Data
+namespace OpenSim.Data
 {  
     public enum DataResponse
     {

OpenSim/Data/ILogData.cs

@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Framework.Data
+namespace OpenSim.Data
 {
     /// <summary>
     /// The severity of an individual log message

OpenSim/Data/IniConfig.cs

@@ -33,7 +33,7 @@ using System.Text.RegularExpressions;
  http://alexpinsker.blogspot.com/2005/12/reading-ini-file-from-c_113432097333021549.html
  */
 
-namespace OpenSim.Framework.Data
+namespace OpenSim.Data
 {
     /// <summary>
     /// Parse settings from ini-like files

OpenSim/Data/InventoryDataBase.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace OpenSim.Framework.Data
+namespace OpenSim.Data
 {
     public abstract class InventoryDataBase
     {

OpenSim/Data/MSSQL/MSSQLAssetData.cs

@@ -32,7 +32,7 @@ using System.Data.SqlClient;
 using libsecondlife;
 using OpenSim.Framework.Console;
 
-namespace OpenSim.Framework.Data.MSSQL
+namespace OpenSim.Data.MSSQL
 {
     internal class MSSQLAssetData : AssetDataBase
     {

OpenSim/Data/MSSQL/MSSQLDataStore.cs

@@ -33,12 +33,12 @@ using System.IO;
 using libsecondlife;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Data;
+using OpenSim.Data;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
-using OpenSim.Framework.Data.MSSQL;
+using OpenSim.Data.MSSQL;
 
-namespace OpenSim.Framework.Data.MSSQL
+namespace OpenSim.Data.MSSQL
 {
     public class MSSQLDataStore : IRegionDataStore
     {

OpenSim/Data/MSSQL/MSSQLGridData.cs

@@ -33,7 +33,7 @@ using System.Text;
 using libsecondlife;
 using OpenSim.Framework.Console;
 
-namespace OpenSim.Framework.Data.MSSQL
+namespace OpenSim.Data.MSSQL
 {
     /// <summary>
     /// A grid data interface for Microsoft SQL Server

OpenSim/Data/MSSQL/MSSQLInventoryData.cs

@@ -32,7 +32,7 @@ using System.Data.SqlClient;
 using libsecondlife;
 using OpenSim.Framework.Console;
 
-namespace OpenSim.Framework.Data.MSSQL
+namespace OpenSim.Data.MSSQL
 {
     /// <summary>
     /// A MySQL interface for the inventory server

OpenSim/Data/MSSQL/MSSQLLogData.cs

@@ -28,7 +28,7 @@
 using System.Collections.Generic;
 using System.Data;
 
-namespace OpenSim.Framework.Data.MSSQL
+namespace OpenSim.Data.MSSQL
 {
     /// <summary>
     /// An interface to the log database for MySQL

OpenSim/Data/MSSQL/MSSQLManager.cs

@@ -34,7 +34,7 @@ using System.Reflection;
 using libsecondlife;
 using OpenSim.Framework.Console;
 
-namespace OpenSim.Framework.Data.MSSQL
+namespace OpenSim.Data.MSSQL
 {
     /// <summary>
     /// A management class for the MS SQL Storage Engine

OpenSim/Data/MSSQL/MSSQLUserData.cs

@@ -32,7 +32,7 @@ using System.Data.SqlClient;
 using libsecondlife;
 using OpenSim.Framework.Console;
 
-namespace OpenSim.Framework.Data.MSSQL
+namespace OpenSim.Data.MSSQL
 {
     /// <summary>
     /// A database interface class to a user profile storage system

OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs

@@ -32,11 +32,11 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
-[assembly : AssemblyTitle("OpenSim.Framework.Data.MSSQL")]
+[assembly : AssemblyTitle("OpenSim.Data.MSSQL")]
 [assembly : AssemblyDescription("")]
 [assembly : AssemblyConfiguration("")]
 [assembly : AssemblyCompany("")]
-[assembly : AssemblyProduct("OpenSim.Framework.Data.MSSQL")]
+[assembly : AssemblyProduct("OpenSim.Data.MSSQL")]
 [assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2008")]
 [assembly : AssemblyTrademark("")]
 [assembly : AssemblyCulture("")]

OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs

@@ -28,9 +28,9 @@
 using System;
 using System.Data.Common;
 using System.Data.SqlClient;
-using OpenSim.Framework.Data;
+using OpenSim.Data;
 
-namespace OpenSim.Framework.Data.MSSQLMapper
+namespace OpenSim.Data.MSSQLMapper
 {
     public class MSSQLDatabaseMapper : OpenSimDatabaseConnector
     {

OpenSim/Data/MapperFactory/DataMapperFactory.cs

@@ -1,9 +1,9 @@
 using System;
-using OpenSim.Framework.Data.Base;
+using OpenSim.Data.Base;
-using OpenSim.Framework.Data.MSSQLMapper;
+using OpenSim.Data.MSSQLMapper;
-using OpenSim.Framework.Data.MySQLMapper;
+using OpenSim.Data.MySQLMapper;
 
-namespace OpenSim.Framework.Data.MapperFactory
+namespace OpenSim.Data.MapperFactory
 {
     public class DataMapperFactory
     {

OpenSim/Data/MySQL/MySQLAssetData.cs

@@ -32,7 +32,7 @@ using libsecondlife;
 using MySql.Data.MySqlClient;
 using OpenSim.Framework.Console;
 
-namespace OpenSim.Framework.Data.MySQL
+namespace OpenSim.Data.MySQL
 {
     internal class MySQLAssetData : AssetDataBase, IPlugin
     {

OpenSim/Data/MySQL/MySQLDataStore.cs

@@ -36,7 +36,7 @@ using OpenSim.Framework.Console;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 
-namespace OpenSim.Framework.Data.MySQL
+namespace OpenSim.Data.MySQL
 {
     public class MySQLDataStore : IRegionDataStore
     {

OpenSim/Data/MySQL/MySQLGridData.cs

@@ -34,7 +34,7 @@ using System.Text.RegularExpressions;
 using libsecondlife;
 using OpenSim.Framework.Console;
 
-namespace OpenSim.Framework.Data.MySQL
+namespace OpenSim.Data.MySQL
 {
     /// <summary>
     /// A MySQL Interface for the Grid Server

OpenSim/Data/MySQL/MySQLInventoryData.cs

@@ -31,7 +31,7 @@ using libsecondlife;
 using MySql.Data.MySqlClient;
 using OpenSim.Framework.Console;
 
-namespace OpenSim.Framework.Data.MySQL
+namespace OpenSim.Data.MySQL
 {
     /// <summary>
     /// A MySQL interface for the inventory server

OpenSim/Data/MySQL/MySQLLogData.cs

@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Framework.Data.MySQL
+namespace OpenSim.Data.MySQL
 {
     /// <summary>
     /// An interface to the log database for MySQL

OpenSim/Data/MySQL/MySQLManager.cs

@@ -35,7 +35,7 @@ using libsecondlife;
 using MySql.Data.MySqlClient;
 using OpenSim.Framework.Console;
 
-namespace OpenSim.Framework.Data.MySQL
+namespace OpenSim.Data.MySQL
 {
     /// <summary>
     /// A MySQL Database manager

OpenSim/Data/MySQL/MySQLUserData.cs

@@ -32,7 +32,7 @@ using System.Text.RegularExpressions;
 using libsecondlife;
 using OpenSim.Framework.Console;
 
-namespace OpenSim.Framework.Data.MySQL
+namespace OpenSim.Data.MySQL
 {
     /// <summary>
     /// A database interface class to a user profile storage system

OpenSim/Data/MySQL/Properties/AssemblyInfo.cs

@@ -32,11 +32,11 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
-[assembly : AssemblyTitle("OpenSim.Framework.Data.MySQL")]
+[assembly : AssemblyTitle("OpenSim.Data.MySQL")]
 [assembly : AssemblyDescription("")]
 [assembly : AssemblyConfiguration("")]
 [assembly : AssemblyCompany("")]
-[assembly : AssemblyProduct("OpenSim.Framework.Data.MySQL")]
+[assembly : AssemblyProduct("OpenSim.Data.MySQL")]
 [assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2008")]
 [assembly : AssemblyTrademark("")]
 [assembly : AssemblyCulture("")]

OpenSim/Data/MySQLMapper/MySQLDataReader.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Text;
-using OpenSim.Framework.Data.Base;
+using OpenSim.Data.Base;
 
-namespace OpenSim.Framework.Data.MySQLMapper
+namespace OpenSim.Data.MySQLMapper
 {
     public class MySQLDataReader : OpenSimDataReader
     {

OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs

@@ -28,10 +28,10 @@
 using System.Data;
 using System.Data.Common;
 using MySql.Data.MySqlClient;
-using OpenSim.Framework.Data;
+using OpenSim.Data;
-using OpenSim.Framework.Data.Base;
+using OpenSim.Data.Base;
 
-namespace OpenSim.Framework.Data.MySQLMapper
+namespace OpenSim.Data.MySQLMapper
 {
     public class MySQLDatabaseMapper : OpenSimDatabaseConnector
     {

OpenSim/Data/OpenSimDataReader.cs

@@ -28,9 +28,9 @@
 using System;
 using System.Data;
 using libsecondlife;
-using OpenSim.Framework.Data.Base;
+using OpenSim.Data.Base;
 
-namespace OpenSim.Framework.Data
+namespace OpenSim.Data
 {
     public class OpenSimDataReader : BaseDataReader
     {

OpenSim/Data/OpenSimDatabaseConnector.cs

@@ -29,9 +29,9 @@ using System.Data;
 using System.Data.Common;
 using libsecondlife;
 
-using OpenSim.Framework.Data.Base;
+using OpenSim.Data.Base;
 
-namespace OpenSim.Framework.Data
+namespace OpenSim.Data
 {
     public abstract class OpenSimDatabaseConnector : BaseDatabaseConnector
     {

OpenSim/Data/OpenSimObjectFieldMapper.cs

@@ -31,9 +31,9 @@ using System.Data.Common;
 using System.Text;
 using libsecondlife;
 
-using OpenSim.Framework.Data.Base;
+using OpenSim.Data.Base;
 
-namespace OpenSim.Framework.Data
+namespace OpenSim.Data
 {
     public class OpenSimObjectFieldMapper<TObject, TField> : ObjectField<TObject, TField>
     {

OpenSim/Data/OpenSimTableMapper.cs

@@ -27,9 +27,9 @@
 
 using System.Data;
 
-using OpenSim.Framework.Data.Base;
+using OpenSim.Data.Base;
 
-namespace OpenSim.Framework.Data
+namespace OpenSim.Data
 {
     public abstract class OpenSimTableMapper<TRowMapper, TPrimaryKey> : BaseTableMapper<TRowMapper, TPrimaryKey>
     {

OpenSim/Data/PrimitiveBaseShapeTableMapper.cs

@@ -27,10 +27,10 @@
 
 using System;
 using OpenSim.Framework;
-using OpenSim.Framework.Data.Base;
+using OpenSim.Data.Base;
 using libsecondlife;
 
-namespace OpenSim.Framework.Data
+namespace OpenSim.Data
 {
     public class PrimitiveBaseShapeRowMapper : BaseRowMapper<PrimitiveBaseShape>
     {

OpenSim/Data/Properties/AssemblyInfo.cs

@@ -32,11 +32,11 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
-[assembly : AssemblyTitle("OpenSim.Framework.Data")]
+[assembly : AssemblyTitle("OpenSim.Data")]
 [assembly : AssemblyDescription("")]
 [assembly : AssemblyConfiguration("")]
 [assembly : AssemblyCompany("")]
-[assembly : AssemblyProduct("OpenSim.Framework.Data")]
+[assembly : AssemblyProduct("OpenSim.Data")]
 [assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2008")]
 [assembly : AssemblyTrademark("")]
 [assembly : AssemblyCulture("")]

OpenSim/Data/RegionProfileData.cs

@@ -30,7 +30,7 @@ using System.Collections;
 using libsecondlife;
 using Nwc.XmlRpc;
 
-namespace OpenSim.Framework.Data
+namespace OpenSim.Data
 {
     /// <summary>
     /// A class which contains information known to the grid server about a region

OpenSim/Data/ReservationData.cs

@@ -27,7 +27,7 @@
 
 using libsecondlife;
 
-namespace OpenSim.Framework.Data
+namespace OpenSim.Data
 {
     public class ReservationData
     {

OpenSim/Data/SQLite/Properties/AssemblyInfo.cs

@@ -32,11 +32,11 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
-[assembly : AssemblyTitle("OpenSim.Framework.Data.SQLite")]
+[assembly : AssemblyTitle("OpenSim.Data.SQLite")]
 [assembly : AssemblyDescription("")]
 [assembly : AssemblyConfiguration("")]
 [assembly : AssemblyCompany("")]
-[assembly : AssemblyProduct("OpenSim.Framework.Data.SQLite")]
+[assembly : AssemblyProduct("OpenSim.Data.SQLite")]
 [assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2008")]
 [assembly : AssemblyTrademark("")]
 [assembly : AssemblyCulture("")]

OpenSim/Data/SQLite/SQLiteAssetData.cs

@@ -32,7 +32,7 @@ using libsecondlife;
 using Mono.Data.SqliteClient;
 using OpenSim.Framework.Console;
 
-namespace OpenSim.Framework.Data.SQLite
+namespace OpenSim.Data.SQLite
 {
     /// <summary>
     /// A User storage interface for the DB4o database system

OpenSim/Data/SQLite/SQLiteGridData.cs

@@ -32,7 +32,7 @@ using System.Security.Cryptography;
 using System.Text;
 using libsecondlife;
 
-namespace OpenSim.Framework.Data.SQLite
+namespace OpenSim.Data.SQLite
 {
     /// <summary>
     /// A Grid Interface to the SQLite database

OpenSim/Data/SQLite/SQLiteInventoryStore.cs

@@ -33,7 +33,7 @@ using libsecondlife;
 using Mono.Data.SqliteClient;
 using OpenSim.Framework.Console;
 
-namespace OpenSim.Framework.Data.SQLite
+namespace OpenSim.Data.SQLite
 {
     public class SQLiteInventoryStore : SQLiteUtil, IInventoryData
     {

OpenSim/Data/SQLite/SQLiteManager.cs

@@ -33,7 +33,7 @@ using libsecondlife;
 using Mono.Data.SqliteClient;
 using OpenSim.Framework.Console;
 
-namespace OpenSim.Framework.Data.SQLite
+namespace OpenSim.Data.SQLite
 {
     internal class SQLiteManager : SQLiteUtil
     {

OpenSim/Data/SQLite/SQLiteRegionData.cs

@@ -36,7 +36,7 @@ using OpenSim.Framework.Console;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 
-namespace OpenSim.Framework.Data.SQLite
+namespace OpenSim.Data.SQLite
 {
     public class SQLiteRegionData : IRegionDataStore
     {

OpenSim/Data/SQLite/SQLiteUserData.cs

@@ -32,7 +32,7 @@ using libsecondlife;
 using Mono.Data.SqliteClient;
 using OpenSim.Framework.Console;
 
-namespace OpenSim.Framework.Data.SQLite
+namespace OpenSim.Data.SQLite
 {
     /// <summary>
     /// A User storage interface for the SQLite database system

OpenSim/Data/SQLite/SQLiteUtils.cs

@@ -29,7 +29,7 @@ using System;
 using System.Data;
 using Mono.Data.SqliteClient;
 
-namespace OpenSim.Framework.Data.SQLite
+namespace OpenSim.Data.SQLite
 {
     /// <summary>
     /// A base class for methods needed by all SQLite database classes

OpenSim/Data/UserDataBase.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using libsecondlife;
 
-namespace OpenSim.Framework.Data
+namespace OpenSim.Data
 {
     public abstract class UserDataBase : IUserData
     {