aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDr Scofield2008-07-15 13:33:31 +0000
committerDr Scofield2008-07-15 13:33:31 +0000
commit00c15eb0c450a5f183a04c3ff8b9474a29aab437 (patch)
treeef64974516b0c7f2694ed3f9373b81a10ee2a53e
parentfixes handler scoring method. XmlRpc code path now fully working with (diff)
downloadopensim-SC_OLD-00c15eb0c450a5f183a04c3ff8b9474a29aab437.zip
opensim-SC_OLD-00c15eb0c450a5f183a04c3ff8b9474a29aab437.tar.gz
opensim-SC_OLD-00c15eb0c450a5f183a04c3ff8b9474a29aab437.tar.bz2
opensim-SC_OLD-00c15eb0c450a5f183a04c3ff8b9474a29aab437.tar.xz
cleanup: fixing CamelCase issue with RestDeserialiseHandler.
-rw-r--r--OpenSim/Framework/Servers/RestDeserialiseHandler.cs4
-rw-r--r--OpenSim/Grid/InventoryServer/Main.cs18
2 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs
index 99358aa..5c2dd4a 100644
--- a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs
+++ b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs
@@ -34,12 +34,12 @@ namespace OpenSim.Framework.Servers
34{ 34{
35 public delegate TResponse RestDeserialiseMethod<TRequest, TResponse>(TRequest request); 35 public delegate TResponse RestDeserialiseMethod<TRequest, TResponse>(TRequest request);
36 36
37 public class RestDeserialisehandler<TRequest, TResponse> : BaseRequestHandler, IStreamHandler 37 public class RestDeserialiseHandler<TRequest, TResponse> : BaseRequestHandler, IStreamHandler
38 where TRequest : new() 38 where TRequest : new()
39 { 39 {
40 private RestDeserialiseMethod<TRequest, TResponse> m_method; 40 private RestDeserialiseMethod<TRequest, TResponse> m_method;
41 41
42 public RestDeserialisehandler(string httpMethod, string path, RestDeserialiseMethod<TRequest, TResponse> method) 42 public RestDeserialiseHandler(string httpMethod, string path, RestDeserialiseMethod<TRequest, TResponse> method)
43 : base(httpMethod, path) 43 : base(httpMethod, path)
44 { 44 {
45 m_method = method; 45 m_method = method;
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index a068892..2ab1916 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -85,35 +85,35 @@ namespace OpenSim.Grid.InventoryServer
85 protected void AddHttpHandlers() 85 protected void AddHttpHandlers()
86 { 86 {
87 m_httpServer.AddStreamHandler( 87 m_httpServer.AddStreamHandler(
88 new RestDeserialisehandler<Guid, InventoryCollection>( 88 new RestDeserialiseHandler<Guid, InventoryCollection>(
89 "POST", "/GetInventory/", m_inventoryService.GetUserInventory)); 89 "POST", "/GetInventory/", m_inventoryService.GetUserInventory));
90 90
91 m_httpServer.AddStreamHandler( 91 m_httpServer.AddStreamHandler(
92 new RestDeserialisehandler<Guid, bool>( 92 new RestDeserialiseHandler<Guid, bool>(
93 "POST", "/CreateInventory/", m_inventoryService.CreateUsersInventory)); 93 "POST", "/CreateInventory/", m_inventoryService.CreateUsersInventory));
94 94
95 m_httpServer.AddStreamHandler( 95 m_httpServer.AddStreamHandler(
96 new RestDeserialisehandler<InventoryFolderBase, bool>( 96 new RestDeserialiseHandler<InventoryFolderBase, bool>(
97 "POST", "/NewFolder/", m_inventoryService.AddFolder)); 97 "POST", "/NewFolder/", m_inventoryService.AddFolder));
98 98
99 m_httpServer.AddStreamHandler( 99 m_httpServer.AddStreamHandler(
100 new RestDeserialisehandler<InventoryFolderBase, bool>( 100 new RestDeserialiseHandler<InventoryFolderBase, bool>(
101 "POST", "/UpdateFolder/", m_inventoryService.UpdateFolder)); 101 "POST", "/UpdateFolder/", m_inventoryService.UpdateFolder));
102 102
103 m_httpServer.AddStreamHandler( 103 m_httpServer.AddStreamHandler(
104 new RestDeserialisehandler<InventoryFolderBase, bool>( 104 new RestDeserialiseHandler<InventoryFolderBase, bool>(
105 "POST", "/MoveFolder/", m_inventoryService.MoveFolder)); 105 "POST", "/MoveFolder/", m_inventoryService.MoveFolder));
106 106
107 m_httpServer.AddStreamHandler( 107 m_httpServer.AddStreamHandler(
108 new RestDeserialisehandler<InventoryFolderBase, bool>( 108 new RestDeserialiseHandler<InventoryFolderBase, bool>(
109 "POST", "/PurgeFolder/", m_inventoryService.PurgeFolder)); 109 "POST", "/PurgeFolder/", m_inventoryService.PurgeFolder));
110 110
111 m_httpServer.AddStreamHandler( 111 m_httpServer.AddStreamHandler(
112 new RestDeserialisehandler<InventoryItemBase, bool>( 112 new RestDeserialiseHandler<InventoryItemBase, bool>(
113 "POST", "/NewItem/", m_inventoryService.AddItem)); 113 "POST", "/NewItem/", m_inventoryService.AddItem));
114 114
115 m_httpServer.AddStreamHandler( 115 m_httpServer.AddStreamHandler(
116 new RestDeserialisehandler<InventoryItemBase, bool>( 116 new RestDeserialiseHandler<InventoryItemBase, bool>(
117 "POST", "/DeleteItem/", m_inventoryService.DeleteItem)); 117 "POST", "/DeleteItem/", m_inventoryService.DeleteItem));
118 118
119 // WARNING: Root folders no longer just delivers the root and immediate child folders (e.g 119 // WARNING: Root folders no longer just delivers the root and immediate child folders (e.g
@@ -122,7 +122,7 @@ namespace OpenSim.Grid.InventoryServer
122 // (e.g. any http request not found is automatically treated as an xmlrpc request) make it easier 122 // (e.g. any http request not found is automatically treated as an xmlrpc request) make it easier
123 // to do this for now. 123 // to do this for now.
124 m_httpServer.AddStreamHandler( 124 m_httpServer.AddStreamHandler(
125 new RestDeserialisehandler<Guid, List<InventoryFolderBase>> 125 new RestDeserialiseHandler<Guid, List<InventoryFolderBase>>
126 ("POST", "/RootFolders/", m_inventoryService.GetInventorySkeleton)); 126 ("POST", "/RootFolders/", m_inventoryService.GetInventorySkeleton));
127 } 127 }
128 128