aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs6
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs4
-rw-r--r--OpenSim/Services/Connectors/User/UserServiceConnector.cs40
-rw-r--r--OpenSim/Services/Interfaces/IUserService.cs6
-rw-r--r--OpenSim/Services/UserService/UserService.cs18
-rw-r--r--OpenSim/Services/UserService/UserServiceBase.cs10
6 files changed, 42 insertions, 42 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs
index c8703ee..0924de7 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
42 LogManager.GetLogger( 42 LogManager.GetLogger(
43 MethodBase.GetCurrentMethod().DeclaringType); 43 MethodBase.GetCurrentMethod().DeclaringType);
44 44
45 private IUserDataService m_UserService; 45 private IUserAccountDataService m_UserService;
46 46
47 private bool m_Enabled = false; 47 private bool m_Enabled = false;
48 48
@@ -82,7 +82,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
82 82
83 Object[] args = new Object[] { source }; 83 Object[] args = new Object[] { source };
84 m_UserService = 84 m_UserService =
85 ServerUtils.LoadPlugin<IUserDataService>(serviceDll, 85 ServerUtils.LoadPlugin<IUserAccountDataService>(serviceDll,
86 args); 86 args);
87 87
88 if (m_UserService == null) 88 if (m_UserService == null)
@@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
113 if (!m_Enabled) 113 if (!m_Enabled)
114 return; 114 return;
115 115
116 scene.RegisterModuleInterface<IUserDataService>(m_UserService); 116 scene.RegisterModuleInterface<IUserAccountDataService>(m_UserService);
117 } 117 }
118 118
119 public void RemoveRegion(Scene scene) 119 public void RemoveRegion(Scene scene)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs
index 41d360f..abf8c4f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs
@@ -37,7 +37,7 @@ using OpenSim.Services.Connectors;
37namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User 37namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
38{ 38{
39 public class RemoteUserServicesConnector : UserServicesConnector, 39 public class RemoteUserServicesConnector : UserServicesConnector,
40 ISharedRegionModule, IUserDataService 40 ISharedRegionModule, IUserAccountDataService
41 { 41 {
42 private static readonly ILog m_log = 42 private static readonly ILog m_log =
43 LogManager.GetLogger( 43 LogManager.GetLogger(
@@ -96,7 +96,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
96 if (!m_Enabled) 96 if (!m_Enabled)
97 return; 97 return;
98 98
99 scene.RegisterModuleInterface<IUserDataService>(this); 99 scene.RegisterModuleInterface<IUserAccountDataService>(this);
100 } 100 }
101 101
102 public void RemoveRegion(Scene scene) 102 public void RemoveRegion(Scene scene)
diff --git a/OpenSim/Services/Connectors/User/UserServiceConnector.cs b/OpenSim/Services/Connectors/User/UserServiceConnector.cs
index 12afb29..fb03844 100644
--- a/OpenSim/Services/Connectors/User/UserServiceConnector.cs
+++ b/OpenSim/Services/Connectors/User/UserServiceConnector.cs
@@ -39,7 +39,7 @@ using OpenMetaverse;
39 39
40namespace OpenSim.Services.Connectors 40namespace OpenSim.Services.Connectors
41{ 41{
42 public class UserServicesConnector : IUserDataService 42 public class UserServicesConnector : IUserAccountDataService
43 { 43 {
44 private static readonly ILog m_log = 44 private static readonly ILog m_log =
45 LogManager.GetLogger( 45 LogManager.GetLogger(
@@ -81,10 +81,10 @@ namespace OpenSim.Services.Connectors
81 m_ServerURI = serviceURI; 81 m_ServerURI = serviceURI;
82 } 82 }
83 83
84 public UserData GetUserData(UUID scopeID, string firstName, string lastName) 84 public UserAccountData GetUserAccountData(UUID scopeID, string firstName, string lastName)
85 { 85 {
86 string uri = m_ServerURI + "/users/"; 86 string uri = m_ServerURI + "/users/";
87 UserData data = new UserData(); 87 UserAccountData data = new UserAccountData();
88 data.FirstName = firstName; 88 data.FirstName = firstName;
89 data.LastName = lastName; 89 data.LastName = lastName;
90 data.ScopeID = scopeID; 90 data.ScopeID = scopeID;
@@ -93,7 +93,7 @@ namespace OpenSim.Services.Connectors
93 try 93 try
94 { 94 {
95 data = SynchronousRestObjectRequester. 95 data = SynchronousRestObjectRequester.
96 MakeRequest<UserData, UserData>("POST", uri, data); 96 MakeRequest<UserAccountData, UserAccountData>("POST", uri, data);
97 } 97 }
98 catch (Exception e) 98 catch (Exception e)
99 { 99 {
@@ -107,10 +107,10 @@ namespace OpenSim.Services.Connectors
107 return data; 107 return data;
108 } 108 }
109 109
110 public UserData GetUserData(UUID scopeID, UUID userID) 110 public UserAccountData GetUserAccountData(UUID scopeID, UUID userID)
111 { 111 {
112 string uri = m_ServerURI + "/users/"; 112 string uri = m_ServerURI + "/users/";
113 UserData data = new UserData(); 113 UserAccountData data = new UserAccountData();
114 data.FirstName = String.Empty; 114 data.FirstName = String.Empty;
115 data.LastName = String.Empty; 115 data.LastName = String.Empty;
116 data.ScopeID = scopeID; 116 data.ScopeID = scopeID;
@@ -119,7 +119,7 @@ namespace OpenSim.Services.Connectors
119 try 119 try
120 { 120 {
121 data = SynchronousRestObjectRequester. 121 data = SynchronousRestObjectRequester.
122 MakeRequest<UserData, UserData>("POST", uri, data); 122 MakeRequest<UserAccountData, UserAccountData>("POST", uri, data);
123 } 123 }
124 catch (Exception e) 124 catch (Exception e)
125 { 125 {
@@ -133,12 +133,12 @@ namespace OpenSim.Services.Connectors
133 return data; 133 return data;
134 } 134 }
135 135
136 public bool SetHomePosition(UserData data, UUID regionID, UUID regionSecret) 136 public bool SetHomePosition(UserAccountData data, UUID regionID, UUID regionSecret)
137 { 137 {
138 string uri = m_ServerURI + "/user/"; 138 string uri = m_ServerURI + "/user/";
139 bool result = false; 139 bool result = false;
140 140
141 UserDataMessage msg = new UserDataMessage(); 141 UserAccountDataMessage msg = new UserAccountDataMessage();
142 142
143 msg.Data = data; 143 msg.Data = data;
144 msg.RegionID = regionID; 144 msg.RegionID = regionID;
@@ -147,7 +147,7 @@ namespace OpenSim.Services.Connectors
147 try 147 try
148 { 148 {
149 result = SynchronousRestObjectRequester. 149 result = SynchronousRestObjectRequester.
150 MakeRequest<UserDataMessage, bool>("POST", uri, msg); 150 MakeRequest<UserAccountDataMessage, bool>("POST", uri, msg);
151 } 151 }
152 catch (Exception e) 152 catch (Exception e)
153 { 153 {
@@ -158,12 +158,12 @@ namespace OpenSim.Services.Connectors
158 return result; 158 return result;
159 } 159 }
160 160
161 public bool SetUserData(UserData data, UUID principalID, UUID sessionID) 161 public bool SetUserAccountData(UserAccountData data, UUID principalID, UUID sessionID)
162 { 162 {
163 string uri = m_ServerURI + "/user/"; 163 string uri = m_ServerURI + "/user/";
164 bool result = false; 164 bool result = false;
165 165
166 UserDataMessage msg = new UserDataMessage(); 166 UserAccountDataMessage msg = new UserAccountDataMessage();
167 167
168 msg.Data = data; 168 msg.Data = data;
169 msg.PrincipalID = principalID; 169 msg.PrincipalID = principalID;
@@ -172,7 +172,7 @@ namespace OpenSim.Services.Connectors
172 try 172 try
173 { 173 {
174 result = SynchronousRestObjectRequester. 174 result = SynchronousRestObjectRequester.
175 MakeRequest<UserDataMessage, bool>("POST", uri, msg); 175 MakeRequest<UserAccountDataMessage, bool>("POST", uri, msg);
176 } 176 }
177 catch (Exception e) 177 catch (Exception e)
178 { 178 {
@@ -183,12 +183,12 @@ namespace OpenSim.Services.Connectors
183 return result; 183 return result;
184 } 184 }
185 185
186 public bool CreateUserData(UserData data, UUID principalID, UUID sessionID) 186 public bool CreateUserAccountData(UserAccountData data, UUID principalID, UUID sessionID)
187 { 187 {
188 string uri = m_ServerURI + "/newuser/"; 188 string uri = m_ServerURI + "/newuser/";
189 bool result = false; 189 bool result = false;
190 190
191 UserDataMessage msg = new UserDataMessage(); 191 UserAccountDataMessage msg = new UserAccountDataMessage();
192 192
193 msg.Data = data; 193 msg.Data = data;
194 msg.PrincipalID = principalID; 194 msg.PrincipalID = principalID;
@@ -197,7 +197,7 @@ namespace OpenSim.Services.Connectors
197 try 197 try
198 { 198 {
199 result = SynchronousRestObjectRequester. 199 result = SynchronousRestObjectRequester.
200 MakeRequest<UserDataMessage, bool>("POST", uri, msg); 200 MakeRequest<UserAccountDataMessage, bool>("POST", uri, msg);
201 } 201 }
202 catch (Exception e) 202 catch (Exception e)
203 { 203 {
@@ -208,18 +208,18 @@ namespace OpenSim.Services.Connectors
208 return result; 208 return result;
209 } 209 }
210 210
211 public List<UserData> GetAvatarPickerData(UUID scopeID, string query) 211 public List<UserAccountData> GetUserAccountData(UUID scopeID, string query)
212 { 212 {
213 string uri = m_ServerURI + "/userlist/"; 213 string uri = m_ServerURI + "/userlist/";
214 UserData data = new UserData(); 214 UserAccountData data = new UserAccountData();
215 data.FirstName = query; 215 data.FirstName = query;
216 data.ScopeID = scopeID; 216 data.ScopeID = scopeID;
217 List<UserData> result; 217 List<UserAccountData> result;
218 218
219 try 219 try
220 { 220 {
221 result = SynchronousRestObjectRequester. 221 result = SynchronousRestObjectRequester.
222 MakeRequest<UserData, List<UserData>>("POST", uri, data); 222 MakeRequest<UserAccountData, List<UserAccountData>>("POST", uri, data);
223 } 223 }
224 catch (Exception e) 224 catch (Exception e)
225 { 225 {
diff --git a/OpenSim/Services/Interfaces/IUserService.cs b/OpenSim/Services/Interfaces/IUserService.cs
index 8ea207a..35254a1 100644
--- a/OpenSim/Services/Interfaces/IUserService.cs
+++ b/OpenSim/Services/Interfaces/IUserService.cs
@@ -32,11 +32,11 @@ namespace OpenSim.Services.Interfaces
32{ 32{
33 public class UserAccountData 33 public class UserAccountData
34 { 34 {
35 public UserData() 35 public UserAccountData()
36 { 36 {
37 } 37 }
38 38
39 public UserData(UUID userID, UUID homeRegionID, float homePositionX, 39 public UserAccountData(UUID userID, UUID homeRegionID, float homePositionX,
40 float homePositionY, float homePositionZ, float homeLookAtX, 40 float homePositionY, float homePositionZ, float homeLookAtX,
41 float homeLookAtY, float homeLookAtZ) 41 float homeLookAtY, float homeLookAtZ)
42 { 42 {
@@ -80,7 +80,7 @@ namespace OpenSim.Services.Interfaces
80 80
81 public class UserAccountDataMessage 81 public class UserAccountDataMessage
82 { 82 {
83 public UserData Data; 83 public UserAccountData Data;
84 84
85 // Set to the region's ID and secret when updating home location 85 // Set to the region's ID and secret when updating home location
86 // 86 //
diff --git a/OpenSim/Services/UserService/UserService.cs b/OpenSim/Services/UserService/UserService.cs
index cfbc2c1..78793657 100644
--- a/OpenSim/Services/UserService/UserService.cs
+++ b/OpenSim/Services/UserService/UserService.cs
@@ -33,41 +33,41 @@ using OpenSim.Services.Interfaces;
33using System.Collections.Generic; 33using System.Collections.Generic;
34using OpenMetaverse; 34using OpenMetaverse;
35 35
36namespace OpenSim.Services.UserService 36namespace OpenSim.Services.UserAccountService
37{ 37{
38 public class UserService : UserServiceBase, IUserDataService 38 public class UserAccountService : UserAccountServiceBase, IUserAccountDataService
39 { 39 {
40 public UserService(IConfigSource config) : base(config) 40 public UserAccountService(IConfigSource config) : base(config)
41 { 41 {
42 } 42 }
43 43
44 public UserData GetUserData(UUID scopeID, string firstName, 44 public UserAccountData GetUserAccountData(UUID scopeID, string firstName,
45 string lastName) 45 string lastName)
46 { 46 {
47 return null; 47 return null;
48 } 48 }
49 49
50 public UserData GetUserData(UUID scopeID, UUID userID) 50 public UserAccountData GetUserAccountData(UUID scopeID, UUID userID)
51 { 51 {
52 return null; 52 return null;
53 } 53 }
54 54
55 public bool SetHomePosition(UserData data, UUID regionID, UUID regionSecret) 55 public bool SetHomePosition(UserAccountData data, UUID regionID, UUID regionSecret)
56 { 56 {
57 return false; 57 return false;
58 } 58 }
59 59
60 public bool SetUserData(UserData data, UUID principalID, UUID sessionID) 60 public bool SetUserAccountData(UserAccountData data, UUID principalID, UUID sessionID)
61 { 61 {
62 return false; 62 return false;
63 } 63 }
64 64
65 public bool CreateUserData(UserData data, UUID principalID, UUID sessionID) 65 public bool CreateUserAccountData(UserAccountData data, UUID principalID, UUID sessionID)
66 { 66 {
67 return false; 67 return false;
68 } 68 }
69 69
70 public List<UserData> GetAvatarPickerData(UUID scopeID, 70 public List<UserAccountData> GetUserAccountData(UUID scopeID,
71 string query) 71 string query)
72 { 72 {
73 return null; 73 return null;
diff --git a/OpenSim/Services/UserService/UserServiceBase.cs b/OpenSim/Services/UserService/UserServiceBase.cs
index 5139e50..c982c1a 100644
--- a/OpenSim/Services/UserService/UserServiceBase.cs
+++ b/OpenSim/Services/UserService/UserServiceBase.cs
@@ -32,17 +32,17 @@ using OpenSim.Data;
32using OpenSim.Services.Interfaces; 32using OpenSim.Services.Interfaces;
33using OpenSim.Services.Base; 33using OpenSim.Services.Base;
34 34
35namespace OpenSim.Services.UserService 35namespace OpenSim.Services.UserAccountService
36{ 36{
37 public class UserServiceBase: ServiceBase 37 public class UserAccountServiceBase: ServiceBase
38 { 38 {
39 protected IUserDataPlugin m_Database = null; 39 protected IUserDataPlugin m_Database = null;
40 40
41 public UserServiceBase(IConfigSource config) : base(config) 41 public UserAccountServiceBase(IConfigSource config) : base(config)
42 { 42 {
43 IConfig userConfig = config.Configs["UserService"]; 43 IConfig userConfig = config.Configs["UserAccountService"];
44 if (userConfig == null) 44 if (userConfig == null)
45 throw new Exception("No UserService configuration"); 45 throw new Exception("No UserAccountService configuration");
46 46
47 string dllName = userConfig.GetString("StorageProvider", 47 string dllName = userConfig.GetString("StorageProvider",
48 String.Empty); 48 String.Empty);