From 5d11fedced0ee35c27fbe9b5a567de1586aa6dc2 Mon Sep 17 00:00:00 2001
From: John Hurliman <jhurliman@jhurliman.org>
Date: Fri, 28 Jul 2006 14:54:49 +0000
Subject: [PATCH] Pruned empty files, moved JSON files to a new dir, updated
 MSVC solution files

git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@103 52acb1d6-8a22-11de-b505-999d5b087335
---
 .../{JSONlib => JSON}/JSONArray.cs            |   0
 .../{JSONlib => JSON}/JSONFacade.cs           |   0
 .../{JSONlib => JSON}/JSONObject.cs           |   0
 .../{JSONlib => JSON}/JSONTokener.cs          |   0
 libsecondlife-cs/JSONlib/JSONUtils.cs         |   0
 libsecondlife-cs/JSONlib/Nii.JSON.csproj      | 115 -----------
 libsecondlife-cs/XmlRpcCS/AssemblyInfo.cs     |   0
 .../XmlRpcCS/SimpleHttpRequest.cs             |   0
 .../XmlRpcCS/XmlRpcBoxcarRequest.cs           |   0
 libsecondlife-cs/XmlRpcCS/XmlRpcCS.csproj     | 185 ------------------
 .../XmlRpcCS/XmlRpcClientProxy.cs             |   0
 .../XmlRpcCS/XmlRpcExposedAttribute.cs        |   0
 libsecondlife-cs/XmlRpcCS/XmlRpcResponder.cs  |   0
 libsecondlife-cs/XmlRpcCS/XmlRpcServer.cs     |   0
 .../XmlRpcCS/XmlRpcSystemObject.cs            |   0
 libsecondlife-cs/libsecondlife.csproj         |  91 +++++++--
 libsecondlife-cs/libsecondlife.sln            |  16 --
 17 files changed, 80 insertions(+), 327 deletions(-)
 rename libsecondlife-cs/{JSONlib => JSON}/JSONArray.cs (100%)
 rename libsecondlife-cs/{JSONlib => JSON}/JSONFacade.cs (100%)
 rename libsecondlife-cs/{JSONlib => JSON}/JSONObject.cs (100%)
 rename libsecondlife-cs/{JSONlib => JSON}/JSONTokener.cs (100%)
 delete mode 100644 libsecondlife-cs/JSONlib/JSONUtils.cs
 delete mode 100644 libsecondlife-cs/JSONlib/Nii.JSON.csproj
 delete mode 100644 libsecondlife-cs/XmlRpcCS/AssemblyInfo.cs
 delete mode 100644 libsecondlife-cs/XmlRpcCS/SimpleHttpRequest.cs
 delete mode 100644 libsecondlife-cs/XmlRpcCS/XmlRpcBoxcarRequest.cs
 delete mode 100644 libsecondlife-cs/XmlRpcCS/XmlRpcCS.csproj
 delete mode 100644 libsecondlife-cs/XmlRpcCS/XmlRpcClientProxy.cs
 delete mode 100644 libsecondlife-cs/XmlRpcCS/XmlRpcExposedAttribute.cs
 delete mode 100644 libsecondlife-cs/XmlRpcCS/XmlRpcResponder.cs
 delete mode 100644 libsecondlife-cs/XmlRpcCS/XmlRpcServer.cs
 delete mode 100644 libsecondlife-cs/XmlRpcCS/XmlRpcSystemObject.cs

diff --git a/libsecondlife-cs/JSONlib/JSONArray.cs b/libsecondlife-cs/JSON/JSONArray.cs
similarity index 100%
rename from libsecondlife-cs/JSONlib/JSONArray.cs
rename to libsecondlife-cs/JSON/JSONArray.cs
diff --git a/libsecondlife-cs/JSONlib/JSONFacade.cs b/libsecondlife-cs/JSON/JSONFacade.cs
similarity index 100%
rename from libsecondlife-cs/JSONlib/JSONFacade.cs
rename to libsecondlife-cs/JSON/JSONFacade.cs
diff --git a/libsecondlife-cs/JSONlib/JSONObject.cs b/libsecondlife-cs/JSON/JSONObject.cs
similarity index 100%
rename from libsecondlife-cs/JSONlib/JSONObject.cs
rename to libsecondlife-cs/JSON/JSONObject.cs
diff --git a/libsecondlife-cs/JSONlib/JSONTokener.cs b/libsecondlife-cs/JSON/JSONTokener.cs
similarity index 100%
rename from libsecondlife-cs/JSONlib/JSONTokener.cs
rename to libsecondlife-cs/JSON/JSONTokener.cs
diff --git a/libsecondlife-cs/JSONlib/JSONUtils.cs b/libsecondlife-cs/JSONlib/JSONUtils.cs
deleted file mode 100644
index e69de29b..00000000
diff --git a/libsecondlife-cs/JSONlib/Nii.JSON.csproj b/libsecondlife-cs/JSONlib/Nii.JSON.csproj
deleted file mode 100644
index ab250b6d..00000000
--- a/libsecondlife-cs/JSONlib/Nii.JSON.csproj
+++ /dev/null
@@ -1,115 +0,0 @@
-<VisualStudioProject>
-    <CSHARP
-        ProjectType = "Local"
-        ProductVersion = "7.10.3077"
-        SchemaVersion = "2.0"
-        ProjectGuid = "{C40EB7FD-F957-4659-A184-A1C28908D748}"
-    >
-        <Build>
-            <Settings
-                ApplicationIcon = ""
-                AssemblyKeyContainerName = ""
-                AssemblyName = "JSON"
-                AssemblyOriginatorKeyFile = ""
-                DefaultClientScript = "JScript"
-                DefaultHTMLPageLayout = "Grid"
-                DefaultTargetSchema = "IE50"
-                DelaySign = "false"
-                OutputType = "Library"
-                PreBuildEvent = ""
-                PostBuildEvent = ""
-                RootNamespace = "Nii.JSON"
-                RunPostBuildEvent = "OnBuildSuccess"
-                StartupObject = ""
-            >
-                <Config
-                    Name = "Debug"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "DEBUG;TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "true"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "false"
-                    OutputPath = "..\bin\Debug\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-                <Config
-                    Name = "Release"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "false"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "true"
-                    OutputPath = "bin\Release\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-            </Settings>
-            <References>
-                <Reference
-                    Name = "System"
-                    AssemblyName = "System"
-                    HintPath = "..\..\..\WINNT\Microsoft.NET\Framework\v1.1.4322\System.dll"
-                />
-                <Reference
-                    Name = "System.Data"
-                    AssemblyName = "System.Data"
-                    HintPath = "..\..\..\WINNT\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
-                />
-                <Reference
-                    Name = "System.XML"
-                    AssemblyName = "System.Xml"
-                    HintPath = "..\..\..\WINNT\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
-                />
-            </References>
-        </Build>
-        <Files>
-            <Include>
-                <File
-                    RelPath = "JSONArray.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "JSONFacade.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "JSONObject.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "JSONTokener.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "JSONUtils.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-            </Include>
-        </Files>
-    </CSHARP>
-</VisualStudioProject>
-
diff --git a/libsecondlife-cs/XmlRpcCS/AssemblyInfo.cs b/libsecondlife-cs/XmlRpcCS/AssemblyInfo.cs
deleted file mode 100644
index e69de29b..00000000
diff --git a/libsecondlife-cs/XmlRpcCS/SimpleHttpRequest.cs b/libsecondlife-cs/XmlRpcCS/SimpleHttpRequest.cs
deleted file mode 100644
index e69de29b..00000000
diff --git a/libsecondlife-cs/XmlRpcCS/XmlRpcBoxcarRequest.cs b/libsecondlife-cs/XmlRpcCS/XmlRpcBoxcarRequest.cs
deleted file mode 100644
index e69de29b..00000000
diff --git a/libsecondlife-cs/XmlRpcCS/XmlRpcCS.csproj b/libsecondlife-cs/XmlRpcCS/XmlRpcCS.csproj
deleted file mode 100644
index 83befd85..00000000
--- a/libsecondlife-cs/XmlRpcCS/XmlRpcCS.csproj
+++ /dev/null
@@ -1,185 +0,0 @@
-<VisualStudioProject>
-    <CSHARP
-        ProjectType = "Local"
-        ProductVersion = "7.10.3077"
-        SchemaVersion = "2.0"
-        ProjectGuid = "{410F8877-F1E1-4696-ABC7-4339189EECC3}"
-    >
-        <Build>
-            <Settings
-                ApplicationIcon = ""
-                AssemblyKeyContainerName = ""
-                AssemblyName = "XmlRpcCS"
-                AssemblyOriginatorKeyFile = ""
-                DefaultClientScript = "JScript"
-                DefaultHTMLPageLayout = "Grid"
-                DefaultTargetSchema = "IE50"
-                DelaySign = "false"
-                OutputType = "Library"
-                PreBuildEvent = ""
-                PostBuildEvent = ""
-                RootNamespace = "XmlRpcCS"
-                RunPostBuildEvent = "OnBuildSuccess"
-                StartupObject = ""
-            >
-                <Config
-                    Name = "Debug"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "DEBUG;TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "true"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "false"
-                    OutputPath = "..\bin\Debug\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-                <Config
-                    Name = "Release"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "false"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "true"
-                    OutputPath = "bin\Release\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-            </Settings>
-            <References>
-                <Reference
-                    Name = "System"
-                    AssemblyName = "System"
-                    HintPath = "..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
-                />
-                <Reference
-                    Name = "System.XML"
-                    AssemblyName = "System.Xml"
-                    HintPath = "..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
-                />
-            </References>
-        </Build>
-        <Files>
-            <Include>
-                <File
-                    RelPath = "AssemblyInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "Logger.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "SimpleHttpRequest.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlRpcBoxcarRequest.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlRpcClientProxy.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlRpcDeserializer.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlRpcErrorCodes.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlRpcException.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlRpcExposedAttribute.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlRpcRequest.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlRpcRequestDeserializer.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlRpcRequestSerializer.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlRpcResponder.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlRpcResponse.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlRpcResponseDeserializer.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlRpcResponseSerializer.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlRpcSerializer.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlRpcServer.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlRpcSystemObject.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "XmlRpcXmlTokens.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-            </Include>
-        </Files>
-    </CSHARP>
-</VisualStudioProject>
-
diff --git a/libsecondlife-cs/XmlRpcCS/XmlRpcClientProxy.cs b/libsecondlife-cs/XmlRpcCS/XmlRpcClientProxy.cs
deleted file mode 100644
index e69de29b..00000000
diff --git a/libsecondlife-cs/XmlRpcCS/XmlRpcExposedAttribute.cs b/libsecondlife-cs/XmlRpcCS/XmlRpcExposedAttribute.cs
deleted file mode 100644
index e69de29b..00000000
diff --git a/libsecondlife-cs/XmlRpcCS/XmlRpcResponder.cs b/libsecondlife-cs/XmlRpcCS/XmlRpcResponder.cs
deleted file mode 100644
index e69de29b..00000000
diff --git a/libsecondlife-cs/XmlRpcCS/XmlRpcServer.cs b/libsecondlife-cs/XmlRpcCS/XmlRpcServer.cs
deleted file mode 100644
index e69de29b..00000000
diff --git a/libsecondlife-cs/XmlRpcCS/XmlRpcSystemObject.cs b/libsecondlife-cs/XmlRpcCS/XmlRpcSystemObject.cs
deleted file mode 100644
index e69de29b..00000000
diff --git a/libsecondlife-cs/libsecondlife.csproj b/libsecondlife-cs/libsecondlife.csproj
index 6044e0da..21873f04 100644
--- a/libsecondlife-cs/libsecondlife.csproj
+++ b/libsecondlife-cs/libsecondlife.csproj
@@ -79,17 +79,6 @@
                     AssemblyName = "System.Xml"
                     HintPath = "..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
                 />
-                <Reference
-                    Name = "XmlRpcCS"
-                    Project = "{410F8877-F1E1-4696-ABC7-4339189EECC3}"
-                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-                />
-                <Reference
-                    Name = "Nii.JSON"
-                    Project = "{C40EB7FD-F957-4659-A184-A1C28908D748}"
-                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-                    Private = "True"
-                />
             </References>
         </Build>
         <Files>
@@ -149,6 +138,26 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "JSON\JSONArray.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "JSON\JSONFacade.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "JSON\JSONObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "JSON\JSONTokener.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "Packets\CommunicationPackets.cs"
                     SubType = "Code"
@@ -184,6 +193,66 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "XmlRpcCS\Logger.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlRpcCS\XmlRpcDeserializer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlRpcCS\XmlRpcErrorCodes.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlRpcCS\XmlRpcException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlRpcCS\XmlRpcRequest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlRpcCS\XmlRpcRequestDeserializer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlRpcCS\XmlRpcRequestSerializer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlRpcCS\XmlRpcResponse.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlRpcCS\XmlRpcResponseDeserializer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlRpcCS\XmlRpcResponseSerializer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlRpcCS\XmlRpcSerializer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlRpcCS\XmlRpcXmlTokens.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
             </Include>
         </Files>
     </CSHARP>
diff --git a/libsecondlife-cs/libsecondlife.sln b/libsecondlife-cs/libsecondlife.sln
index fa4d9f16..1aeff58c 100644
--- a/libsecondlife-cs/libsecondlife.sln
+++ b/libsecondlife-cs/libsecondlife.sln
@@ -3,14 +3,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libsecondlife", "libsecondl
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlRpcCS", "XmlRpcCS\XmlRpcCS.csproj", "{410F8877-F1E1-4696-ABC7-4339189EECC3}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nii.JSON", "JSONlib\Nii.JSON.csproj", "{C40EB7FD-F957-4659-A184-A1C28908D748}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sldump", "examples\sldump\sldump.csproj", "{F6258A68-C624-46A0-BA73-B55D21BB0A3B}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
@@ -45,14 +37,6 @@ Global
 		{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Debug.Build.0 = Debug|.NET
 		{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Release.ActiveCfg = Release|.NET
 		{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Release.Build.0 = Release|.NET
-		{410F8877-F1E1-4696-ABC7-4339189EECC3}.Debug.ActiveCfg = Debug|.NET
-		{410F8877-F1E1-4696-ABC7-4339189EECC3}.Debug.Build.0 = Debug|.NET
-		{410F8877-F1E1-4696-ABC7-4339189EECC3}.Release.ActiveCfg = Release|.NET
-		{410F8877-F1E1-4696-ABC7-4339189EECC3}.Release.Build.0 = Release|.NET
-		{C40EB7FD-F957-4659-A184-A1C28908D748}.Debug.ActiveCfg = Debug|.NET
-		{C40EB7FD-F957-4659-A184-A1C28908D748}.Debug.Build.0 = Debug|.NET
-		{C40EB7FD-F957-4659-A184-A1C28908D748}.Release.ActiveCfg = Release|.NET
-		{C40EB7FD-F957-4659-A184-A1C28908D748}.Release.Build.0 = Release|.NET
 		{F6258A68-C624-46A0-BA73-B55D21BB0A3B}.Debug.ActiveCfg = Debug|.NET
 		{F6258A68-C624-46A0-BA73-B55D21BB0A3B}.Debug.Build.0 = Debug|.NET
 		{F6258A68-C624-46A0-BA73-B55D21BB0A3B}.Release.ActiveCfg = Release|.NET