aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authormingchen2007-06-19 00:18:06 +0000
committermingchen2007-06-19 00:18:06 +0000
commit78af28744856aae9af944df2d4e5fa92af448121 (patch)
tree8a959884111fd6e1d089230888208dfde02cc03e
parent*Updated/Added the base classes and interfaces for user and login servers (diff)
downloadopensim-SC_OLD-78af28744856aae9af944df2d4e5fa92af448121.zip
opensim-SC_OLD-78af28744856aae9af944df2d4e5fa92af448121.tar.gz
opensim-SC_OLD-78af28744856aae9af944df2d4e5fa92af448121.tar.bz2
opensim-SC_OLD-78af28744856aae9af944df2d4e5fa92af448121.tar.xz
*Added some missing files from last commit
*LoginService is now only used in LocalCommunications and not as a interface in RegionCommunications
-rw-r--r--Common/OpenGrid.Framework.Communications/CommunicationsManager.cs1
-rw-r--r--Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj1
-rw-r--r--OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs4
-rw-r--r--OpenSim/OpenSim.LocalCommunications/LocalUserManagement/LocalUserServices.cs36
-rw-r--r--OpenSim/OpenSim.LocalCommunications/LocalUserManagement/UserProfileManager.cs42
-rw-r--r--OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj2
6 files changed, 79 insertions, 7 deletions
diff --git a/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs b/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs
index cd26cfc..2ed4fd2 100644
--- a/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs
+++ b/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs
@@ -40,7 +40,6 @@ namespace OpenGrid.Framework.Communications
40 public class CommunicationsManager 40 public class CommunicationsManager
41 { 41 {
42 public IUserServices UserServer; 42 public IUserServices UserServer;
43 public ILoginService LoginServer;
44 public IGridServices GridServer; 43 public IGridServices GridServer;
45 public IInterRegionCommunications InterRegion; 44 public IInterRegionCommunications InterRegion;
46 45
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
index e061805..537151d 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
@@ -97,7 +97,6 @@
97 <Compile Include="IInterRegionCommunications.cs"> 97 <Compile Include="IInterRegionCommunications.cs">
98 <SubType>Code</SubType> 98 <SubType>Code</SubType>
99 </Compile> 99 </Compile>
100 <Compile Include="ILoginService.cs" />
101 <Compile Include="IUserServices.cs"> 100 <Compile Include="IUserServices.cs">
102 <SubType>Code</SubType> 101 <SubType>Code</SubType>
103 </Compile> 102 </Compile>
diff --git a/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs b/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs
index e42e414..fb7dc7d 100644
--- a/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs
+++ b/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs
@@ -35,7 +35,6 @@ using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Types; 35using OpenSim.Framework.Types;
36using OpenGrid.Framework.Communications; 36using OpenGrid.Framework.Communications;
37 37
38using OpenSim.LocalCommunications.LocalLoginManagement;
39using OpenSim.LocalCommunications.LocalUserManagement; 38using OpenSim.LocalCommunications.LocalUserManagement;
40 39
41namespace OpenSim.LocalCommunications 40namespace OpenSim.LocalCommunications
@@ -44,14 +43,11 @@ namespace OpenSim.LocalCommunications
44 { 43 {
45 public LocalBackEndServices SandBoxManager = new LocalBackEndServices(); 44 public LocalBackEndServices SandBoxManager = new LocalBackEndServices();
46 public LocalUserServices UserServices = new LocalUserServices(); 45 public LocalUserServices UserServices = new LocalUserServices();
47 public LocalLoginService LoginService;
48 46
49 public CommunicationsLocal() 47 public CommunicationsLocal()
50 { 48 {
51 LoginService = new LocalLoginService(this.UserServices);
52 49
53 UserServer = UserServices; 50 UserServer = UserServices;
54 LoginServer = LoginService;
55 GridServer = SandBoxManager; 51 GridServer = SandBoxManager;
56 InterRegion = SandBoxManager; 52 InterRegion = SandBoxManager;
57 } 53 }
diff --git a/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/LocalUserServices.cs b/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/LocalUserServices.cs
new file mode 100644
index 0000000..f438117
--- /dev/null
+++ b/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/LocalUserServices.cs
@@ -0,0 +1,36 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5using OpenGrid.Framework.Communications;
6using OpenSim.Framework.User;
7
8using libsecondlife;
9
10namespace OpenSim.LocalCommunications.LocalUserManagement
11{
12 public class LocalUserServices : IUserServices
13 {
14 public UserProfileManager userProfileManager = new UserProfileManager();
15 public LocalLoginService localLoginService;
16 public LocalUserServices()
17 {
18 localLoginService = new LocalLoginService(this);
19 }
20
21 public UserProfile GetUserProfile(string first_name, string last_name)
22 {
23 return GetUserProfile(first_name + " " + last_name);
24 }
25
26 public UserProfile GetUserProfile(string name)
27 {
28 return null;
29 }
30 public UserProfile GetUserProfile(LLUUID avatar_id)
31 {
32 return null;
33 }
34
35 }
36}
diff --git a/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/UserProfileManager.cs b/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/UserProfileManager.cs
new file mode 100644
index 0000000..5f9d028
--- /dev/null
+++ b/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/UserProfileManager.cs
@@ -0,0 +1,42 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5using libsecondlife;
6using OpenSim.Framework.User;
7
8namespace OpenSim.LocalCommunications.LocalUserManagement
9{
10 public class UserProfileManager
11 {
12 Dictionary<LLUUID, UserProfile> userProfiles = new Dictionary<LLUUID, UserProfile>();
13
14 public UserProfileManager()
15 {
16 }
17
18 private LLUUID getUserUUID(string first_name, string last_name)
19 {
20 return getUserUUID(first_name + " " + last_name);
21 }
22 private LLUUID getUserUUID(string name)
23 {
24 return null;
25 }
26
27
28 public UserProfile getUserProfile(string first_name, string last_name)
29 {
30 return getUserProfile(first_name + " " + last_name);
31 }
32 public UserProfile getUserProfile(string name)
33 {
34 return null;
35 }
36 public UserProfile getUserProfile(LLUUID user_id)
37 {
38 return null;
39 }
40
41 }
42}
diff --git a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj
index af5d2d3..f7c28eb 100644
--- a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj
+++ b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj
@@ -100,7 +100,7 @@
100 <Compile Include="LocalBackEndServices.cs"> 100 <Compile Include="LocalBackEndServices.cs">
101 <SubType>Code</SubType> 101 <SubType>Code</SubType>
102 </Compile> 102 </Compile>
103 <Compile Include="LocalLoginManagement\LocalLoginService.cs" /> 103 <Compile Include="LocalUserManagement\LocalLoginService.cs" />
104 <Compile Include="LocalUserManagement\LocalUserServices.cs" /> 104 <Compile Include="LocalUserManagement\LocalUserServices.cs" />
105 <Compile Include="LocalUserManagement\UserProfileManager.cs" /> 105 <Compile Include="LocalUserManagement\UserProfileManager.cs" />
106 <Compile Include="Properties\AssemblyInfo.cs"> 106 <Compile Include="Properties\AssemblyInfo.cs">