aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2009-05-18 12:36:59 +0000
committerMelanie Thielker2009-05-18 12:36:59 +0000
commit2534078380dffc4f47b82a4d28879c4bf699d09f (patch)
treec59bcbe5e4b671c2986b0d336efefb95ff6753bd
parentNonowrking intermadiate commit,, DO NOT USE (diff)
downloadopensim-SC_OLD-2534078380dffc4f47b82a4d28879c4bf699d09f.zip
opensim-SC_OLD-2534078380dffc4f47b82a4d28879c4bf699d09f.tar.gz
opensim-SC_OLD-2534078380dffc4f47b82a4d28879c4bf699d09f.tar.bz2
opensim-SC_OLD-2534078380dffc4f47b82a4d28879c4bf699d09f.tar.xz
Refactor: Change "Servers" to "Server", since the can only be one. Break
the handlers out of the asset server context into a generic scope.
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectors/Asset/HGAssetBroker.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServiceConnector.cs2
-rw-r--r--OpenSim/Server/AssetServer/AssetServerMain.cs2
-rw-r--r--OpenSim/Server/Handlers/Asset/AssetServerConnector.cs (renamed from OpenSim/Server/AssetServer/Handlers/AssetServerConnector.cs)5
-rw-r--r--OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs (renamed from OpenSim/Server/AssetServer/Handlers/AssetServerDeleteHandler.cs)4
-rw-r--r--OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs (renamed from OpenSim/Server/AssetServer/Handlers/AssetServerGetHandler.cs)4
-rw-r--r--OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs (renamed from OpenSim/Server/AssetServer/Handlers/AssetServerPostHandler.cs)4
-rw-r--r--OpenSim/SimulatorServices/RegionAssetService.cs2
-rw-r--r--prebuild.xml12
10 files changed, 19 insertions, 20 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/HGAssetBroker.cs
index 54451fd..34bb85a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/HGAssetBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/HGAssetBroker.cs
@@ -31,7 +31,7 @@ using System;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using System.Reflection; 32using System.Reflection;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Servers.Base; 34using OpenSim.Server.Base;
35using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenSim.Services.Interfaces; 37using OpenSim.Services.Interfaces;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs
index 19a41ec..4e802ed 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs
@@ -31,7 +31,7 @@ using System;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using System.Reflection; 32using System.Reflection;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Servers.Base; 34using OpenSim.Server.Base;
35using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenSim.Services.Interfaces; 37using OpenSim.Services.Interfaces;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServiceConnector.cs
index 37286bd..062b12b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServiceConnector.cs
@@ -31,7 +31,7 @@ using log4net;
31using Nini.Config; 31using Nini.Config;
32using OpenSim.Region.Framework.Interfaces; 32using OpenSim.Region.Framework.Interfaces;
33using OpenSim.Region.Framework.Scenes; 33using OpenSim.Region.Framework.Scenes;
34using OpenSim.Servers.Base; 34using OpenSim.Server.Base;
35using OpenSim.Services.Interfaces; 35using OpenSim.Services.Interfaces;
36 36
37namespace OpenSim.Region.CoreModules.ServiceConnectors.User 37namespace OpenSim.Region.CoreModules.ServiceConnectors.User
diff --git a/OpenSim/Server/AssetServer/AssetServerMain.cs b/OpenSim/Server/AssetServer/AssetServerMain.cs
index 52f8e2b..b08c8cf 100644
--- a/OpenSim/Server/AssetServer/AssetServerMain.cs
+++ b/OpenSim/Server/AssetServer/AssetServerMain.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29using OpenSim.Server.Base; 29using OpenSim.Server.Base;
30using OpenSim.Server.AssetServer.Handlers; 30using OpenSim.Server.Handlers.Asset;
31 31
32namespace OpenSim.Server.AssetServer 32namespace OpenSim.Server.AssetServer
33{ 33{
diff --git a/OpenSim/Server/AssetServer/Handlers/AssetServerConnector.cs b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
index 8606d38..64014f5 100644
--- a/OpenSim/Server/AssetServer/Handlers/AssetServerConnector.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
@@ -27,12 +27,11 @@
27 27
28using System; 28using System;
29using Nini.Config; 29using Nini.Config;
30using OpenSim.Servers.Base; 30using OpenSim.Server.Base;
31using OpenSim.Servers.AssetServer.Handlers;
32using OpenSim.Services.Interfaces; 31using OpenSim.Services.Interfaces;
33using OpenSim.Framework.Servers.HttpServer; 32using OpenSim.Framework.Servers.HttpServer;
34 33
35namespace OpenSim.Servers.AssetServer.Handlers 34namespace OpenSim.Server.Handlers.Asset
36{ 35{
37 public class AssetServiceConnector 36 public class AssetServiceConnector
38 { 37 {
diff --git a/OpenSim/Server/AssetServer/Handlers/AssetServerDeleteHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
index e90353b..f9eceeb 100644
--- a/OpenSim/Server/AssetServer/Handlers/AssetServerDeleteHandler.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
@@ -35,12 +35,12 @@ using System.Text;
35using System.Text.RegularExpressions; 35using System.Text.RegularExpressions;
36using System.Xml; 36using System.Xml;
37using System.Xml.Serialization; 37using System.Xml.Serialization;
38using OpenSim.Servers.Base; 38using OpenSim.Server.Base;
39using OpenSim.Services.Interfaces; 39using OpenSim.Services.Interfaces;
40using OpenSim.Framework; 40using OpenSim.Framework;
41using OpenSim.Framework.Servers.HttpServer; 41using OpenSim.Framework.Servers.HttpServer;
42 42
43namespace OpenSim.Servers.AssetServer.Handlers 43namespace OpenSim.Server.Handlers.Asset
44{ 44{
45 public class AssetServerDeleteHandler : BaseStreamHandler 45 public class AssetServerDeleteHandler : BaseStreamHandler
46 { 46 {
diff --git a/OpenSim/Server/AssetServer/Handlers/AssetServerGetHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
index 7bb3364..0ededca 100644
--- a/OpenSim/Server/AssetServer/Handlers/AssetServerGetHandler.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
@@ -35,12 +35,12 @@ using System.Text;
35using System.Text.RegularExpressions; 35using System.Text.RegularExpressions;
36using System.Xml; 36using System.Xml;
37using System.Xml.Serialization; 37using System.Xml.Serialization;
38using OpenSim.Servers.Base; 38using OpenSim.Server.Base;
39using OpenSim.Services.Interfaces; 39using OpenSim.Services.Interfaces;
40using OpenSim.Framework; 40using OpenSim.Framework;
41using OpenSim.Framework.Servers.HttpServer; 41using OpenSim.Framework.Servers.HttpServer;
42 42
43namespace OpenSim.Servers.AssetServer.Handlers 43namespace OpenSim.Server.Handlers.Asset
44{ 44{
45 public class AssetServerGetHandler : BaseStreamHandler 45 public class AssetServerGetHandler : BaseStreamHandler
46 { 46 {
diff --git a/OpenSim/Server/AssetServer/Handlers/AssetServerPostHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs
index 5a05101..5ca9eae 100644
--- a/OpenSim/Server/AssetServer/Handlers/AssetServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs
@@ -35,12 +35,12 @@ using System.Text;
35using System.Text.RegularExpressions; 35using System.Text.RegularExpressions;
36using System.Xml; 36using System.Xml;
37using System.Xml.Serialization; 37using System.Xml.Serialization;
38using OpenSim.Servers.Base; 38using OpenSim.Server.Base;
39using OpenSim.Services.Interfaces; 39using OpenSim.Services.Interfaces;
40using OpenSim.Framework; 40using OpenSim.Framework;
41using OpenSim.Framework.Servers.HttpServer; 41using OpenSim.Framework.Servers.HttpServer;
42 42
43namespace OpenSim.Servers.AssetServer.Handlers 43namespace OpenSim.Server.Handlers.Asset
44{ 44{
45 public class AssetServerPostHandler : BaseStreamHandler 45 public class AssetServerPostHandler : BaseStreamHandler
46 { 46 {
diff --git a/OpenSim/SimulatorServices/RegionAssetService.cs b/OpenSim/SimulatorServices/RegionAssetService.cs
index 651e6d4..3a7ccc8 100644
--- a/OpenSim/SimulatorServices/RegionAssetService.cs
+++ b/OpenSim/SimulatorServices/RegionAssetService.cs
@@ -32,7 +32,7 @@ using OpenSim.Framework;
32using OpenSim.Framework.Servers.HttpServer; 32using OpenSim.Framework.Servers.HttpServer;
33using OpenSim.Region.Framework.Scenes; 33using OpenSim.Region.Framework.Scenes;
34using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Servers.AssetServer.Handlers; 35using OpenSim.Server.Handlers.Asset;
36 36
37namespace OpenSim.Region.SimulatorServices 37namespace OpenSim.Region.SimulatorServices
38{ 38{
diff --git a/prebuild.xml b/prebuild.xml
index feeb159..1c4d41e 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1387,19 +1387,19 @@
1387 </Files> 1387 </Files>
1388 </Project> 1388 </Project>
1389 1389
1390 <Project name="OpenSim.Servers.AssetServer.Handlers" path="OpenSim/Servers/AssetServer/Handlers" type="Library"> 1390 <Project name="OpenSim.Server.Handlers" path="OpenSim/Server/Handlers" type="Library">
1391 <Configuration name="Debug"> 1391 <Configuration name="Debug">
1392 <Options> 1392 <Options>
1393 <OutputPath>../../../../bin/</OutputPath> 1393 <OutputPath>../../../bin/</OutputPath>
1394 </Options> 1394 </Options>
1395 </Configuration> 1395 </Configuration>
1396 <Configuration name="Release"> 1396 <Configuration name="Release">
1397 <Options> 1397 <Options>
1398 <OutputPath>../../../../bin/</OutputPath> 1398 <OutputPath>../../../bin/</OutputPath>
1399 </Options> 1399 </Options>
1400 </Configuration> 1400 </Configuration>
1401 1401
1402 <ReferencePath>../../../../bin/</ReferencePath> 1402 <ReferencePath>../../../bin/</ReferencePath>
1403 <Reference name="System"/> 1403 <Reference name="System"/>
1404 <Reference name="System.Xml"/> 1404 <Reference name="System.Xml"/>
1405 <Reference name="OpenMetaverseTypes.dll"/> 1405 <Reference name="OpenMetaverseTypes.dll"/>
@@ -1439,7 +1439,7 @@
1439 <Reference name="OpenSim.Framework.Console"/> 1439 <Reference name="OpenSim.Framework.Console"/>
1440 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 1440 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1441 <Reference name="OpenSim.Server.Base"/> 1441 <Reference name="OpenSim.Server.Base"/>
1442 <Reference name="OpenSim.Server.AssetServer.Handlers"/> 1442 <Reference name="OpenSim.Server.Handlers"/>
1443 <Reference name="OpenSim.Services.Base" /> 1443 <Reference name="OpenSim.Services.Base" />
1444 <Reference name="OpenSim.Services.Interfaces"/> 1444 <Reference name="OpenSim.Services.Interfaces"/>
1445 <Reference name="Nini.dll" /> 1445 <Reference name="Nini.dll" />
@@ -1603,7 +1603,7 @@
1603 <Reference name="OpenSim.Framework.Servers.HttpServer" /> 1603 <Reference name="OpenSim.Framework.Servers.HttpServer" />
1604 <Reference name="OpenSim.Region.Framework" /> 1604 <Reference name="OpenSim.Region.Framework" />
1605 <Reference name="OpenSim.Services.Interfaces"/> 1605 <Reference name="OpenSim.Services.Interfaces"/>
1606 <Reference name="OpenSim.Servers.AssetServer.Handlers"/> 1606 <Reference name="OpenSim.Server.Handlers"/>
1607 <Reference name="Mono.Addins.dll" /> 1607 <Reference name="Mono.Addins.dll" />
1608 <Reference name="XMLRPC.dll"/> 1608 <Reference name="XMLRPC.dll"/>
1609 <Reference name="Nini.dll" /> 1609 <Reference name="Nini.dll" />