diff options
author | gareth | 2007-05-18 23:32:41 +0000 |
---|---|---|
committer | gareth | 2007-05-18 23:32:41 +0000 |
commit | 867671cfcc7be2ac6cdbcd31d81d57bdba00ed2e (patch) | |
tree | b6afb52dce42a5bddd9765eaf12d11e1b5b5bff1 /OpenGrid.Framework.Manager | |
parent | add 1 to global Y posn when exceeding 255 local Y. Was adding 1 to global X.... (diff) | |
download | opensim-SC-867671cfcc7be2ac6cdbcd31d81d57bdba00ed2e.zip opensim-SC-867671cfcc7be2ac6cdbcd31d81d57bdba00ed2e.tar.gz opensim-SC-867671cfcc7be2ac6cdbcd31d81d57bdba00ed2e.tar.bz2 opensim-SC-867671cfcc7be2ac6cdbcd31d81d57bdba00ed2e.tar.xz |
Added session IDs to the grid management agent
Diffstat (limited to 'OpenGrid.Framework.Manager')
-rw-r--r-- | OpenGrid.Framework.Manager/GridManagementAgent.cs | 2 | ||||
-rw-r--r-- | OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build | 87 |
2 files changed, 46 insertions, 43 deletions
diff --git a/OpenGrid.Framework.Manager/GridManagementAgent.cs b/OpenGrid.Framework.Manager/GridManagementAgent.cs index c8e2cfd..c8f56d1 100644 --- a/OpenGrid.Framework.Manager/GridManagementAgent.cs +++ b/OpenGrid.Framework.Manager/GridManagementAgent.cs | |||
@@ -3,6 +3,7 @@ using OpenSim.Framework; | |||
3 | using OpenSim.Servers; | 3 | using OpenSim.Servers; |
4 | using System.Collections; | 4 | using System.Collections; |
5 | using System.Collections.Generic; | 5 | using System.Collections.Generic; |
6 | using libsecondlife; | ||
6 | 7 | ||
7 | namespace OpenGrid.Framework.Manager { | 8 | namespace OpenGrid.Framework.Manager { |
8 | 9 | ||
@@ -44,6 +45,7 @@ namespace OpenGrid.Framework.Manager { | |||
44 | // TODO: Switch this over to using OpenGrid.Framework.Data | 45 | // TODO: Switch this over to using OpenGrid.Framework.Data |
45 | if( requestData["username"].Equals("admin") && requestData["password"].Equals("supersecret")) { | 46 | if( requestData["username"].Equals("admin") && requestData["password"].Equals("supersecret")) { |
46 | response.IsFault=false; | 47 | response.IsFault=false; |
48 | responseData["session_id"]=(LLUUID.Random()).ToString(); | ||
47 | responseData["msg"]="Login OK"; | 49 | responseData["msg"]="Login OK"; |
48 | } else { | 50 | } else { |
49 | response.IsFault=true; | 51 | response.IsFault=true; |
diff --git a/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build b/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build index 08dfed9..888bb3d 100644 --- a/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build +++ b/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build | |||
@@ -1,43 +1,44 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenGrid.Framework.Manager" default="build"> | 2 | <project name="OpenGrid.Framework.Manager" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenGrid.Framework.Manager" dynamicprefix="true" > | 11 | <resources prefix="OpenGrid.Framework.Manager" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="GridManagementAgent.cs" /> | 14 | <include name="GridManagementAgent.cs" /> |
15 | <include name="GridServerManager.cs" /> | 15 | <include name="GridServerManager.cs" /> |
16 | </sources> | 16 | </sources> |
17 | <references basedir="${project::get-base-directory()}"> | 17 | <references basedir="${project::get-base-directory()}"> |
18 | <lib> | 18 | <lib> |
19 | <include name="${project::get-base-directory()}" /> | 19 | <include name="${project::get-base-directory()}" /> |
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | 20 | <include name="${project::get-base-directory()}/${build.dir}" /> |
21 | </lib> | 21 | </lib> |
22 | <include name="System.dll" /> | 22 | <include name="System.dll" /> |
23 | <include name="../bin/OpenSim.Framework.dll" /> | 23 | <include name="../bin/OpenSim.Framework.dll" /> |
24 | <include name="../bin/OpenSim.Servers.dll" /> | 24 | <include name="../bin/OpenSim.Servers.dll" /> |
25 | <include name="../bin/XMLRPC.dll" /> | 25 | <include name="../bin/libsecondlife.dll" /> |
26 | </references> | 26 | <include name="../bin/XMLRPC.dll" /> |
27 | </csc> | 27 | </references> |
28 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 28 | </csc> |
29 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 29 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> |
30 | <copy todir="${project::get-base-directory()}/../bin/"> | 30 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
31 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 31 | <copy todir="${project::get-base-directory()}/../bin/"> |
32 | <include name="*.dll"/> | 32 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
33 | <include name="*.exe"/> | 33 | <include name="*.dll"/> |
34 | </fileset> | 34 | <include name="*.exe"/> |
35 | </copy> | 35 | </fileset> |
36 | </target> | 36 | </copy> |
37 | <target name="clean"> | 37 | </target> |
38 | <delete dir="${bin.dir}" failonerror="false" /> | 38 | <target name="clean"> |
39 | <delete dir="${obj.dir}" failonerror="false" /> | 39 | <delete dir="${bin.dir}" failonerror="false" /> |
40 | </target> | 40 | <delete dir="${obj.dir}" failonerror="false" /> |
41 | <target name="doc" description="Creates documentation."> | 41 | </target> |
42 | </target> | 42 | <target name="doc" description="Creates documentation."> |
43 | </project> | 43 | </target> |
44 | </project> | ||