diff options
Diffstat (limited to 'OpenGridServices')
17 files changed, 610 insertions, 616 deletions
diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build index 06d529b..cbc8479 100644 --- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build +++ b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build | |||
@@ -1,46 +1,46 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenGrid.Config.GridConfigDb4o" default="build"> | 2 | <project name="OpenGrid.Config.GridConfigDb4o" 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" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenGrid.Config.GridConfigDb4o" dynamicprefix="true" > | 11 | <resources prefix="OpenGrid.Config.GridConfigDb4o" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="DbGridConfig.cs" /> | 15 | <include name="DbGridConfig.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="System.Data.dll.dll" /> | 23 | <include name="System.Data.dll.dll" /> |
24 | <include name="System.Xml.dll" /> | 24 | <include name="System.Xml.dll" /> |
25 | <include name="../../../bin/libsecondlife.dll" /> | 25 | <include name="../../../bin/libsecondlife.dll" /> |
26 | <include name="../../../bin/Db4objects.Db4o.dll" /> | 26 | <include name="../../../bin/Db4objects.Db4o.dll" /> |
27 | <include name="../../../bin/OpenSim.Framework.dll" /> | 27 | <include name="../../../bin/OpenSim.Framework.dll" /> |
28 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | 28 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> |
29 | </references> | 29 | </references> |
30 | </csc> | 30 | </csc> |
31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | 31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> |
32 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | 32 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> |
33 | <copy todir="${project::get-base-directory()}/../../../bin/"> | 33 | <copy todir="${project::get-base-directory()}/../../../bin/"> |
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
35 | <include name="*.dll"/> | 35 | <include name="*.dll"/> |
36 | <include name="*.exe"/> | 36 | <include name="*.exe"/> |
37 | </fileset> | 37 | </fileset> |
38 | </copy> | 38 | </copy> |
39 | </target> | 39 | </target> |
40 | <target name="clean"> | 40 | <target name="clean"> |
41 | <delete dir="${bin.dir}" failonerror="false" /> | 41 | <delete dir="${bin.dir}" failonerror="false" /> |
42 | <delete dir="${obj.dir}" failonerror="false" /> | 42 | <delete dir="${obj.dir}" failonerror="false" /> |
43 | </target> | 43 | </target> |
44 | <target name="doc" description="Creates documentation."> | 44 | <target name="doc" description="Creates documentation."> |
45 | </target> | 45 | </target> |
46 | </project> | 46 | </project> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build index 7cf8e47..8e0f53a 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build | |||
@@ -1,47 +1,47 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenGrid.Framework.Data.DB4o" default="build"> | 2 | <project name="OpenGrid.Framework.Data.DB4o" 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" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenGrid.Framework.Data.DB4o" dynamicprefix="true" > | 11 | <resources prefix="OpenGrid.Framework.Data.DB4o" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="DB4oGridData.cs" /> | 14 | <include name="DB4oGridData.cs" /> |
15 | <include name="DB4oManager.cs" /> | 15 | <include name="DB4oManager.cs" /> |
16 | <include name="DB4oUserData.cs" /> | 16 | <include name="DB4oUserData.cs" /> |
17 | <include name="Properties/AssemblyInfo.cs" /> | 17 | <include name="Properties/AssemblyInfo.cs" /> |
18 | </sources> | 18 | </sources> |
19 | <references basedir="${project::get-base-directory()}"> | 19 | <references basedir="${project::get-base-directory()}"> |
20 | <lib> | 20 | <lib> |
21 | <include name="${project::get-base-directory()}" /> | 21 | <include name="${project::get-base-directory()}" /> |
22 | <include name="${project::get-base-directory()}/${build.dir}" /> | 22 | <include name="${project::get-base-directory()}/${build.dir}" /> |
23 | </lib> | 23 | </lib> |
24 | <include name="System.dll" /> | 24 | <include name="System.dll" /> |
25 | <include name="System.Xml.dll" /> | 25 | <include name="System.Xml.dll" /> |
26 | <include name="System.Data.dll" /> | 26 | <include name="System.Data.dll" /> |
27 | <include name="../../bin/OpenGrid.Framework.Data.dll" /> | 27 | <include name="../../bin/OpenGrid.Framework.Data.dll" /> |
28 | <include name="../../bin/libsecondlife.dll" /> | 28 | <include name="../../bin/libsecondlife.dll" /> |
29 | <include name="../../bin/Db4objects.Db4o.dll" /> | 29 | <include name="../../bin/Db4objects.Db4o.dll" /> |
30 | </references> | 30 | </references> |
31 | </csc> | 31 | </csc> |
32 | <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/" /> |
33 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 33 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
34 | <copy todir="${project::get-base-directory()}/../../bin/"> | 34 | <copy todir="${project::get-base-directory()}/../../bin/"> |
35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
36 | <include name="*.dll"/> | 36 | <include name="*.dll"/> |
37 | <include name="*.exe"/> | 37 | <include name="*.exe"/> |
38 | </fileset> | 38 | </fileset> |
39 | </copy> | 39 | </copy> |
40 | </target> | 40 | </target> |
41 | <target name="clean"> | 41 | <target name="clean"> |
42 | <delete dir="${bin.dir}" failonerror="false" /> | 42 | <delete dir="${bin.dir}" failonerror="false" /> |
43 | <delete dir="${obj.dir}" failonerror="false" /> | 43 | <delete dir="${obj.dir}" failonerror="false" /> |
44 | </target> | 44 | </target> |
45 | <target name="doc" description="Creates documentation."> | 45 | <target name="doc" description="Creates documentation."> |
46 | </target> | 46 | </target> |
47 | </project> | 47 | </project> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build index b32ce3d..5b6b75b 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build | |||
@@ -1,45 +1,45 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenGrid.Framework.Data.MSSQL" default="build"> | 2 | <project name="OpenGrid.Framework.Data.MSSQL" 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" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenGrid.Framework.Data.MSSQL" dynamicprefix="true" > | 11 | <resources prefix="OpenGrid.Framework.Data.MSSQL" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="MSSQLGridData.cs" /> | 14 | <include name="MSSQLGridData.cs" /> |
15 | <include name="MSSQLManager.cs" /> | 15 | <include name="MSSQLManager.cs" /> |
16 | <include name="Properties/AssemblyInfo.cs" /> | 16 | <include name="Properties/AssemblyInfo.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
19 | <lib> | 19 | <lib> |
20 | <include name="${project::get-base-directory()}" /> | 20 | <include name="${project::get-base-directory()}" /> |
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | 21 | <include name="${project::get-base-directory()}/${build.dir}" /> |
22 | </lib> | 22 | </lib> |
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Xml.dll" /> | 24 | <include name="System.Xml.dll" /> |
25 | <include name="System.Data.dll" /> | 25 | <include name="System.Data.dll" /> |
26 | <include name="../../bin/OpenGrid.Framework.Data.dll" /> | 26 | <include name="../../bin/OpenGrid.Framework.Data.dll" /> |
27 | <include name="../../bin/libsecondlife.dll" /> | 27 | <include name="../../bin/libsecondlife.dll" /> |
28 | </references> | 28 | </references> |
29 | </csc> | 29 | </csc> |
30 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 30 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
31 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 31 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
32 | <copy todir="${project::get-base-directory()}/../../bin/"> | 32 | <copy todir="${project::get-base-directory()}/../../bin/"> |
33 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 33 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
34 | <include name="*.dll"/> | 34 | <include name="*.dll"/> |
35 | <include name="*.exe"/> | 35 | <include name="*.exe"/> |
36 | </fileset> | 36 | </fileset> |
37 | </copy> | 37 | </copy> |
38 | </target> | 38 | </target> |
39 | <target name="clean"> | 39 | <target name="clean"> |
40 | <delete dir="${bin.dir}" failonerror="false" /> | 40 | <delete dir="${bin.dir}" failonerror="false" /> |
41 | <delete dir="${obj.dir}" failonerror="false" /> | 41 | <delete dir="${obj.dir}" failonerror="false" /> |
42 | </target> | 42 | </target> |
43 | <target name="doc" description="Creates documentation."> | 43 | <target name="doc" description="Creates documentation."> |
44 | </target> | 44 | </target> |
45 | </project> | 45 | </project> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj index 93f409e..e94eb96 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj +++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj | |||
@@ -1,4 +1,4 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
@@ -6,8 +6,7 @@ | |||
6 | <ProjectGuid>{0F3C3AC1-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{0F3C3AC1-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | </ApplicationIcon> | ||
11 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
12 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
13 | <AssemblyName>OpenGrid.Framework.Data.MySQL</AssemblyName> | 12 | <AssemblyName>OpenGrid.Framework.Data.MySQL</AssemblyName> |
@@ -16,11 +15,9 @@ | |||
16 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
17 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
18 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
19 | <AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
20 | </AppDesignerFolder> | ||
21 | <RootNamespace>OpenGrid.Framework.Data.MySQL</RootNamespace> | 19 | <RootNamespace>OpenGrid.Framework.Data.MySQL</RootNamespace> |
22 | <StartupObject> | 20 | <StartupObject></StartupObject> |
23 | </StartupObject> | ||
24 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
25 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
26 | </PropertyGroup> | 23 | </PropertyGroup> |
@@ -31,8 +28,7 @@ | |||
31 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
32 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
33 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
34 | <DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
35 | </DocumentationFile> | ||
36 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
37 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
38 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
@@ -41,8 +37,7 @@ | |||
41 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
42 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
43 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
44 | <NoWarn> | 40 | <NoWarn></NoWarn> |
45 | </NoWarn> | ||
46 | </PropertyGroup> | 41 | </PropertyGroup> |
47 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
48 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
@@ -51,8 +46,7 @@ | |||
51 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
52 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
53 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE</DefineConstants> |
54 | <DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
55 | </DocumentationFile> | ||
56 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
57 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
58 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
@@ -61,27 +55,26 @@ | |||
61 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
62 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
63 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
64 | <NoWarn> | 58 | <NoWarn></NoWarn> |
65 | </NoWarn> | ||
66 | </PropertyGroup> | 59 | </PropertyGroup> |
67 | <ItemGroup> | 60 | <ItemGroup> |
68 | <Reference Include="System"> | 61 | <Reference Include="System" > |
69 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
70 | <Private>False</Private> | 63 | <Private>False</Private> |
71 | </Reference> | 64 | </Reference> |
72 | <Reference Include="System.Xml"> | 65 | <Reference Include="System.Xml" > |
73 | <HintPath>System.Xml.dll</HintPath> | 66 | <HintPath>System.Xml.dll</HintPath> |
74 | <Private>False</Private> | 67 | <Private>False</Private> |
75 | </Reference> | 68 | </Reference> |
76 | <Reference Include="System.Data"> | 69 | <Reference Include="System.Data" > |
77 | <HintPath>System.Data.dll</HintPath> | 70 | <HintPath>System.Data.dll</HintPath> |
78 | <Private>False</Private> | 71 | <Private>False</Private> |
79 | </Reference> | 72 | </Reference> |
80 | <Reference Include="libsecondlife.dll"> | 73 | <Reference Include="libsecondlife.dll" > |
81 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> | 74 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> |
82 | <Private>False</Private> | 75 | <Private>False</Private> |
83 | </Reference> | 76 | </Reference> |
84 | <Reference Include="MySql.Data.dll"> | 77 | <Reference Include="MySql.Data.dll" > |
85 | <HintPath>..\..\bin\MySql.Data.dll</HintPath> | 78 | <HintPath>..\..\bin\MySql.Data.dll</HintPath> |
86 | <Private>False</Private> | 79 | <Private>False</Private> |
87 | </Reference> | 80 | </Reference> |
@@ -91,14 +84,16 @@ | |||
91 | <Name>OpenGrid.Framework.Data</Name> | 84 | <Name>OpenGrid.Framework.Data</Name> |
92 | <Project>{62CDF671-0000-0000-0000-000000000000}</Project> | 85 | <Project>{62CDF671-0000-0000-0000-000000000000}</Project> |
93 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
94 | <Private>False</Private> | 87 | <Private>False</Private> |
95 | </ProjectReference> | 88 | </ProjectReference> |
96 | </ItemGroup> | 89 | </ItemGroup> |
97 | <ItemGroup> | 90 | <ItemGroup> |
98 | <Compile Include="MySQLGridData.cs"> | 91 | <Compile Include="MySQLGridData.cs"> |
99 | <SubType>Code</SubType> | 92 | <SubType>Code</SubType> |
100 | </Compile> | 93 | </Compile> |
101 | <Compile Include="MySQLLogData.cs" /> | 94 | <Compile Include="MySQLLogData.cs"> |
95 | <SubType>Code</SubType> | ||
96 | </Compile> | ||
102 | <Compile Include="MySQLManager.cs"> | 97 | <Compile Include="MySQLManager.cs"> |
103 | <SubType>Code</SubType> | 98 | <SubType>Code</SubType> |
104 | </Compile> | 99 | </Compile> |
@@ -116,4 +111,4 @@ | |||
116 | <PostBuildEvent> | 111 | <PostBuildEvent> |
117 | </PostBuildEvent> | 112 | </PostBuildEvent> |
118 | </PropertyGroup> | 113 | </PropertyGroup> |
119 | </Project> \ No newline at end of file | 114 | </Project> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build index dd50127..d92d6e0 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build | |||
@@ -1,47 +1,48 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenGrid.Framework.Data.MySQL" default="build"> | 2 | <project name="OpenGrid.Framework.Data.MySQL" 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" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenGrid.Framework.Data.MySQL" dynamicprefix="true" > | 11 | <resources prefix="OpenGrid.Framework.Data.MySQL" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="MySQLGridData.cs" /> | 14 | <include name="MySQLGridData.cs" /> |
15 | <include name="MySQLManager.cs" /> | 15 | <include name="MySQLLogData.cs" /> |
16 | <include name="MySQLUserData.cs" /> | 16 | <include name="MySQLManager.cs" /> |
17 | <include name="Properties/AssemblyInfo.cs" /> | 17 | <include name="MySQLUserData.cs" /> |
18 | </sources> | 18 | <include name="Properties/AssemblyInfo.cs" /> |
19 | <references basedir="${project::get-base-directory()}"> | 19 | </sources> |
20 | <lib> | 20 | <references basedir="${project::get-base-directory()}"> |
21 | <include name="${project::get-base-directory()}" /> | 21 | <lib> |
22 | <include name="${project::get-base-directory()}/${build.dir}" /> | 22 | <include name="${project::get-base-directory()}" /> |
23 | </lib> | 23 | <include name="${project::get-base-directory()}/${build.dir}" /> |
24 | <include name="System.dll" /> | 24 | </lib> |
25 | <include name="System.Xml.dll" /> | 25 | <include name="System.dll" /> |
26 | <include name="System.Data.dll" /> | 26 | <include name="System.Xml.dll" /> |
27 | <include name="../../bin/OpenGrid.Framework.Data.dll" /> | 27 | <include name="System.Data.dll" /> |
28 | <include name="../../bin/libsecondlife.dll" /> | 28 | <include name="../../bin/OpenGrid.Framework.Data.dll" /> |
29 | <include name="../../bin/MySql.Data.dll" /> | 29 | <include name="../../bin/libsecondlife.dll" /> |
30 | </references> | 30 | <include name="../../bin/MySql.Data.dll" /> |
31 | </csc> | 31 | </references> |
32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 32 | </csc> |
33 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 33 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
34 | <copy todir="${project::get-base-directory()}/../../bin/"> | 34 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 35 | <copy todir="${project::get-base-directory()}/../../bin/"> |
36 | <include name="*.dll"/> | 36 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
37 | <include name="*.exe"/> | 37 | <include name="*.dll"/> |
38 | </fileset> | 38 | <include name="*.exe"/> |
39 | </copy> | 39 | </fileset> |
40 | </target> | 40 | </copy> |
41 | <target name="clean"> | 41 | </target> |
42 | <delete dir="${bin.dir}" failonerror="false" /> | 42 | <target name="clean"> |
43 | <delete dir="${obj.dir}" failonerror="false" /> | 43 | <delete dir="${bin.dir}" failonerror="false" /> |
44 | </target> | 44 | <delete dir="${obj.dir}" failonerror="false" /> |
45 | <target name="doc" description="Creates documentation."> | 45 | </target> |
46 | </target> | 46 | <target name="doc" description="Creates documentation."> |
47 | </project> | 47 | </target> |
48 | </project> | ||
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build index f1d69df..1be9b43 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build | |||
@@ -1,46 +1,46 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenGrid.Framework.Data.SQLite" default="build"> | 2 | <project name="OpenGrid.Framework.Data.SQLite" 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" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenGrid.Framework.Data.SQLite" dynamicprefix="true" > | 11 | <resources prefix="OpenGrid.Framework.Data.SQLite" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="SQLiteGridData.cs" /> | 14 | <include name="SQLiteGridData.cs" /> |
15 | <include name="SQLiteManager.cs" /> | 15 | <include name="SQLiteManager.cs" /> |
16 | <include name="Properties/AssemblyInfo.cs" /> | 16 | <include name="Properties/AssemblyInfo.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
19 | <lib> | 19 | <lib> |
20 | <include name="${project::get-base-directory()}" /> | 20 | <include name="${project::get-base-directory()}" /> |
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | 21 | <include name="${project::get-base-directory()}/${build.dir}" /> |
22 | </lib> | 22 | </lib> |
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Xml.dll" /> | 24 | <include name="System.Xml.dll" /> |
25 | <include name="System.Data.dll" /> | 25 | <include name="System.Data.dll" /> |
26 | <include name="../../bin/System.Data.SQLite.dll" /> | 26 | <include name="../../bin/System.Data.SQLite.dll" /> |
27 | <include name="../../bin/OpenGrid.Framework.Data.dll" /> | 27 | <include name="../../bin/OpenGrid.Framework.Data.dll" /> |
28 | <include name="../../bin/libsecondlife.dll" /> | 28 | <include name="../../bin/libsecondlife.dll" /> |
29 | </references> | 29 | </references> |
30 | </csc> | 30 | </csc> |
31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
32 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 32 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
33 | <copy todir="${project::get-base-directory()}/../../bin/"> | 33 | <copy todir="${project::get-base-directory()}/../../bin/"> |
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
35 | <include name="*.dll"/> | 35 | <include name="*.dll"/> |
36 | <include name="*.exe"/> | 36 | <include name="*.exe"/> |
37 | </fileset> | 37 | </fileset> |
38 | </copy> | 38 | </copy> |
39 | </target> | 39 | </target> |
40 | <target name="clean"> | 40 | <target name="clean"> |
41 | <delete dir="${bin.dir}" failonerror="false" /> | 41 | <delete dir="${bin.dir}" failonerror="false" /> |
42 | <delete dir="${obj.dir}" failonerror="false" /> | 42 | <delete dir="${obj.dir}" failonerror="false" /> |
43 | </target> | 43 | </target> |
44 | <target name="doc" description="Creates documentation."> | 44 | <target name="doc" description="Creates documentation."> |
45 | </target> | 45 | </target> |
46 | </project> | 46 | </project> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj index 5b24438..be1f7aa 100644 --- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj +++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj | |||
@@ -1,4 +1,4 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
@@ -6,8 +6,7 @@ | |||
6 | <ProjectGuid>{62CDF671-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{62CDF671-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | </ApplicationIcon> | ||
11 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
12 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
13 | <AssemblyName>OpenGrid.Framework.Data</AssemblyName> | 12 | <AssemblyName>OpenGrid.Framework.Data</AssemblyName> |
@@ -16,11 +15,9 @@ | |||
16 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
17 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
18 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
19 | <AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
20 | </AppDesignerFolder> | ||
21 | <RootNamespace>OpenGrid.Framework.Data</RootNamespace> | 19 | <RootNamespace>OpenGrid.Framework.Data</RootNamespace> |
22 | <StartupObject> | 20 | <StartupObject></StartupObject> |
23 | </StartupObject> | ||
24 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
25 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
26 | </PropertyGroup> | 23 | </PropertyGroup> |
@@ -31,8 +28,7 @@ | |||
31 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
32 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
33 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
34 | <DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
35 | </DocumentationFile> | ||
36 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
37 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
38 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
@@ -41,8 +37,7 @@ | |||
41 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
42 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
43 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
44 | <NoWarn> | 40 | <NoWarn></NoWarn> |
45 | </NoWarn> | ||
46 | </PropertyGroup> | 41 | </PropertyGroup> |
47 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
48 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
@@ -51,8 +46,7 @@ | |||
51 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
52 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
53 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE</DefineConstants> |
54 | <DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
55 | </DocumentationFile> | ||
56 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
57 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
58 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
@@ -61,23 +55,22 @@ | |||
61 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
62 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
63 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
64 | <NoWarn> | 58 | <NoWarn></NoWarn> |
65 | </NoWarn> | ||
66 | </PropertyGroup> | 59 | </PropertyGroup> |
67 | <ItemGroup> | 60 | <ItemGroup> |
68 | <Reference Include="System"> | 61 | <Reference Include="System" > |
69 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
70 | <Private>False</Private> | 63 | <Private>False</Private> |
71 | </Reference> | 64 | </Reference> |
72 | <Reference Include="System.Xml"> | 65 | <Reference Include="System.Xml" > |
73 | <HintPath>System.Xml.dll</HintPath> | 66 | <HintPath>System.Xml.dll</HintPath> |
74 | <Private>False</Private> | 67 | <Private>False</Private> |
75 | </Reference> | 68 | </Reference> |
76 | <Reference Include="System.Data"> | 69 | <Reference Include="System.Data" > |
77 | <HintPath>System.Data.dll</HintPath> | 70 | <HintPath>System.Data.dll</HintPath> |
78 | <Private>False</Private> | 71 | <Private>False</Private> |
79 | </Reference> | 72 | </Reference> |
80 | <Reference Include="libsecondlife.dll"> | 73 | <Reference Include="libsecondlife.dll" > |
81 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> | 74 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> |
82 | <Private>False</Private> | 75 | <Private>False</Private> |
83 | </Reference> | 76 | </Reference> |
@@ -88,7 +81,9 @@ | |||
88 | <Compile Include="GridData.cs"> | 81 | <Compile Include="GridData.cs"> |
89 | <SubType>Code</SubType> | 82 | <SubType>Code</SubType> |
90 | </Compile> | 83 | </Compile> |
91 | <Compile Include="ILogData.cs" /> | 84 | <Compile Include="ILogData.cs"> |
85 | <SubType>Code</SubType> | ||
86 | </Compile> | ||
92 | <Compile Include="IniConfig.cs"> | 87 | <Compile Include="IniConfig.cs"> |
93 | <SubType>Code</SubType> | 88 | <SubType>Code</SubType> |
94 | </Compile> | 89 | </Compile> |
@@ -112,4 +107,4 @@ | |||
112 | <PostBuildEvent> | 107 | <PostBuildEvent> |
113 | </PostBuildEvent> | 108 | </PostBuildEvent> |
114 | </PropertyGroup> | 109 | </PropertyGroup> |
115 | </Project> \ No newline at end of file | 110 | </Project> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build index 1357f47..26f72da 100644 --- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build | |||
@@ -1,47 +1,48 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenGrid.Framework.Data" default="build"> | 2 | <project name="OpenGrid.Framework.Data" 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" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenGrid.Framework.Data" dynamicprefix="true" > | 11 | <resources prefix="OpenGrid.Framework.Data" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="GridData.cs" /> | 14 | <include name="GridData.cs" /> |
15 | <include name="IniConfig.cs" /> | 15 | <include name="ILogData.cs" /> |
16 | <include name="SimProfileData.cs" /> | 16 | <include name="IniConfig.cs" /> |
17 | <include name="UserData.cs" /> | 17 | <include name="SimProfileData.cs" /> |
18 | <include name="UserProfileData.cs" /> | 18 | <include name="UserData.cs" /> |
19 | <include name="Properties/AssemblyInfo.cs" /> | 19 | <include name="UserProfileData.cs" /> |
20 | </sources> | 20 | <include name="Properties/AssemblyInfo.cs" /> |
21 | <references basedir="${project::get-base-directory()}"> | 21 | </sources> |
22 | <lib> | 22 | <references basedir="${project::get-base-directory()}"> |
23 | <include name="${project::get-base-directory()}" /> | 23 | <lib> |
24 | <include name="${project::get-base-directory()}/${build.dir}" /> | 24 | <include name="${project::get-base-directory()}" /> |
25 | </lib> | 25 | <include name="${project::get-base-directory()}/${build.dir}" /> |
26 | <include name="System.dll" /> | 26 | </lib> |
27 | <include name="System.Xml.dll" /> | 27 | <include name="System.dll" /> |
28 | <include name="System.Data.dll" /> | 28 | <include name="System.Xml.dll" /> |
29 | <include name="../../bin/libsecondlife.dll" /> | 29 | <include name="System.Data.dll" /> |
30 | </references> | 30 | <include name="../../bin/libsecondlife.dll" /> |
31 | </csc> | 31 | </references> |
32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 32 | </csc> |
33 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 33 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
34 | <copy todir="${project::get-base-directory()}/../../bin/"> | 34 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 35 | <copy todir="${project::get-base-directory()}/../../bin/"> |
36 | <include name="*.dll"/> | 36 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
37 | <include name="*.exe"/> | 37 | <include name="*.dll"/> |
38 | </fileset> | 38 | <include name="*.exe"/> |
39 | </copy> | 39 | </fileset> |
40 | </target> | 40 | </copy> |
41 | <target name="clean"> | 41 | </target> |
42 | <delete dir="${bin.dir}" failonerror="false" /> | 42 | <target name="clean"> |
43 | <delete dir="${obj.dir}" failonerror="false" /> | 43 | <delete dir="${bin.dir}" failonerror="false" /> |
44 | </target> | 44 | <delete dir="${obj.dir}" failonerror="false" /> |
45 | <target name="doc" description="Creates documentation."> | 45 | </target> |
46 | </target> | 46 | <target name="doc" description="Creates documentation."> |
47 | </project> | 47 | </target> |
48 | </project> | ||
diff --git a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj index ea7548a..dad56cb 100644 --- a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj +++ b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj | |||
@@ -62,12 +62,12 @@ | |||
62 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="OpenSim.Framework" > | 65 | <Reference Include="OpenSim.Framework.dll" > |
66 | <HintPath>OpenSim.Framework.dll</HintPath> | 66 | <HintPath>..\..\bin\OpenSim.Framework.dll</HintPath> |
67 | <Private>False</Private> | 67 | <Private>False</Private> |
68 | </Reference> | 68 | </Reference> |
69 | <Reference Include="OpenSim.Servers" > | 69 | <Reference Include="OpenSim.Servers.dll" > |
70 | <HintPath>OpenSim.Servers.dll</HintPath> | 70 | <HintPath>..\..\bin\OpenSim.Servers.dll</HintPath> |
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | <Reference Include="libsecondlife.dll" > | 73 | <Reference Include="libsecondlife.dll" > |
diff --git a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build index 6062bbd..f8cc80e 100644 --- a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build | |||
@@ -1,44 +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" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" 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/libsecondlife.dll" /> | 25 | <include name="../../bin/libsecondlife.dll" /> |
26 | <include name="../../bin/XMLRPC.dll" /> | 26 | <include name="../../bin/XMLRPC.dll" /> |
27 | </references> | 27 | </references> |
28 | </csc> | 28 | </csc> |
29 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 29 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
30 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 30 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
31 | <copy todir="${project::get-base-directory()}/../../bin/"> | 31 | <copy todir="${project::get-base-directory()}/../../bin/"> |
32 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 32 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
33 | <include name="*.dll"/> | 33 | <include name="*.dll"/> |
34 | <include name="*.exe"/> | 34 | <include name="*.exe"/> |
35 | </fileset> | 35 | </fileset> |
36 | </copy> | 36 | </copy> |
37 | </target> | 37 | </target> |
38 | <target name="clean"> | 38 | <target name="clean"> |
39 | <delete dir="${bin.dir}" failonerror="false" /> | 39 | <delete dir="${bin.dir}" failonerror="false" /> |
40 | <delete dir="${obj.dir}" failonerror="false" /> | 40 | <delete dir="${obj.dir}" failonerror="false" /> |
41 | </target> | 41 | </target> |
42 | <target name="doc" description="Creates documentation."> | 42 | <target name="doc" description="Creates documentation."> |
43 | </target> | 43 | </target> |
44 | </project> | 44 | </project> |
diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build index 1f55802..e889a4d 100644 --- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build +++ b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build | |||
@@ -1,50 +1,50 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenGridServices.AssetServer" default="build"> | 2 | <project name="OpenGridServices.AssetServer" 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="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> | 10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> |
11 | <resources prefix="OpenGridServices.AssetServer" dynamicprefix="true" > | 11 | <resources prefix="OpenGridServices.AssetServer" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssetHttpServer.cs" /> | 14 | <include name="AssetHttpServer.cs" /> |
15 | <include name="Main.cs" /> | 15 | <include name="Main.cs" /> |
16 | <include name="Properties/AssemblyInfo.cs" /> | 16 | <include name="Properties/AssemblyInfo.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
19 | <lib> | 19 | <lib> |
20 | <include name="${project::get-base-directory()}" /> | 20 | <include name="${project::get-base-directory()}" /> |
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | 21 | <include name="${project::get-base-directory()}/${build.dir}" /> |
22 | </lib> | 22 | </lib> |
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Data.dll" /> | 24 | <include name="System.Data.dll" /> |
25 | <include name="System.Xml.dll" /> | 25 | <include name="System.Xml.dll" /> |
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/OpenSim.GridInterfaces.Local.dll" /> | 28 | <include name="../../bin/OpenSim.GridInterfaces.Local.dll" /> |
29 | <include name="../../bin/OpenSim.Servers.dll" /> | 29 | <include name="../../bin/OpenSim.Servers.dll" /> |
30 | <include name="../../bin/libsecondlife.dll" /> | 30 | <include name="../../bin/libsecondlife.dll" /> |
31 | <include name="../../bin/Db4objects.Db4o.dll" /> | 31 | <include name="../../bin/Db4objects.Db4o.dll" /> |
32 | <include name="../../bin/XMLRPC.dll" /> | 32 | <include name="../../bin/XMLRPC.dll" /> |
33 | </references> | 33 | </references> |
34 | </csc> | 34 | </csc> |
35 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 35 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
36 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 36 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
37 | <copy todir="${project::get-base-directory()}/../../bin/"> | 37 | <copy todir="${project::get-base-directory()}/../../bin/"> |
38 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 38 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
39 | <include name="*.dll"/> | 39 | <include name="*.dll"/> |
40 | <include name="*.exe"/> | 40 | <include name="*.exe"/> |
41 | </fileset> | 41 | </fileset> |
42 | </copy> | 42 | </copy> |
43 | </target> | 43 | </target> |
44 | <target name="clean"> | 44 | <target name="clean"> |
45 | <delete dir="${bin.dir}" failonerror="false" /> | 45 | <delete dir="${bin.dir}" failonerror="false" /> |
46 | <delete dir="${obj.dir}" failonerror="false" /> | 46 | <delete dir="${obj.dir}" failonerror="false" /> |
47 | </target> | 47 | </target> |
48 | <target name="doc" description="Creates documentation."> | 48 | <target name="doc" description="Creates documentation."> |
49 | </target> | 49 | </target> |
50 | </project> | 50 | </project> |
diff --git a/OpenGridServices/OpenGridServices.GridServer/GridManager.cs b/OpenGridServices/OpenGridServices.GridServer/GridManager.cs index 74ce973..8d4517f 100644 --- a/OpenGridServices/OpenGridServices.GridServer/GridManager.cs +++ b/OpenGridServices/OpenGridServices.GridServer/GridManager.cs | |||
@@ -315,7 +315,7 @@ namespace OpenGridServices.GridServer | |||
315 | response.Value = responseData; | 315 | response.Value = responseData; |
316 | IList simProfileList = new ArrayList(); | 316 | IList simProfileList = new ArrayList(); |
317 | 317 | ||
318 | bool fastMode = false; // MySQL Only | 318 | bool fastMode = true; // MySQL Only |
319 | 319 | ||
320 | if (fastMode) | 320 | if (fastMode) |
321 | { | 321 | { |
@@ -327,14 +327,15 @@ namespace OpenGridServices.GridServer | |||
327 | simProfileBlock["x"] = aSim.Value.regionLocX; | 327 | simProfileBlock["x"] = aSim.Value.regionLocX; |
328 | simProfileBlock["y"] = aSim.Value.regionLocY; | 328 | simProfileBlock["y"] = aSim.Value.regionLocY; |
329 | simProfileBlock["name"] = aSim.Value.regionName; | 329 | simProfileBlock["name"] = aSim.Value.regionName; |
330 | simProfileBlock["access"] = 0; | 330 | simProfileBlock["access"] = 21; |
331 | simProfileBlock["region-flags"] = 0; | 331 | simProfileBlock["region-flags"] = 512; |
332 | simProfileBlock["water-height"] = 20; | 332 | simProfileBlock["water-height"] = 0; |
333 | simProfileBlock["agents"] = 1; | 333 | simProfileBlock["agents"] = 1; |
334 | simProfileBlock["map-image-id"] = aSim.Value.regionMapTextureID.ToString(); | 334 | simProfileBlock["map-image-id"] = aSim.Value.regionMapTextureID.ToString(); |
335 | 335 | ||
336 | simProfileList.Add(simProfileBlock); | 336 | simProfileList.Add(simProfileBlock); |
337 | } | 337 | } |
338 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via FastMode"); | ||
338 | } | 339 | } |
339 | else | 340 | else |
340 | { | 341 | { |
@@ -360,6 +361,7 @@ namespace OpenGridServices.GridServer | |||
360 | } | 361 | } |
361 | } | 362 | } |
362 | } | 363 | } |
364 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via Standard Mode"); | ||
363 | } | 365 | } |
364 | 366 | ||
365 | responseData["sim-profiles"] = simProfileList; | 367 | responseData["sim-profiles"] = simProfileList; |
diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build index d60c804..9d21edd 100644 --- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build +++ b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build | |||
@@ -1,52 +1,52 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenGridServices.GridServer" default="build"> | 2 | <project name="OpenGridServices.GridServer" 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="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> | 10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> |
11 | <resources prefix="OpenGridServices.GridServer" dynamicprefix="true" > | 11 | <resources prefix="OpenGridServices.GridServer" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="GridManager.cs" /> | 14 | <include name="GridManager.cs" /> |
15 | <include name="Main.cs" /> | 15 | <include name="Main.cs" /> |
16 | <include name="Properties/AssemblyInfo.cs" /> | 16 | <include name="Properties/AssemblyInfo.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
19 | <lib> | 19 | <lib> |
20 | <include name="${project::get-base-directory()}" /> | 20 | <include name="${project::get-base-directory()}" /> |
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | 21 | <include name="${project::get-base-directory()}/${build.dir}" /> |
22 | </lib> | 22 | </lib> |
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Data.dll" /> | 24 | <include name="System.Data.dll" /> |
25 | <include name="System.Xml.dll" /> | 25 | <include name="System.Xml.dll" /> |
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/OpenSim.Servers.dll" /> | 28 | <include name="../../bin/OpenSim.Servers.dll" /> |
29 | <include name="../../bin/OpenGrid.Framework.Data.dll" /> | 29 | <include name="../../bin/OpenGrid.Framework.Data.dll" /> |
30 | <include name="../../bin/OpenGrid.Framework.Manager.dll" /> | 30 | <include name="../../bin/OpenGrid.Framework.Manager.dll" /> |
31 | <include name="../../bin/OpenSim.GenericConfig.Xml.dll" /> | 31 | <include name="../../bin/OpenSim.GenericConfig.Xml.dll" /> |
32 | <include name="../../bin/libsecondlife.dll" /> | 32 | <include name="../../bin/libsecondlife.dll" /> |
33 | <include name="../../bin/Db4objects.Db4o.dll" /> | 33 | <include name="../../bin/Db4objects.Db4o.dll" /> |
34 | <include name="../../bin/XMLRPC.dll" /> | 34 | <include name="../../bin/XMLRPC.dll" /> |
35 | </references> | 35 | </references> |
36 | </csc> | 36 | </csc> |
37 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 37 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
38 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 38 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
39 | <copy todir="${project::get-base-directory()}/../../bin/"> | 39 | <copy todir="${project::get-base-directory()}/../../bin/"> |
40 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 40 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
41 | <include name="*.dll"/> | 41 | <include name="*.dll"/> |
42 | <include name="*.exe"/> | 42 | <include name="*.exe"/> |
43 | </fileset> | 43 | </fileset> |
44 | </copy> | 44 | </copy> |
45 | </target> | 45 | </target> |
46 | <target name="clean"> | 46 | <target name="clean"> |
47 | <delete dir="${bin.dir}" failonerror="false" /> | 47 | <delete dir="${bin.dir}" failonerror="false" /> |
48 | <delete dir="${obj.dir}" failonerror="false" /> | 48 | <delete dir="${obj.dir}" failonerror="false" /> |
49 | </target> | 49 | </target> |
50 | <target name="doc" description="Creates documentation."> | 50 | <target name="doc" description="Creates documentation."> |
51 | </target> | 51 | </target> |
52 | </project> | 52 | </project> |
diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build index 3596bb6..5275ef4 100644 --- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build +++ b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build | |||
@@ -1,51 +1,51 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenGridServices.UserServer" default="build"> | 2 | <project name="OpenGridServices.UserServer" 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="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> | 10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> |
11 | <resources prefix="OpenGridServices.UserServer" dynamicprefix="true" > | 11 | <resources prefix="OpenGridServices.UserServer" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="Main.cs" /> | 14 | <include name="Main.cs" /> |
15 | <include name="UserManager.cs" /> | 15 | <include name="UserManager.cs" /> |
16 | <include name="Properties/AssemblyInfo.cs" /> | 16 | <include name="Properties/AssemblyInfo.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
19 | <lib> | 19 | <lib> |
20 | <include name="${project::get-base-directory()}" /> | 20 | <include name="${project::get-base-directory()}" /> |
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | 21 | <include name="${project::get-base-directory()}/${build.dir}" /> |
22 | </lib> | 22 | </lib> |
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Data.dll" /> | 24 | <include name="System.Data.dll" /> |
25 | <include name="System.Xml.dll" /> | 25 | <include name="System.Xml.dll" /> |
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/OpenGrid.Framework.Data.dll" /> | 28 | <include name="../../bin/OpenGrid.Framework.Data.dll" /> |
29 | <include name="../../bin/OpenSim.GenericConfig.Xml.dll" /> | 29 | <include name="../../bin/OpenSim.GenericConfig.Xml.dll" /> |
30 | <include name="../../bin/OpenSim.Servers.dll" /> | 30 | <include name="../../bin/OpenSim.Servers.dll" /> |
31 | <include name="../../bin/libsecondlife.dll" /> | 31 | <include name="../../bin/libsecondlife.dll" /> |
32 | <include name="../../bin/Db4objects.Db4o.dll" /> | 32 | <include name="../../bin/Db4objects.Db4o.dll" /> |
33 | <include name="../../bin/XMLRPC.dll" /> | 33 | <include name="../../bin/XMLRPC.dll" /> |
34 | </references> | 34 | </references> |
35 | </csc> | 35 | </csc> |
36 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 36 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
37 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 37 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
38 | <copy todir="${project::get-base-directory()}/../../bin/"> | 38 | <copy todir="${project::get-base-directory()}/../../bin/"> |
39 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 39 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
40 | <include name="*.dll"/> | 40 | <include name="*.dll"/> |
41 | <include name="*.exe"/> | 41 | <include name="*.exe"/> |
42 | </fileset> | 42 | </fileset> |
43 | </copy> | 43 | </copy> |
44 | </target> | 44 | </target> |
45 | <target name="clean"> | 45 | <target name="clean"> |
46 | <delete dir="${bin.dir}" failonerror="false" /> | 46 | <delete dir="${bin.dir}" failonerror="false" /> |
47 | <delete dir="${obj.dir}" failonerror="false" /> | 47 | <delete dir="${obj.dir}" failonerror="false" /> |
48 | </target> | 48 | </target> |
49 | <target name="doc" description="Creates documentation."> | 49 | <target name="doc" description="Creates documentation."> |
50 | </target> | 50 | </target> |
51 | </project> | 51 | </project> |
diff --git a/OpenGridServices/OpenGridServices.UserServer/UserManager.cs b/OpenGridServices/OpenGridServices.UserServer/UserManager.cs index 47fd3c4..cd80621 100644 --- a/OpenGridServices/OpenGridServices.UserServer/UserManager.cs +++ b/OpenGridServices/OpenGridServices.UserServer/UserManager.cs | |||
@@ -493,8 +493,8 @@ namespace OpenGridServices.UserServer | |||
493 | Hashtable LoginFlagsHash = new Hashtable(); | 493 | Hashtable LoginFlagsHash = new Hashtable(); |
494 | LoginFlagsHash["daylight_savings"] = "N"; | 494 | LoginFlagsHash["daylight_savings"] = "N"; |
495 | LoginFlagsHash["stipend_since_login"] = "N"; | 495 | LoginFlagsHash["stipend_since_login"] = "N"; |
496 | LoginFlagsHash["gendered"] = "N"; // Needs to be combined with below... | 496 | LoginFlagsHash["gendered"] = "Y"; // Needs to be combined with below... |
497 | LoginFlagsHash["ever_logged_in"] = "N"; // Should allow male/female av selection | 497 | LoginFlagsHash["ever_logged_in"] = "Y"; // Should allow male/female av selection |
498 | ArrayList LoginFlags = new ArrayList(); | 498 | ArrayList LoginFlags = new ArrayList(); |
499 | LoginFlags.Add(LoginFlagsHash); | 499 | LoginFlags.Add(LoginFlagsHash); |
500 | 500 | ||
diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build index ee55724..2833bce 100644 --- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build +++ b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build | |||
@@ -1,46 +1,46 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenUser.Config.UserConfigDb4o" default="build"> | 2 | <project name="OpenUser.Config.UserConfigDb4o" 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" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenUser.Config.UserConfigDb4o" dynamicprefix="true" > | 11 | <resources prefix="OpenUser.Config.UserConfigDb4o" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="DbUserConfig.cs" /> | 15 | <include name="DbUserConfig.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="System.Data.dll.dll" /> | 23 | <include name="System.Data.dll.dll" /> |
24 | <include name="System.Xml.dll" /> | 24 | <include name="System.Xml.dll" /> |
25 | <include name="../../../bin/libsecondlife.dll" /> | 25 | <include name="../../../bin/libsecondlife.dll" /> |
26 | <include name="../../../bin/Db4objects.Db4o.dll" /> | 26 | <include name="../../../bin/Db4objects.Db4o.dll" /> |
27 | <include name="../../../bin/OpenSim.Framework.dll" /> | 27 | <include name="../../../bin/OpenSim.Framework.dll" /> |
28 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | 28 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> |
29 | </references> | 29 | </references> |
30 | </csc> | 30 | </csc> |
31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | 31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> |
32 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | 32 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> |
33 | <copy todir="${project::get-base-directory()}/../../../bin/"> | 33 | <copy todir="${project::get-base-directory()}/../../../bin/"> |
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
35 | <include name="*.dll"/> | 35 | <include name="*.dll"/> |
36 | <include name="*.exe"/> | 36 | <include name="*.exe"/> |
37 | </fileset> | 37 | </fileset> |
38 | </copy> | 38 | </copy> |
39 | </target> | 39 | </target> |
40 | <target name="clean"> | 40 | <target name="clean"> |
41 | <delete dir="${bin.dir}" failonerror="false" /> | 41 | <delete dir="${bin.dir}" failonerror="false" /> |
42 | <delete dir="${obj.dir}" failonerror="false" /> | 42 | <delete dir="${obj.dir}" failonerror="false" /> |
43 | </target> | 43 | </target> |
44 | <target name="doc" description="Creates documentation."> | 44 | <target name="doc" description="Creates documentation."> |
45 | </target> | 45 | </target> |
46 | </project> | 46 | </project> |
diff --git a/OpenGridServices/ServiceManager/ServiceManager.exe.build b/OpenGridServices/ServiceManager/ServiceManager.exe.build index b333cf2..163e086 100644 --- a/OpenGridServices/ServiceManager/ServiceManager.exe.build +++ b/OpenGridServices/ServiceManager/ServiceManager.exe.build | |||
@@ -1,41 +1,41 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="ServiceManager" default="build"> | 2 | <project name="ServiceManager" 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="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> | 10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> |
11 | <resources prefix="ServiceManager" dynamicprefix="true" > | 11 | <resources prefix="ServiceManager" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="ServiceManager.cs" /> | 14 | <include name="ServiceManager.cs" /> |
15 | </sources> | 15 | </sources> |
16 | <references basedir="${project::get-base-directory()}"> | 16 | <references basedir="${project::get-base-directory()}"> |
17 | <lib> | 17 | <lib> |
18 | <include name="${project::get-base-directory()}" /> | 18 | <include name="${project::get-base-directory()}" /> |
19 | <include name="${project::get-base-directory()}/${build.dir}" /> | 19 | <include name="${project::get-base-directory()}/${build.dir}" /> |
20 | </lib> | 20 | </lib> |
21 | <include name="System.dll" /> | 21 | <include name="System.dll" /> |
22 | <include name="System.ServiceProcess.dll" /> | 22 | <include name="System.ServiceProcess.dll" /> |
23 | <include name="System.Xml.dll" /> | 23 | <include name="System.Xml.dll" /> |
24 | </references> | 24 | </references> |
25 | </csc> | 25 | </csc> |
26 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 26 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
27 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 27 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
28 | <copy todir="${project::get-base-directory()}/../../bin/"> | 28 | <copy todir="${project::get-base-directory()}/../../bin/"> |
29 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 29 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
30 | <include name="*.dll"/> | 30 | <include name="*.dll"/> |
31 | <include name="*.exe"/> | 31 | <include name="*.exe"/> |
32 | </fileset> | 32 | </fileset> |
33 | </copy> | 33 | </copy> |
34 | </target> | 34 | </target> |
35 | <target name="clean"> | 35 | <target name="clean"> |
36 | <delete dir="${bin.dir}" failonerror="false" /> | 36 | <delete dir="${bin.dir}" failonerror="false" /> |
37 | <delete dir="${obj.dir}" failonerror="false" /> | 37 | <delete dir="${obj.dir}" failonerror="false" /> |
38 | </target> | 38 | </target> |
39 | <target name="doc" description="Creates documentation."> | 39 | <target name="doc" description="Creates documentation."> |
40 | </target> | 40 | </target> |
41 | </project> | 41 | </project> |