aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/AssetServer/AssetHttpServer.cs4
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs4
-rw-r--r--OpenSim/Grid/Framework.Manager/GridManagementAgent.cs6
-rw-r--r--OpenSim/Grid/Framework.Manager/GridServerManager.cs2
-rw-r--r--OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj4
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs4
-rw-r--r--OpenSim/Grid/GridServer/Main.cs12
-rw-r--r--OpenSim/Grid/UserServer/Main.cs10
-rw-r--r--OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj4
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs7
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;
35using Nwc.XmlRpc; 35using Nwc.XmlRpc;
36using System.Collections; 36using System.Collections;
37using OpenSim.Framework.Console; 37using OpenSim.Framework.Console;
38using OpenSim.Servers; 38using OpenSim.Framework.Servers;
39 39
40namespace OpenGridServices.AssetServer 40namespace OpenSim.Grid.AssetServer
41{ 41{
42 /// <summary> 42 /// <summary>
43 /// An HTTP server for sending assets 43 /// 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;
40using OpenSim.Framework.Types; 40using OpenSim.Framework.Types;
41using OpenSim.Framework.Interfaces; 41using OpenSim.Framework.Interfaces;
42using OpenSim.Framework.Utilities; 42using OpenSim.Framework.Utilities;
43using OpenSim.Servers; 43using OpenSim.Framework.Servers;
44using Db4objects.Db4o; 44using Db4objects.Db4o;
45using Db4objects.Db4o.Query; 45using Db4objects.Db4o.Query;
46 46
47namespace OpenGridServices.AssetServer 47namespace OpenSim.Grid.AssetServer
48{ 48{
49 /// <summary> 49 /// <summary>
50 /// An asset server 50 /// 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 @@
27*/ 27*/
28using Nwc.XmlRpc; 28using Nwc.XmlRpc;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenSim.Servers; 30using OpenSim.Framework.Servers;
31using System.Collections; 31using System.Collections;
32using System.Collections.Generic; 32using System.Collections.Generic;
33using libsecondlife; 33using libsecondlife;
34 34
35namespace OpenGrid.Framework.Manager 35namespace OpenSim.Framework.Manager
36{ 36{
37 /// <summary> 37 /// <summary>
38 /// Used to pass messages to the gridserver 38 /// Used to pass messages to the gridserver
@@ -116,7 +116,7 @@ namespace OpenGrid.Framework.Manager
116 Hashtable requestData = (Hashtable)request.Params[0]; 116 Hashtable requestData = (Hashtable)request.Params[0];
117 Hashtable responseData = new Hashtable(); 117 Hashtable responseData = new Hashtable();
118 118
119 // TODO: Switch this over to using OpenGrid.Framework.Data 119 // TODO: Switch this over to using OpenSim.Framework.Data
120 if (requestData["username"].Equals("admin") && requestData["password"].Equals("supersecret")) 120 if (requestData["username"].Equals("admin") && requestData["password"].Equals("supersecret"))
121 { 121 {
122 response.IsFault = false; 122 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;
33using System.Threading; 33using System.Threading;
34using libsecondlife; 34using libsecondlife;
35 35
36namespace OpenGrid.Framework.Manager { 36namespace OpenSim.Framework.Manager {
37 37
38 /// <summary> 38 /// <summary>
39 /// A remote management system for the grid server 39 /// 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 @@
82 <ItemGroup> 82 <ItemGroup>
83 </ItemGroup> 83 </ItemGroup>
84 <ItemGroup> 84 <ItemGroup>
85 <Compile Include="GridManagementAgent.cs"> 85 <Compile Include="GridServerManager.cs">
86 <SubType>Code</SubType> 86 <SubType>Code</SubType>
87 </Compile> 87 </Compile>
88 <Compile Include="GridServerManager.cs"> 88 <Compile Include="GridManagementAgent.cs">
89 <SubType>Code</SubType> 89 <SubType>Code</SubType>
90 </Compile> 90 </Compile>
91 </ItemGroup> 91 </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;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Text; 31using System.Text;
32using System.Reflection; 32using System.Reflection;
33using OpenGrid.Framework.Data; 33using OpenSim.Framework.Data;
34using OpenSim.Framework.Utilities; 34using OpenSim.Framework.Utilities;
35using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
36using OpenSim.Framework.Sims; 36using OpenSim.Framework.Sims;
@@ -38,7 +38,7 @@ using libsecondlife;
38using Nwc.XmlRpc; 38using Nwc.XmlRpc;
39using System.Xml; 39using System.Xml;
40 40
41namespace OpenGridServices.GridServer 41namespace OpenSim.Grid.GridServer
42{ 42{
43 class GridManager 43 class GridManager
44 { 44 {
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;
34using System.Threading; 34using System.Threading;
35using System.Reflection; 35using System.Reflection;
36using libsecondlife; 36using libsecondlife;
37using OpenGrid.Framework.Manager; 37using OpenSim.Framework.Manager;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Framework.Sims; 39using OpenSim.Framework.Sims;
40using OpenSim.Framework.Console; 40using OpenSim.Framework.Console;
41using OpenSim.Framework.Interfaces; 41using OpenSim.Framework.Interfaces;
42using OpenSim.Servers; 42using OpenSim.Framework.Servers;
43using OpenSim.GenericConfig; 43using OpenSim.GenericConfig;
44 44
45namespace OpenGridServices.GridServer 45namespace OpenSim.Grid.GridServer
46{ 46{
47 /// <summary> 47 /// <summary>
48 /// </summary> 48 /// </summary>
49 public class OpenGrid_Main : conscmd_callback 49 public class OpenGrid_Main : conscmd_callback
50 { 50 {
51 private string ConfigDll = "OpenGrid.Config.GridConfigDb4o.dll"; 51 private string ConfigDll = "OpenGrid.Config.GridConfigDb4o.dll";
52 private string GridDll = "OpenGrid.Framework.Data.MySQL.dll"; 52 private string GridDll = "OpenSim.Framework.Data.MySQL.dll";
53 public GridConfig Cfg; 53 public GridConfig Cfg;
54 54
55 public static OpenGrid_Main thegrid; 55 public static OpenGrid_Main thegrid;
@@ -253,8 +253,8 @@ namespace OpenGridServices.GridServer
253 attri = configData.GetAttribute("DataBaseProvider"); 253 attri = configData.GetAttribute("DataBaseProvider");
254 if (attri == "") 254 if (attri == "")
255 { 255 {
256 GridDll = "OpenGrid.Framework.Data.DB4o.dll"; 256 GridDll = "OpenSim.Framework.Data.DB4o.dll";
257 configData.SetAttribute("DataBaseProvider", "OpenGrid.Framework.Data.DB4o.dll"); 257 configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll");
258 } 258 }
259 else 259 else
260 { 260 {
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;
38using OpenSim.Framework.Inventory; 38using OpenSim.Framework.Inventory;
39using OpenSim.Framework.Interfaces; 39using OpenSim.Framework.Interfaces;
40using OpenSim.Framework.Console; 40using OpenSim.Framework.Console;
41using OpenSim.Servers; 41using OpenSim.Framework.Servers;
42using OpenSim.Framework.Utilities; 42using OpenSim.Framework.Utilities;
43using OpenSim.GenericConfig; 43using OpenSim.GenericConfig;
44 44
45namespace OpenGridServices.UserServer 45namespace OpenSim.Grid.UserServer
46{ 46{
47 /// <summary> 47 /// <summary>
48 /// </summary> 48 /// </summary>
49 public class OpenUser_Main : conscmd_callback 49 public class OpenUser_Main : conscmd_callback
50 { 50 {
51 private string ConfigDll = "OpenUser.Config.UserConfigDb4o.dll"; 51 private string ConfigDll = "OpenUser.Config.UserConfigDb4o.dll";
52 private string StorageDll = "OpenGrid.Framework.Data.MySQL.dll"; 52 private string StorageDll = "OpenSim.Framework.Data.MySQL.dll";
53 private UserConfig Cfg; 53 private UserConfig Cfg;
54 protected IGenericConfig localXMLConfig; 54 protected IGenericConfig localXMLConfig;
55 55
@@ -169,8 +169,8 @@ namespace OpenGridServices.UserServer
169 attri = configData.GetAttribute("DataBaseProvider"); 169 attri = configData.GetAttribute("DataBaseProvider");
170 if (attri == "") 170 if (attri == "")
171 { 171 {
172 StorageDll = "OpenGrid.Framework.Data.DB4o.dll"; 172 StorageDll = "OpenSim.Framework.Data.DB4o.dll";
173 configData.SetAttribute("DataBaseProvider", "OpenGrid.Framework.Data.DB4o.dll"); 173 configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll");
174 } 174 }
175 else 175 else
176 { 176 {
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 @@
112 </ProjectReference> 112 </ProjectReference>
113 </ItemGroup> 113 </ItemGroup>
114 <ItemGroup> 114 <ItemGroup>
115 <Compile Include="Main.cs"> 115 <Compile Include="UserManager.cs">
116 <SubType>Code</SubType> 116 <SubType>Code</SubType>
117 </Compile> 117 </Compile>
118 <Compile Include="UserManager.cs"> 118 <Compile Include="Main.cs">
119 <SubType>Code</SubType> 119 <SubType>Code</SubType>
120 </Compile> 120 </Compile>
121 <Compile Include="Properties\AssemblyInfo.cs"> 121 <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;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Text; 31using System.Text;
32using OpenGrid.Framework.Data; 32using OpenSim.Framework.Data;
33using libsecondlife; 33using libsecondlife;
34using System.Reflection; 34using System.Reflection;
35 35
@@ -38,11 +38,12 @@ using Nwc.XmlRpc;
38using OpenSim.Framework.Sims; 38using OpenSim.Framework.Sims;
39using OpenSim.Framework.Inventory; 39using OpenSim.Framework.Inventory;
40using OpenSim.Framework.Utilities; 40using OpenSim.Framework.Utilities;
41using OpenGrid.Framework.UserManagement; 41
42using OpenSim.Framework.UserManagement;
42 43
43using System.Security.Cryptography; 44using System.Security.Cryptography;
44 45
45namespace OpenGridServices.UserServer 46namespace OpenSim.Grid.UserServer
46{ 47{
47 public class UserManager : UserManagerBase 48 public class UserManager : UserManagerBase
48 { 49 {