aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorgareth2007-04-02 11:41:45 +0000
committergareth2007-04-02 11:41:45 +0000
commit906526bb9a28898771592fca12758ef19c19e56e (patch)
treef38b928b570e820442366f4b8d6de9f7c3146ee0
parentMoved database storage of the world map to the Db4LocalStorage so its in the ... (diff)
downloadopensim-SC_OLD-906526bb9a28898771592fca12758ef19c19e56e.zip
opensim-SC_OLD-906526bb9a28898771592fca12758ef19c19e56e.tar.gz
opensim-SC_OLD-906526bb9a28898771592fca12758ef19c19e56e.tar.bz2
opensim-SC_OLD-906526bb9a28898771592fca12758ef19c19e56e.tar.xz
Finished adding Db4o support to user profile manager
Diffstat (limited to '')
-rw-r--r--OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build1
-rw-r--r--OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build1
-rw-r--r--OpenSim.Framework/OpenSim.Framework.dll.build1
-rw-r--r--OpenSim.Framework/UserProfileManagerBase.cs15
-rw-r--r--OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build1
-rw-r--r--OpenSim.build1
-rw-r--r--prebuild.xml23
7 files changed, 16 insertions, 27 deletions
diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
index 7ab3ed5..fd1be15 100644
--- a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
+++ b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
@@ -26,6 +26,7 @@
26 <include name="../bin/OpenSim.Framework.dll" /> 26 <include name="../bin/OpenSim.Framework.dll" />
27 <include name="../bin/OpenSim.Framework.Console.dll" /> 27 <include name="../bin/OpenSim.Framework.Console.dll" />
28 <include name="../bin/libsecondlife.dll" /> 28 <include name="../bin/libsecondlife.dll" />
29 <include name="../bin/Db4objects.Db4o.dll" />
29 </references> 30 </references>
30 </csc> 31 </csc>
31 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 32 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build
index 085dc55..fd22f7d 100644
--- a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build
+++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build
@@ -13,7 +13,6 @@
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="AssemblyInfo.cs" /> 14 <include name="AssemblyInfo.cs" />
15 <include name="DbSimConfig.cs" /> 15 <include name="DbSimConfig.cs" />
16 <include name="MapStorage.cs" />
17 </sources> 16 </sources>
18 <references basedir="${project::get-base-directory()}"> 17 <references basedir="${project::get-base-directory()}">
19 <lib> 18 <lib>
diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build
index 417fa0c..43f4542 100644
--- a/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -45,6 +45,7 @@
45 <include name="System.dll" /> 45 <include name="System.dll" />
46 <include name="System.Xml.dll" /> 46 <include name="System.Xml.dll" />
47 <include name="../bin/libsecondlife.dll" /> 47 <include name="../bin/libsecondlife.dll" />
48 <include name="../bin/Db4objects.Db4o.dll" />
48 </references> 49 </references>
49 </csc> 50 </csc>
50 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 51 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
diff --git a/OpenSim.Framework/UserProfileManagerBase.cs b/OpenSim.Framework/UserProfileManagerBase.cs
index 218a98c..73f325d 100644
--- a/OpenSim.Framework/UserProfileManagerBase.cs
+++ b/OpenSim.Framework/UserProfileManagerBase.cs
@@ -4,6 +4,7 @@ using System.Text;
4using libsecondlife; 4using libsecondlife;
5using OpenSim.Framework.Utilities; 5using OpenSim.Framework.Utilities;
6using OpenSim.Framework.Inventory; 6using OpenSim.Framework.Inventory;
7using Db4objects.Db4o;
7 8
8namespace OpenSim.Framework.User 9namespace OpenSim.Framework.User
9{ 10{
@@ -12,13 +13,19 @@ namespace OpenSim.Framework.User
12 13
13 public Dictionary<LLUUID, UserProfile> UserProfiles = new Dictionary<LLUUID, UserProfile>(); 14 public Dictionary<LLUUID, UserProfile> UserProfiles = new Dictionary<LLUUID, UserProfile>();
14 15
15 public UserProfileManagerBase() 16 public UserProfileManagerBase() {
16 { 17 }
17 }
18 18
19 public virtual void InitUserProfiles() 19 public virtual void InitUserProfiles()
20 { 20 {
21 // TODO: need to load from database 21 IObjectContainer db;
22 db = Db4oFactory.OpenFile("userprofiles.yap");
23 IObjectSet result = db.Get(typeof(UserProfile));
24 foreach (UserProfile userprof in result) {
25 UserProfiles.Add(userprof.UUID, userprof);
26 }
27 Console.WriteLine("UserProfiles.Cs:InitUserProfiles() - Successfully loaded " + result.Count.ToString() + " from database");
28 db.Close();
22 } 29 }
23 30
24 public UserProfile GetProfileByName(string firstname, string lastname) 31 public UserProfile GetProfileByName(string firstname, string lastname)
diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
index c9ae660..439f440 100644
--- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
@@ -13,6 +13,7 @@
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="AssemblyInfo.cs" /> 14 <include name="AssemblyInfo.cs" />
15 <include name="Db4LocalStorage.cs" /> 15 <include name="Db4LocalStorage.cs" />
16 <include name="MapStorage.cs" />
16 <include name="UUIDQuery.cs" /> 17 <include name="UUIDQuery.cs" />
17 </sources> 18 </sources>
18 <references basedir="${project::get-base-directory()}"> 19 <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim.build b/OpenSim.build
index 3d09074..3472aaa 100644
--- a/OpenSim.build
+++ b/OpenSim.build
@@ -68,7 +68,6 @@
68 <target name="build" depends="init" description=""> 68 <target name="build" depends="init" description="">
69 <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" /> 69 <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" />
70 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" /> 70 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" />
71 <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" />
72 <nant buildfile="Servers/OpenSim.Servers.dll.build" target="build" /> 71 <nant buildfile="Servers/OpenSim.Servers.dll.build" target="build" />
73 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" /> 72 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" />
74 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" /> 73 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" />
diff --git a/prebuild.xml b/prebuild.xml
index 024102c..59a90e0 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -50,6 +50,7 @@
50 <Reference name="System"/> 50 <Reference name="System"/>
51 <Reference name="System.Xml"/> 51 <Reference name="System.Xml"/>
52 <Reference name="libsecondlife.dll"/> 52 <Reference name="libsecondlife.dll"/>
53 <Reference name="Db4objects.Db4o.dll"/>
53 <Files> 54 <Files>
54 <Match pattern="*.cs" recurse="true"/> 55 <Match pattern="*.cs" recurse="true"/>
55 </Files> 56 </Files>
@@ -74,27 +75,6 @@
74 </Files> 75 </Files>
75 </Project> 76 </Project>
76 77
77 <Project name="OpenSim.Framework" path="OpenSim.Framework" type="Library">
78 <Configuration name="Debug">
79 <Options>
80 <OutputPath>../bin/</OutputPath>
81 </Options>
82 </Configuration>
83 <Configuration name="Release">
84 <Options>
85 <OutputPath>../bin/</OutputPath>
86 </Options>
87 </Configuration>
88
89 <ReferencePath>../bin/</ReferencePath>
90 <Reference name="System"/>
91 <Reference name="System.Xml"/>
92 <Reference name="libsecondlife.dll"/>
93 <Files>
94 <Match pattern="*.cs" recurse="true"/>
95 </Files>
96 </Project>
97
98 <Project name="OpenSim.Servers" path="Servers" type="Library"> 78 <Project name="OpenSim.Servers" path="Servers" type="Library">
99 <Configuration name="Debug"> 79 <Configuration name="Debug">
100 <Options> 80 <Options>
@@ -167,6 +147,7 @@
167 <Reference name="OpenSim.Framework"/> 147 <Reference name="OpenSim.Framework"/>
168 <Reference name="OpenSim.Framework.Console"/> 148 <Reference name="OpenSim.Framework.Console"/>
169 <Reference name="libsecondlife.dll"/> 149 <Reference name="libsecondlife.dll"/>
150 <Reference name="Db4objects.Db4o.dll"/>
170 151
171 <Files> 152 <Files>
172 <Match pattern="*.cs" recurse="true"/> 153 <Match pattern="*.cs" recurse="true"/>