diff options
-rw-r--r-- | OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs | 131 | ||||
-rw-r--r-- | OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs | 171 | ||||
-rw-r--r-- | OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj | 108 | ||||
-rw-r--r-- | OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs | 35 | ||||
-rw-r--r-- | OpenSim.sln | 19 | ||||
-rw-r--r-- | prebuild.xml | 24 |
6 files changed, 482 insertions, 6 deletions
diff --git a/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs b/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs new file mode 100644 index 0000000..8a93d40 --- /dev/null +++ b/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs | |||
@@ -0,0 +1,131 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using OpenGrid.Framework.Data; | ||
5 | |||
6 | namespace OpenGrid.Framework.Data.MSSQL | ||
7 | { | ||
8 | public class SqlGridData : IGridData | ||
9 | { | ||
10 | private MSSqlManager database; | ||
11 | |||
12 | /// <summary> | ||
13 | /// Initialises the Grid Interface | ||
14 | /// </summary> | ||
15 | public void Initialise() | ||
16 | { | ||
17 | database = new MSSqlManager("localhost", "db", "user", "password", "false"); | ||
18 | } | ||
19 | |||
20 | /// <summary> | ||
21 | /// Shuts down the grid interface | ||
22 | /// </summary> | ||
23 | public void Close() | ||
24 | { | ||
25 | database.Close(); | ||
26 | } | ||
27 | |||
28 | public string getName() | ||
29 | { | ||
30 | return "Sql OpenGridData"; | ||
31 | } | ||
32 | |||
33 | public string getVersion() | ||
34 | { | ||
35 | return "0.1"; | ||
36 | } | ||
37 | |||
38 | /// <summary> | ||
39 | /// Returns a sim profile from it's location | ||
40 | /// </summary> | ||
41 | /// <param name="handle">Region location handle</param> | ||
42 | /// <returns>Sim profile</returns> | ||
43 | public SimProfileData GetProfileByHandle(ulong handle) | ||
44 | { | ||
45 | Dictionary<string, string> param = new Dictionary<string, string>(); | ||
46 | param["handle"] = handle.ToString(); | ||
47 | |||
48 | System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param); | ||
49 | System.Data.IDataReader reader = result.ExecuteReader(); | ||
50 | |||
51 | SimProfileData row = database.getRow(reader); | ||
52 | reader.Close(); | ||
53 | result.Dispose(); | ||
54 | |||
55 | return row; | ||
56 | } | ||
57 | |||
58 | /// <summary> | ||
59 | /// Returns a sim profile from it's UUID | ||
60 | /// </summary> | ||
61 | /// <param name="uuid">The region UUID</param> | ||
62 | /// <returns>The sim profile</returns> | ||
63 | public SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID uuid) | ||
64 | { | ||
65 | Dictionary<string, string> param = new Dictionary<string, string>(); | ||
66 | param["uuid"] = uuid.ToStringHyphenated(); | ||
67 | |||
68 | System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param); | ||
69 | System.Data.IDataReader reader = result.ExecuteReader(); | ||
70 | |||
71 | SimProfileData row = database.getRow(reader); | ||
72 | reader.Close(); | ||
73 | result.Dispose(); | ||
74 | |||
75 | return row; | ||
76 | } | ||
77 | |||
78 | public DataResponse AddProfile(SimProfileData profile) | ||
79 | { | ||
80 | if (database.insertRow(profile)) | ||
81 | { | ||
82 | return DataResponse.RESPONSE_OK; | ||
83 | } | ||
84 | else | ||
85 | { | ||
86 | return DataResponse.RESPONSE_ERROR; | ||
87 | } | ||
88 | } | ||
89 | |||
90 | /// <summary> | ||
91 | /// DEPRECIATED. Attempts to authenticate a region by comparing a shared secret. | ||
92 | /// </summary> | ||
93 | /// <param name="uuid">The UUID of the challenger</param> | ||
94 | /// <param name="handle">The attempted regionHandle of the challenger</param> | ||
95 | /// <param name="authkey">The secret</param> | ||
96 | /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns> | ||
97 | public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authkey) | ||
98 | { | ||
99 | bool throwHissyFit = false; // Should be true by 1.0 | ||
100 | |||
101 | if (throwHissyFit) | ||
102 | throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential."); | ||
103 | |||
104 | SimProfileData data = GetProfileByLLUUID(uuid); | ||
105 | |||
106 | return (handle == data.regionHandle && authkey == data.regionSecret); | ||
107 | } | ||
108 | |||
109 | /// <summary> | ||
110 | /// NOT YET FUNCTIONAL. Provides a cryptographic authentication of a region | ||
111 | /// </summary> | ||
112 | /// <remarks>This requires a security audit.</remarks> | ||
113 | /// <param name="uuid"></param> | ||
114 | /// <param name="handle"></param> | ||
115 | /// <param name="authhash"></param> | ||
116 | /// <param name="challenge"></param> | ||
117 | /// <returns></returns> | ||
118 | public bool AuthenticateSim(libsecondlife.LLUUID uuid, ulong handle, string authhash, string challenge) | ||
119 | { | ||
120 | System.Security.Cryptography.SHA512Managed HashProvider = new System.Security.Cryptography.SHA512Managed(); | ||
121 | System.Text.ASCIIEncoding TextProvider = new ASCIIEncoding(); | ||
122 | |||
123 | byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge); | ||
124 | byte[] hash = HashProvider.ComputeHash(stream); | ||
125 | |||
126 | return false; | ||
127 | } | ||
128 | } | ||
129 | |||
130 | |||
131 | } | ||
diff --git a/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs b/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs new file mode 100644 index 0000000..5606c4c --- /dev/null +++ b/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs | |||
@@ -0,0 +1,171 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using System.Data; | ||
5 | |||
6 | using System.Data.SqlClient; | ||
7 | |||
8 | using OpenGrid.Framework.Data; | ||
9 | |||
10 | namespace OpenGrid.Framework.Data.MSSQL | ||
11 | { | ||
12 | class MSSqlManager | ||
13 | { | ||
14 | IDbConnection dbcon; | ||
15 | |||
16 | /// <summary> | ||
17 | /// Initialises and creates a new Sql connection and maintains it. | ||
18 | /// </summary> | ||
19 | /// <param name="hostname">The Sql server being connected to</param> | ||
20 | /// <param name="database">The name of the Sql database being used</param> | ||
21 | /// <param name="username">The username logging into the database</param> | ||
22 | /// <param name="password">The password for the user logging in</param> | ||
23 | /// <param name="cpooling">Whether to use connection pooling or not, can be one of the following: 'yes', 'true', 'no' or 'false', if unsure use 'false'.</param> | ||
24 | public MSSqlManager(string hostname, string database, string username, string password, string cpooling) | ||
25 | { | ||
26 | try | ||
27 | { | ||
28 | string connectionString = "Server=" + hostname + ";Database=" + database + ";User ID=" + username + ";Password=" + password + ";Pooling=" + cpooling + ";"; | ||
29 | dbcon = new SqlConnection(connectionString); | ||
30 | |||
31 | dbcon.Open(); | ||
32 | } | ||
33 | catch (Exception e) | ||
34 | { | ||
35 | throw new Exception("Error initialising Sql Database: " + e.ToString()); | ||
36 | } | ||
37 | } | ||
38 | |||
39 | /// <summary> | ||
40 | /// Shuts down the database connection | ||
41 | /// </summary> | ||
42 | public void Close() | ||
43 | { | ||
44 | dbcon.Close(); | ||
45 | dbcon = null; | ||
46 | } | ||
47 | |||
48 | /// <summary> | ||
49 | /// Runs a query with protection against SQL Injection by using parameterised input. | ||
50 | /// </summary> | ||
51 | /// <param name="sql">The SQL string - replace any variables such as WHERE x = "y" with WHERE x = @y</param> | ||
52 | /// <param name="parameters">The parameters - index so that @y is indexed as 'y'</param> | ||
53 | /// <returns>A Sql DB Command</returns> | ||
54 | public IDbCommand Query(string sql, Dictionary<string, string> parameters) | ||
55 | { | ||
56 | SqlCommand dbcommand = (SqlCommand)dbcon.CreateCommand(); | ||
57 | dbcommand.CommandText = sql; | ||
58 | foreach (KeyValuePair<string, string> param in parameters) | ||
59 | { | ||
60 | dbcommand.Parameters.Add(param.Key, param.Value); | ||
61 | } | ||
62 | |||
63 | return (IDbCommand)dbcommand; | ||
64 | } | ||
65 | |||
66 | public SimProfileData getRow(IDataReader reader) | ||
67 | { | ||
68 | SimProfileData retval = new SimProfileData(); | ||
69 | |||
70 | if (reader.Read()) | ||
71 | { | ||
72 | // Region Main | ||
73 | retval.regionHandle = (ulong)reader["regionHandle"]; | ||
74 | retval.regionName = (string)reader["regionName"]; | ||
75 | retval.UUID = new libsecondlife.LLUUID((string)reader["uuid"]); | ||
76 | |||
77 | // Secrets | ||
78 | retval.regionRecvKey = (string)reader["regionRecvKey"]; | ||
79 | retval.regionSecret = (string)reader["regionSecret"]; | ||
80 | retval.regionSendKey = (string)reader["regionSendKey"]; | ||
81 | |||
82 | // Region Server | ||
83 | retval.regionDataURI = (string)reader["regionDataURI"]; | ||
84 | retval.regionOnline = false; // Needs to be pinged before this can be set. | ||
85 | retval.serverIP = (string)reader["serverIP"]; | ||
86 | retval.serverPort = (uint)reader["serverPort"]; | ||
87 | retval.serverURI = (string)reader["serverURI"]; | ||
88 | |||
89 | // Location | ||
90 | retval.regionLocX = (uint)((int)reader["locX"]); | ||
91 | retval.regionLocY = (uint)((int)reader["locY"]); | ||
92 | retval.regionLocZ = (uint)((int)reader["locZ"]); | ||
93 | |||
94 | // Neighbours - 0 = No Override | ||
95 | retval.regionEastOverrideHandle = (ulong)reader["eastOverrideHandle"]; | ||
96 | retval.regionWestOverrideHandle = (ulong)reader["westOverrideHandle"]; | ||
97 | retval.regionSouthOverrideHandle = (ulong)reader["southOverrideHandle"]; | ||
98 | retval.regionNorthOverrideHandle = (ulong)reader["northOverrideHandle"]; | ||
99 | |||
100 | // Assets | ||
101 | retval.regionAssetURI = (string)reader["regionAssetURI"]; | ||
102 | retval.regionAssetRecvKey = (string)reader["regionAssetRecvKey"]; | ||
103 | retval.regionAssetSendKey = (string)reader["regionAssetSendKey"]; | ||
104 | |||
105 | // Userserver | ||
106 | retval.regionUserURI = (string)reader["regionUserURI"]; | ||
107 | retval.regionUserRecvKey = (string)reader["regionUserRecvKey"]; | ||
108 | retval.regionUserSendKey = (string)reader["regionUserSendKey"]; | ||
109 | } | ||
110 | else | ||
111 | { | ||
112 | throw new Exception("No rows to return"); | ||
113 | } | ||
114 | return retval; | ||
115 | } | ||
116 | |||
117 | public bool insertRow(SimProfileData profile) | ||
118 | { | ||
119 | string sql = "REPLACE INTO regions VALUES (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, "; | ||
120 | sql += "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, "; | ||
121 | sql += "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey) VALUES "; | ||
122 | |||
123 | sql += "(@regionHandle, @regionName, @uuid, @regionRecvKey, @regionSecret, @regionSendKey, @regionDataURI, "; | ||
124 | sql += "@serverIP, @serverPort, @serverURI, @locX, @locY, @locZ, @eastOverrideHandle, @westOverrideHandle, @southOverrideHandle, @northOverrideHandle, @regionAssetURI, @regionAssetRecvKey, "; | ||
125 | sql += "@regionAssetSendKey, @regionUserURI, @regionUserRecvKey, @regionUserSendKey);"; | ||
126 | |||
127 | Dictionary<string, string> parameters = new Dictionary<string, string>(); | ||
128 | |||
129 | parameters["regionHandle"] = profile.regionHandle.ToString(); | ||
130 | parameters["regionName"] = profile.regionName; | ||
131 | parameters["uuid"] = profile.UUID.ToString(); | ||
132 | parameters["regionRecvKey"] = profile.regionRecvKey; | ||
133 | parameters["regionSendKey"] = profile.regionSendKey; | ||
134 | parameters["regionDataURI"] = profile.regionDataURI; | ||
135 | parameters["serverIP"] = profile.serverIP; | ||
136 | parameters["serverPort"] = profile.serverPort.ToString(); | ||
137 | parameters["serverURI"] = profile.serverURI; | ||
138 | parameters["locX"] = profile.regionLocX.ToString(); | ||
139 | parameters["locY"] = profile.regionLocY.ToString(); | ||
140 | parameters["locZ"] = profile.regionLocZ.ToString(); | ||
141 | parameters["eastOverrideHandle"] = profile.regionEastOverrideHandle.ToString(); | ||
142 | parameters["westOverrideHandle"] = profile.regionWestOverrideHandle.ToString(); | ||
143 | parameters["northOverrideHandle"] = profile.regionNorthOverrideHandle.ToString(); | ||
144 | parameters["southOverrideHandle"] = profile.regionSouthOverrideHandle.ToString(); | ||
145 | parameters["regionAssetURI"] = profile.regionAssetURI; | ||
146 | parameters["regionAssetRecvKey"] = profile.regionAssetRecvKey; | ||
147 | parameters["regionAssetSendKey"] = profile.regionAssetSendKey; | ||
148 | parameters["regionUserURI"] = profile.regionUserURI; | ||
149 | parameters["regionUserRecvKey"] = profile.regionUserRecvKey; | ||
150 | parameters["regionUserSendKey"] = profile.regionUserSendKey; | ||
151 | |||
152 | bool returnval = false; | ||
153 | |||
154 | try | ||
155 | { | ||
156 | IDbCommand result = Query(sql, parameters); | ||
157 | |||
158 | if (result.ExecuteNonQuery() == 1) | ||
159 | returnval = true; | ||
160 | |||
161 | result.Dispose(); | ||
162 | } | ||
163 | catch (Exception e) | ||
164 | { | ||
165 | return false; | ||
166 | } | ||
167 | |||
168 | return returnval; | ||
169 | } | ||
170 | } | ||
171 | } | ||
diff --git a/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj b/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj new file mode 100644 index 0000000..3f6fec7 --- /dev/null +++ b/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj | |||
@@ -0,0 +1,108 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
2 | <PropertyGroup> | ||
3 | <ProjectType>Local</ProjectType> | ||
4 | <ProductVersion>8.0.50727</ProductVersion> | ||
5 | <SchemaVersion>2.0</SchemaVersion> | ||
6 | <ProjectGuid>{0A563AC1-0000-0000-0000-000000000000}</ProjectGuid> | ||
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
9 | <ApplicationIcon></ApplicationIcon> | ||
10 | <AssemblyKeyContainerName> | ||
11 | </AssemblyKeyContainerName> | ||
12 | <AssemblyName>OpenGrid.Framework.Data.MSSQL</AssemblyName> | ||
13 | <DefaultClientScript>JScript</DefaultClientScript> | ||
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | ||
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | ||
16 | <DelaySign>false</DelaySign> | ||
17 | <OutputType>Library</OutputType> | ||
18 | <AppDesignerFolder></AppDesignerFolder> | ||
19 | <RootNamespace>OpenGrid.Framework.Data.MSSQL</RootNamespace> | ||
20 | <StartupObject></StartupObject> | ||
21 | <FileUpgradeFlags> | ||
22 | </FileUpgradeFlags> | ||
23 | </PropertyGroup> | ||
24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | ||
26 | <BaseAddress>285212672</BaseAddress> | ||
27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | ||
28 | <ConfigurationOverrideFile> | ||
29 | </ConfigurationOverrideFile> | ||
30 | <DefineConstants>TRACE;DEBUG</DefineConstants> | ||
31 | <DocumentationFile></DocumentationFile> | ||
32 | <DebugSymbols>True</DebugSymbols> | ||
33 | <FileAlignment>4096</FileAlignment> | ||
34 | <Optimize>False</Optimize> | ||
35 | <OutputPath>..\bin\</OutputPath> | ||
36 | <RegisterForComInterop>False</RegisterForComInterop> | ||
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | ||
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | ||
39 | <WarningLevel>4</WarningLevel> | ||
40 | <NoWarn></NoWarn> | ||
41 | </PropertyGroup> | ||
42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | ||
44 | <BaseAddress>285212672</BaseAddress> | ||
45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | ||
46 | <ConfigurationOverrideFile> | ||
47 | </ConfigurationOverrideFile> | ||
48 | <DefineConstants>TRACE</DefineConstants> | ||
49 | <DocumentationFile></DocumentationFile> | ||
50 | <DebugSymbols>False</DebugSymbols> | ||
51 | <FileAlignment>4096</FileAlignment> | ||
52 | <Optimize>True</Optimize> | ||
53 | <OutputPath>..\bin\</OutputPath> | ||
54 | <RegisterForComInterop>False</RegisterForComInterop> | ||
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | ||
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | ||
57 | <WarningLevel>4</WarningLevel> | ||
58 | <NoWarn></NoWarn> | ||
59 | </PropertyGroup> | ||
60 | <ItemGroup> | ||
61 | <Reference Include="System" > | ||
62 | <HintPath>System.dll</HintPath> | ||
63 | <Private>False</Private> | ||
64 | </Reference> | ||
65 | <Reference Include="System.Xml" > | ||
66 | <HintPath>System.Xml.dll</HintPath> | ||
67 | <Private>False</Private> | ||
68 | </Reference> | ||
69 | <Reference Include="System.Data" > | ||
70 | <HintPath>System.Data.dll</HintPath> | ||
71 | <Private>False</Private> | ||
72 | </Reference> | ||
73 | <Reference Include="System.Data.SqlClient" > | ||
74 | <HintPath>System.Data.SqlClient.dll</HintPath> | ||
75 | <Private>False</Private> | ||
76 | </Reference> | ||
77 | <Reference Include="libsecondlife.dll" > | ||
78 | <HintPath>..\bin\libsecondlife.dll</HintPath> | ||
79 | <Private>False</Private> | ||
80 | </Reference> | ||
81 | </ItemGroup> | ||
82 | <ItemGroup> | ||
83 | <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj"> | ||
84 | <Name>OpenGrid.Framework.Data</Name> | ||
85 | <Project>{62CDF671-0000-0000-0000-000000000000}</Project> | ||
86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
87 | <Private>False</Private> | ||
88 | </ProjectReference> | ||
89 | </ItemGroup> | ||
90 | <ItemGroup> | ||
91 | <Compile Include="MSSQLGridData.cs"> | ||
92 | <SubType>Code</SubType> | ||
93 | </Compile> | ||
94 | <Compile Include="MSSQLManager.cs"> | ||
95 | <SubType>Code</SubType> | ||
96 | </Compile> | ||
97 | <Compile Include="Properties\AssemblyInfo.cs"> | ||
98 | <SubType>Code</SubType> | ||
99 | </Compile> | ||
100 | </ItemGroup> | ||
101 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | ||
102 | <PropertyGroup> | ||
103 | <PreBuildEvent> | ||
104 | </PreBuildEvent> | ||
105 | <PostBuildEvent> | ||
106 | </PostBuildEvent> | ||
107 | </PropertyGroup> | ||
108 | </Project> | ||
diff --git a/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs b/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..bbe3cdf --- /dev/null +++ b/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs | |||
@@ -0,0 +1,35 @@ | |||
1 | using System.Reflection; | ||
2 | using System.Runtime.CompilerServices; | ||
3 | using System.Runtime.InteropServices; | ||
4 | |||
5 | // General Information about an assembly is controlled through the following | ||
6 | // set of attributes. Change these attribute values to modify the information | ||
7 | // associated with an assembly. | ||
8 | [assembly: AssemblyTitle("OpenGrid.Framework.Data.MSSQL")] | ||
9 | [assembly: AssemblyDescription("")] | ||
10 | [assembly: AssemblyConfiguration("")] | ||
11 | [assembly: AssemblyCompany("")] | ||
12 | [assembly: AssemblyProduct("OpenGrid.Framework.Data.MSSQL")] | ||
13 | [assembly: AssemblyCopyright("Copyright © 2007")] | ||
14 | [assembly: AssemblyTrademark("")] | ||
15 | [assembly: AssemblyCulture("")] | ||
16 | |||
17 | // Setting ComVisible to false makes the types in this assembly not visible | ||
18 | // to COM components. If you need to access a type in this assembly from | ||
19 | // COM, set the ComVisible attribute to true on that type. | ||
20 | [assembly: ComVisible(false)] | ||
21 | |||
22 | // The following GUID is for the ID of the typelib if this project is exposed to COM | ||
23 | [assembly: Guid("0e1c1ca4-2cf2-4315-b0e7-432c02feea8a")] | ||
24 | |||
25 | // Version information for an assembly consists of the following four values: | ||
26 | // | ||
27 | // Major Version | ||
28 | // Minor Version | ||
29 | // Build Number | ||
30 | // Revision | ||
31 | // | ||
32 | // You can specify all the values or you can default the Revision and Build Numbers | ||
33 | // by using the '*' as shown below: | ||
34 | [assembly: AssemblyVersion("1.0.0.0")] | ||
35 | [assembly: AssemblyFileVersion("1.0.0.0")] | ||
diff --git a/OpenSim.sln b/OpenSim.sln index 05eaf80..3f27b40 100644 --- a/OpenSim.sln +++ b/OpenSim.sln | |||
@@ -28,10 +28,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Config.GridConfigD | |||
28 | EndProject | 28 | EndProject |
29 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{988F0AC4-0000-0000-0000-000000000000}" | 29 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{988F0AC4-0000-0000-0000-000000000000}" |
30 | EndProject | 30 | EndProject |
31 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{B55C0B5D-0000-0000-0000-000000000000}" | 31 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.MSSQL", "OpenGrid.Framework.Data.MSSQL\OpenGrid.Framework.Data.MSSQL.csproj", "{0A563AC1-0000-0000-0000-000000000000}" |
32 | EndProject | 32 | EndProject |
33 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}" | 33 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}" |
34 | EndProject | 34 | EndProject |
35 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{B55C0B5D-0000-0000-0000-000000000000}" | ||
36 | EndProject | ||
35 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{632E1BFD-0000-0000-0000-000000000000}" | 37 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{632E1BFD-0000-0000-0000-000000000000}" |
36 | EndProject | 38 | EndProject |
37 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data", "OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj", "{62CDF671-0000-0000-0000-000000000000}" | 39 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data", "OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj", "{62CDF671-0000-0000-0000-000000000000}" |
@@ -86,10 +88,11 @@ Global | |||
86 | ({B0027747-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) | 88 | ({B0027747-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) |
87 | ({B0027747-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) | 89 | ({B0027747-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) |
88 | ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000}) | 90 | ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000}) |
91 | ({0A563AC1-0000-0000-0000-000000000000}).4 = ({62CDF671-0000-0000-0000-000000000000}) | ||
92 | ({8ACA2445-0000-0000-0000-000000000000}).4 = ({8E81D43C-0000-0000-0000-000000000000}) | ||
89 | ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) | 93 | ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) |
90 | ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) | 94 | ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) |
91 | ({B55C0B5D-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000}) | 95 | ({B55C0B5D-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000}) |
92 | ({8ACA2445-0000-0000-0000-000000000000}).4 = ({8E81D43C-0000-0000-0000-000000000000}) | ||
93 | ({632E1BFD-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000}) | 96 | ({632E1BFD-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000}) |
94 | ({632E1BFD-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) | 97 | ({632E1BFD-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) |
95 | ({632E1BFD-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) | 98 | ({632E1BFD-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) |
@@ -170,14 +173,18 @@ Global | |||
170 | {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 173 | {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
171 | {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 174 | {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
172 | {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 175 | {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
173 | {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 176 | {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
174 | {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 177 | {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
175 | {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 178 | {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
176 | {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 179 | {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
177 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 180 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
178 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 181 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
179 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 182 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
180 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 183 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
184 | {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
185 | {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
186 | {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
187 | {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
181 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 188 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
182 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 189 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
183 | {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 190 | {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
diff --git a/prebuild.xml b/prebuild.xml index 45cfc3a..602715e 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -320,6 +320,30 @@ | |||
320 | </Files> | 320 | </Files> |
321 | </Project> | 321 | </Project> |
322 | 322 | ||
323 | <Project name="OpenGrid.Framework.Data.MSSQL" path="OpenGrid.Framework.Data.MSSQL" type="Library"> | ||
324 | <Configuration name="Debug"> | ||
325 | <Options> | ||
326 | <OutputPath>../bin/</OutputPath> | ||
327 | </Options> | ||
328 | </Configuration> | ||
329 | <Configuration name="Release"> | ||
330 | <Options> | ||
331 | <OutputPath>../bin/</OutputPath> | ||
332 | </Options> | ||
333 | </Configuration> | ||
334 | |||
335 | <ReferencePath>../bin/</ReferencePath> | ||
336 | <Reference name="System" localCopy="false"/> | ||
337 | <Reference name="System.Xml"/> | ||
338 | <Reference name="System.Data"/> | ||
339 | <Reference name="System.Data.SqlClient"/> | ||
340 | <Reference name="OpenGrid.Framework.Data"/> | ||
341 | <Reference name="libsecondlife.dll"/> | ||
342 | <Files> | ||
343 | <Match pattern="*.cs" recurse="true"/> | ||
344 | </Files> | ||
345 | </Project> | ||
346 | |||
323 | <!-- OGS projects --> | 347 | <!-- OGS projects --> |
324 | 348 | ||
325 | <Project name="OpenGridServices.GridServer" path="OpenGridServices.GridServer" type="Exe"> | 349 | <Project name="OpenGridServices.GridServer" path="OpenGridServices.GridServer" type="Exe"> |