*Fixed all renaming for OpenGridServices.sln, still a reference issue in prebuild.xml though

10 files changed, 29 insertions, 28 deletions

diff --git a/OpenSim/Grid/AssetServer/AssetHttpServer.cs b/OpenSim/Grid/AssetServer/AssetHttpServer.cs
index 6fc6bf8..ad8733f 100644
--- a/OpenSim/Grid/AssetServer/AssetHttpServer.cs
+++ b/OpenSim/Grid/AssetServer/AssetHttpServer.cs
@@ -35,9 +35,9 @@ using System.Threading;
 using Nwc.XmlRpc;

 using System.Collections;

 using OpenSim.Framework.Console;

-using OpenSim.Servers;

+using OpenSim.Framework.Servers;

 

-namespace OpenGridServices.AssetServer

+namespace OpenSim.Grid.AssetServer

 {

     /// <summary>

     /// An HTTP server for sending assets

diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 96c9dba..d06998d 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -40,11 +40,11 @@ using OpenSim.Framework.Console;
 using OpenSim.Framework.Types;

 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Utilities;

-using OpenSim.Servers;

+using OpenSim.Framework.Servers;

 using Db4objects.Db4o;

 using Db4objects.Db4o.Query;

 

-namespace OpenGridServices.AssetServer

+namespace OpenSim.Grid.AssetServer

 {

     /// <summary>

     /// An asset server

diff --git a/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs b/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
index dfc572a..3f5d7dd 100644
--- a/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
+++ b/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
@@ -27,12 +27,12 @@
 */

 using Nwc.XmlRpc;

 using OpenSim.Framework;

-using OpenSim.Servers;

+using OpenSim.Framework.Servers;

 using System.Collections;

 using System.Collections.Generic;

 using libsecondlife;

 

-namespace OpenGrid.Framework.Manager

+namespace OpenSim.Framework.Manager

 {

     /// <summary>

     /// Used to pass messages to the gridserver

@@ -116,7 +116,7 @@ namespace OpenGrid.Framework.Manager
             Hashtable requestData = (Hashtable)request.Params[0];

             Hashtable responseData = new Hashtable();

 

-            // TODO: Switch this over to using OpenGrid.Framework.Data

+            // TODO: Switch this over to using OpenSim.Framework.Data

             if (requestData["username"].Equals("admin") && requestData["password"].Equals("supersecret"))

             {

                 response.IsFault = false;

diff --git a/OpenSim/Grid/Framework.Manager/GridServerManager.cs b/OpenSim/Grid/Framework.Manager/GridServerManager.cs
index e276556..d5eaf6f 100644
--- a/OpenSim/Grid/Framework.Manager/GridServerManager.cs
+++ b/OpenSim/Grid/Framework.Manager/GridServerManager.cs
@@ -33,7 +33,7 @@ using Nwc.XmlRpc;
 using System.Threading;

 using libsecondlife;

 

-namespace OpenGrid.Framework.Manager {

+namespace OpenSim.Framework.Manager {

 

     /// <summary>

     /// A remote management system for the grid server

diff --git a/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj
index 9a98ff4..12edcd0 100644
--- a/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj
+++ b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj
@@ -82,10 +82,10 @@
   <ItemGroup>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="GridManagementAgent.cs">

+    <Compile Include="GridServerManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="GridServerManager.cs">

+    <Compile Include="GridManagementAgent.cs">

       <SubType>Code</SubType>

     </Compile>

   </ItemGroup>

diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index bf80652..c78d14a 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -30,7 +30,7 @@ using System.Collections;
 using System.Collections.Generic;

 using System.Text;

 using System.Reflection;

-using OpenGrid.Framework.Data;

+using OpenSim.Framework.Data;

 using OpenSim.Framework.Utilities;

 using OpenSim.Framework.Console;

 using OpenSim.Framework.Sims;

@@ -38,7 +38,7 @@ using libsecondlife;
 using Nwc.XmlRpc;

 using System.Xml;

 

-namespace OpenGridServices.GridServer

+namespace OpenSim.Grid.GridServer

 {

     class GridManager

     {

diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index b948fd6..b225214 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -34,22 +34,22 @@ using System.Net;
 using System.Threading;

 using System.Reflection;

 using libsecondlife;

-using OpenGrid.Framework.Manager;

+using OpenSim.Framework.Manager;

 using OpenSim.Framework;

 using OpenSim.Framework.Sims;

 using OpenSim.Framework.Console;

 using OpenSim.Framework.Interfaces;

-using OpenSim.Servers;

+using OpenSim.Framework.Servers;

 using OpenSim.GenericConfig;

 

-namespace OpenGridServices.GridServer

+namespace OpenSim.Grid.GridServer

 {

     /// <summary>

     /// </summary>

     public class OpenGrid_Main : conscmd_callback

     {

         private string ConfigDll = "OpenGrid.Config.GridConfigDb4o.dll";

-        private string GridDll = "OpenGrid.Framework.Data.MySQL.dll";

+        private string GridDll = "OpenSim.Framework.Data.MySQL.dll";

         public GridConfig Cfg;

 

         public static OpenGrid_Main thegrid;

@@ -253,8 +253,8 @@ namespace OpenGridServices.GridServer
                 attri = configData.GetAttribute("DataBaseProvider");

                 if (attri == "")

                 {

-                    GridDll = "OpenGrid.Framework.Data.DB4o.dll";

-                    configData.SetAttribute("DataBaseProvider", "OpenGrid.Framework.Data.DB4o.dll");

+                    GridDll = "OpenSim.Framework.Data.DB4o.dll";

+                    configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll");

                 }

                 else

                 {

diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 5c27d57..c0ff649 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -38,18 +38,18 @@ using OpenSim.Framework.Sims;
 using OpenSim.Framework.Inventory;

 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Console;

-using OpenSim.Servers;

+using OpenSim.Framework.Servers;

 using OpenSim.Framework.Utilities;

 using OpenSim.GenericConfig;

 

-namespace OpenGridServices.UserServer

+namespace OpenSim.Grid.UserServer

 {

     /// <summary>

     /// </summary>

     public class OpenUser_Main :  conscmd_callback

     {

         private string ConfigDll = "OpenUser.Config.UserConfigDb4o.dll";

-        private string StorageDll = "OpenGrid.Framework.Data.MySQL.dll";

+        private string StorageDll = "OpenSim.Framework.Data.MySQL.dll";

         private UserConfig Cfg;

         protected IGenericConfig localXMLConfig;

 

@@ -169,8 +169,8 @@ namespace OpenGridServices.UserServer
                 attri = configData.GetAttribute("DataBaseProvider");

                 if (attri == "")

                 {

-                    StorageDll = "OpenGrid.Framework.Data.DB4o.dll";

-                    configData.SetAttribute("DataBaseProvider", "OpenGrid.Framework.Data.DB4o.dll");

+                    StorageDll = "OpenSim.Framework.Data.DB4o.dll";

+                    configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll");

                 }

                 else

                 {

diff --git a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
index 3c93b78..e5cb92c 100644
--- a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
+++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
@@ -112,10 +112,10 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="Main.cs">

+    <Compile Include="UserManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UserManager.cs">

+    <Compile Include="Main.cs">

       <SubType>Code</SubType>

     </Compile>

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

diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 0704de1..c99cf87 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections;

 using System.Collections.Generic;

 using System.Text;

-using OpenGrid.Framework.Data;

+using OpenSim.Framework.Data;

 using libsecondlife;

 using System.Reflection;

 

@@ -38,11 +38,12 @@ using Nwc.XmlRpc;
 using OpenSim.Framework.Sims;

 using OpenSim.Framework.Inventory;

 using OpenSim.Framework.Utilities;

-using OpenGrid.Framework.UserManagement;

+

+using OpenSim.Framework.UserManagement;

 

 using System.Security.Cryptography;

 

-namespace OpenGridServices.UserServer

+namespace OpenSim.Grid.UserServer

 {

     public class UserManager : UserManagerBase

     {