diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/BaseHttpServer.cs (renamed from Common/OpenSim.Servers/BaseHttpServer.cs) | 9 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/CheckSumServer.cs (renamed from Common/OpenSim.Servers/CheckSumServer.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/IRestHandler.cs (renamed from Common/OpenSim.Servers/IRestHandler.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj | 116 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build (renamed from OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build) | 11 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/UDPServerBase.cs (renamed from Common/OpenSim.Servers/UDPServerBase.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/XmlRpcMethod.cs (renamed from Common/OpenSim.Servers/XmlRpcMethod.cs) | 2 |
7 files changed, 131 insertions, 13 deletions
diff --git a/Common/OpenSim.Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index e55e33c..8c8204a 100644 --- a/Common/OpenSim.Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs | |||
@@ -31,12 +31,11 @@ using System.Net; | |||
31 | using System.Text; | 31 | using System.Text; |
32 | using System.Text.RegularExpressions; | 32 | using System.Text.RegularExpressions; |
33 | using System.Threading; | 33 | using System.Threading; |
34 | //using OpenSim.CAPS; | ||
35 | using Nwc.XmlRpc; | 34 | using Nwc.XmlRpc; |
36 | using System.Collections; | 35 | using System.Collections; |
37 | using OpenSim.Framework.Console; | 36 | using OpenSim.Framework.Console; |
38 | 37 | ||
39 | namespace OpenSim.Servers | 38 | namespace OpenSim.Framework.Servers |
40 | { | 39 | { |
41 | public class BaseHttpServer | 40 | public class BaseHttpServer |
42 | { | 41 | { |
@@ -171,7 +170,7 @@ namespace OpenSim.Servers | |||
171 | protected virtual string ParseLLSDXML(string requestBody) | 170 | protected virtual string ParseLLSDXML(string requestBody) |
172 | { | 171 | { |
173 | // dummy function for now - IMPLEMENT ME! | 172 | // dummy function for now - IMPLEMENT ME! |
174 | Console.WriteLine("LLSD request "+requestBody); | 173 | //Console.WriteLine("LLSD request "+requestBody); |
175 | string resp = ""; | 174 | string resp = ""; |
176 | if (firstcaps) | 175 | if (firstcaps) |
177 | { | 176 | { |
@@ -195,7 +194,7 @@ namespace OpenSim.Servers | |||
195 | } | 194 | } |
196 | catch (Exception e) | 195 | catch (Exception e) |
197 | { | 196 | { |
198 | Console.WriteLine(e.ToString()); | 197 | //Console.WriteLine(e.ToString()); |
199 | } | 198 | } |
200 | return responseString; | 199 | return responseString; |
201 | } | 200 | } |
@@ -273,7 +272,7 @@ namespace OpenSim.Servers | |||
273 | } | 272 | } |
274 | catch (Exception e) | 273 | catch (Exception e) |
275 | { | 274 | { |
276 | Console.WriteLine(e.ToString()); | 275 | //Console.WriteLine(e.ToString()); |
277 | } | 276 | } |
278 | } | 277 | } |
279 | 278 | ||
diff --git a/Common/OpenSim.Servers/CheckSumServer.cs b/OpenSim/Framework/Servers/CheckSumServer.cs index a359205..6aeb58c 100644 --- a/Common/OpenSim.Servers/CheckSumServer.cs +++ b/OpenSim/Framework/Servers/CheckSumServer.cs | |||
@@ -40,7 +40,7 @@ using libsecondlife.Packets; | |||
40 | using OpenSim.Framework.Console; | 40 | using OpenSim.Framework.Console; |
41 | 41 | ||
42 | 42 | ||
43 | namespace OpenSim.Servers | 43 | namespace OpenSim.Framework.Servers |
44 | { | 44 | { |
45 | /* public class CheckSumServer : UDPServerBase | 45 | /* public class CheckSumServer : UDPServerBase |
46 | { | 46 | { |
diff --git a/Common/OpenSim.Servers/IRestHandler.cs b/OpenSim/Framework/Servers/IRestHandler.cs index 3aa508c..a2b6bf0 100644 --- a/Common/OpenSim.Servers/IRestHandler.cs +++ b/OpenSim/Framework/Servers/IRestHandler.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Text; | 30 | using System.Text; |
31 | 31 | ||
32 | namespace OpenSim.Servers | 32 | namespace OpenSim.Framework.Servers |
33 | { | 33 | { |
34 | public delegate string RestMethod( string request, string path, string param ); | 34 | public delegate string RestMethod( string request, string path, string param ); |
35 | } | 35 | } |
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj new file mode 100644 index 0000000..399f456 --- /dev/null +++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj | |||
@@ -0,0 +1,116 @@ | |||
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>{2CC71860-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>OpenSim.Framework.Servers</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>OpenSim.Framework.Servers</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="libsecondlife.dll" > | ||
62 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> | ||
63 | <Private>False</Private> | ||
64 | </Reference> | ||
65 | <Reference Include="System" > | ||
66 | <HintPath>System.dll</HintPath> | ||
67 | <Private>False</Private> | ||
68 | </Reference> | ||
69 | <Reference Include="System.Xml" > | ||
70 | <HintPath>System.Xml.dll</HintPath> | ||
71 | <Private>False</Private> | ||
72 | </Reference> | ||
73 | <Reference Include="XMLRPC.dll" > | ||
74 | <HintPath>..\..\..\bin\XMLRPC.dll</HintPath> | ||
75 | <Private>False</Private> | ||
76 | </Reference> | ||
77 | </ItemGroup> | ||
78 | <ItemGroup> | ||
79 | <ProjectReference Include="..\General\OpenSim.Framework.csproj"> | ||
80 | <Name>OpenSim.Framework</Name> | ||
81 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | ||
82 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
83 | <Private>False</Private> | ||
84 | </ProjectReference> | ||
85 | <ProjectReference Include="..\Console\OpenSim.Framework.Console.csproj"> | ||
86 | <Name>OpenSim.Framework.Console</Name> | ||
87 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | ||
88 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
89 | <Private>False</Private> | ||
90 | </ProjectReference> | ||
91 | </ItemGroup> | ||
92 | <ItemGroup> | ||
93 | <Compile Include="BaseHttpServer.cs"> | ||
94 | <SubType>Code</SubType> | ||
95 | </Compile> | ||
96 | <Compile Include="CheckSumServer.cs"> | ||
97 | <SubType>Code</SubType> | ||
98 | </Compile> | ||
99 | <Compile Include="IRestHandler.cs"> | ||
100 | <SubType>Code</SubType> | ||
101 | </Compile> | ||
102 | <Compile Include="UDPServerBase.cs"> | ||
103 | <SubType>Code</SubType> | ||
104 | </Compile> | ||
105 | <Compile Include="XmlRpcMethod.cs"> | ||
106 | <SubType>Code</SubType> | ||
107 | </Compile> | ||
108 | </ItemGroup> | ||
109 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | ||
110 | <PropertyGroup> | ||
111 | <PreBuildEvent> | ||
112 | </PreBuildEvent> | ||
113 | <PostBuildEvent> | ||
114 | </PostBuildEvent> | ||
115 | </PropertyGroup> | ||
116 | </Project> | ||
diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build index 7c3eb68..7401b07 100644 --- a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build +++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build | |||
@@ -1,5 +1,5 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.GridInterfaces.Remote" default="build"> | 2 | <project name="OpenSim.Framework.Servers" 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}" /> |
@@ -8,11 +8,14 @@ | |||
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.GridInterfaces.Remote" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Framework.Servers" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="BaseHttpServer.cs" /> |
15 | <include name="RemoteAssetServer.cs" /> | 15 | <include name="CheckSumServer.cs" /> |
16 | <include name="IRestHandler.cs" /> | ||
17 | <include name="UDPServerBase.cs" /> | ||
18 | <include name="XmlRpcMethod.cs" /> | ||
16 | </sources> | 19 | </sources> |
17 | <references basedir="${project::get-base-directory()}"> | 20 | <references basedir="${project::get-base-directory()}"> |
18 | <lib> | 21 | <lib> |
diff --git a/Common/OpenSim.Servers/UDPServerBase.cs b/OpenSim/Framework/Servers/UDPServerBase.cs index b472c97..610d23b 100644 --- a/Common/OpenSim.Servers/UDPServerBase.cs +++ b/OpenSim/Framework/Servers/UDPServerBase.cs | |||
@@ -38,7 +38,7 @@ using System.Collections.Generic; | |||
38 | using libsecondlife; | 38 | using libsecondlife; |
39 | using libsecondlife.Packets; | 39 | using libsecondlife.Packets; |
40 | 40 | ||
41 | namespace OpenSim.Servers | 41 | namespace OpenSim.Framework.Servers |
42 | { | 42 | { |
43 | public class UDPServerBase | 43 | public class UDPServerBase |
44 | { | 44 | { |
diff --git a/Common/OpenSim.Servers/XmlRpcMethod.cs b/OpenSim/Framework/Servers/XmlRpcMethod.cs index 05cbf2e..51b3303 100644 --- a/Common/OpenSim.Servers/XmlRpcMethod.cs +++ b/OpenSim/Framework/Servers/XmlRpcMethod.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using Nwc.XmlRpc; | 29 | using Nwc.XmlRpc; |
30 | 30 | ||
31 | namespace OpenSim.Servers | 31 | namespace OpenSim.Framework.Servers |
32 | { | 32 | { |
33 | public delegate XmlRpcResponse XmlRpcMethod( XmlRpcRequest request ); | 33 | public delegate XmlRpcResponse XmlRpcMethod( XmlRpcRequest request ); |
34 | } | 34 | } |