aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Common/OpenSim.Servers
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Common/OpenSim.Servers/OpenSim.Servers.csproj125
-rw-r--r--Common/OpenSim.Servers/OpenSim.Servers.dll.build51
-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/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, 8 insertions, 185 deletions
diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj b/Common/OpenSim.Servers/OpenSim.Servers.csproj
deleted file mode 100644
index 6e8eba7..0000000
--- a/Common/OpenSim.Servers/OpenSim.Servers.csproj
+++ /dev/null
@@ -1,125 +0,0 @@
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>{8BB20F0A-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon>
10 </ApplicationIcon>
11 <AssemblyKeyContainerName>
12 </AssemblyKeyContainerName>
13 <AssemblyName>OpenSim.Servers</AssemblyName>
14 <DefaultClientScript>JScript</DefaultClientScript>
15 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
16 <DefaultTargetSchema>IE50</DefaultTargetSchema>
17 <DelaySign>false</DelaySign>
18 <OutputType>Library</OutputType>
19 <AppDesignerFolder>
20 </AppDesignerFolder>
21 <RootNamespace>OpenSim.Servers</RootNamespace>
22 <StartupObject>
23 </StartupObject>
24 <FileUpgradeFlags>
25 </FileUpgradeFlags>
26 </PropertyGroup>
27 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
28 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
29 <BaseAddress>285212672</BaseAddress>
30 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
31 <ConfigurationOverrideFile>
32 </ConfigurationOverrideFile>
33 <DefineConstants>TRACE;DEBUG</DefineConstants>
34 <DocumentationFile>
35 </DocumentationFile>
36 <DebugSymbols>True</DebugSymbols>
37 <FileAlignment>4096</FileAlignment>
38 <Optimize>False</Optimize>
39 <OutputPath>..\..\bin\</OutputPath>
40 <RegisterForComInterop>False</RegisterForComInterop>
41 <RemoveIntegerChecks>False</RemoveIntegerChecks>
42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
43 <WarningLevel>4</WarningLevel>
44 <NoWarn>
45 </NoWarn>
46 </PropertyGroup>
47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
49 <BaseAddress>285212672</BaseAddress>
50 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
51 <ConfigurationOverrideFile>
52 </ConfigurationOverrideFile>
53 <DefineConstants>TRACE</DefineConstants>
54 <DocumentationFile>
55 </DocumentationFile>
56 <DebugSymbols>False</DebugSymbols>
57 <FileAlignment>4096</FileAlignment>
58 <Optimize>True</Optimize>
59 <OutputPath>..\..\bin\</OutputPath>
60 <RegisterForComInterop>False</RegisterForComInterop>
61 <RemoveIntegerChecks>False</RemoveIntegerChecks>
62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
63 <WarningLevel>4</WarningLevel>
64 <NoWarn>
65 </NoWarn>
66 </PropertyGroup>
67 <ItemGroup>
68 <Reference Include="libsecondlife.dll">
69 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
70 <Private>False</Private>
71 </Reference>
72 <Reference Include="System">
73 <HintPath>System.dll</HintPath>
74 <Private>False</Private>
75 </Reference>
76 <Reference Include="System.Xml">
77 <HintPath>System.Xml.dll</HintPath>
78 <Private>False</Private>
79 </Reference>
80 </ItemGroup>
81 <ItemGroup>
82 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
83 <Name>OpenSim.Framework</Name>
84 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
85 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
86 <Private>False</Private>
87 </ProjectReference>
88 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
89 <Name>OpenSim.Framework.Console</Name>
90 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
91 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
92 <Private>False</Private>
93 </ProjectReference>
94 <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
95 <Name>XMLRPC</Name>
96 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
97 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
98 <Private>False</Private>
99 </ProjectReference>
100 </ItemGroup>
101 <ItemGroup>
102 <Compile Include="BaseHttpServer.cs">
103 <SubType>Code</SubType>
104 </Compile>
105 <Compile Include="CheckSumServer.cs">
106 <SubType>Code</SubType>
107 </Compile>
108 <Compile Include="IRestHandler.cs">
109 <SubType>Code</SubType>
110 </Compile>
111 <Compile Include="UDPServerBase.cs">
112 <SubType>Code</SubType>
113 </Compile>
114 <Compile Include="XmlRpcMethod.cs">
115 <SubType>Code</SubType>
116 </Compile>
117 </ItemGroup>
118 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
119 <PropertyGroup>
120 <PreBuildEvent>
121 </PreBuildEvent>
122 <PostBuildEvent>
123 </PostBuildEvent>
124 </PropertyGroup>
125</Project> \ No newline at end of file
diff --git a/Common/OpenSim.Servers/OpenSim.Servers.dll.build b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
deleted file mode 100644
index 4103e73..0000000
--- a/Common/OpenSim.Servers/OpenSim.Servers.dll.build
+++ /dev/null
@@ -1,51 +0,0 @@
1<?xml version="1.0" ?>
2<project name="OpenSim.Servers" default="build">
3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}">
8 </fileset>
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">
11 <resources prefix="OpenSim.Servers" dynamicprefix="true" >
12 </resources>
13 <sources failonempty="true">
14 <include name="BaseHttpServer.cs" />
15 <include name="CheckSumServer.cs" />
16 <include name="IRestHandler.cs" />
17 <include name="LocalUserProfileManager.cs" />
18 <include name="LoginResponse.cs" />
19 <include name="LoginServer.cs" />
20 <include name="UDPServerBase.cs" />
21 <include name="XmlRpcMethod.cs" />
22 </sources>
23 <references basedir="${project::get-base-directory()}">
24 <lib>
25 <include name="${project::get-base-directory()}" />
26 <include name="${project::get-base-directory()}/${build.dir}" />
27 </lib>
28 <include name="../../bin/libsecondlife.dll" />
29 <include name="../../bin/OpenSim.Framework.dll" />
30 <include name="../../bin/OpenSim.Framework.Console.dll" />
31 <include name="System.dll" />
32 <include name="System.Xml.dll" />
33 <include name="../../bin/XMLRPC.dll" />
34 </references>
35 </csc>
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/"/>
38 <copy todir="${project::get-base-directory()}/../../bin/">
39 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
40 <include name="*.dll"/>
41 <include name="*.exe"/>
42 </fileset>
43 </copy>
44 </target>
45 <target name="clean">
46 <delete dir="${bin.dir}" failonerror="false" />
47 <delete dir="${obj.dir}" failonerror="false" />
48 </target>
49 <target name="doc" description="Creates documentation.">
50 </target>
51</project>
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;
31using System.Text; 31using System.Text;
32using System.Text.RegularExpressions; 32using System.Text.RegularExpressions;
33using System.Threading; 33using System.Threading;
34//using OpenSim.CAPS;
35using Nwc.XmlRpc; 34using Nwc.XmlRpc;
36using System.Collections; 35using System.Collections;
37using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
38 37
39namespace OpenSim.Servers 38namespace 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;
40using OpenSim.Framework.Console; 40using OpenSim.Framework.Console;
41 41
42 42
43namespace OpenSim.Servers 43namespace 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;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31 31
32namespace OpenSim.Servers 32namespace 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/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;
38using libsecondlife; 38using libsecondlife;
39using libsecondlife.Packets; 39using libsecondlife.Packets;
40 40
41namespace OpenSim.Servers 41namespace 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 @@
28using System; 28using System;
29using Nwc.XmlRpc; 29using Nwc.XmlRpc;
30 30
31namespace OpenSim.Servers 31namespace OpenSim.Framework.Servers
32{ 32{
33 public delegate XmlRpcResponse XmlRpcMethod( XmlRpcRequest request ); 33 public delegate XmlRpcResponse XmlRpcMethod( XmlRpcRequest request );
34} 34}
generated by cgit v1.1 at 2025-01-19 07:39:30 +0000