10 files changed, 178 insertions, 172 deletions

diff --git a/OpenGridServices.GridServer/GridHttp.cs b/OpenGridServices.GridServer/GridHttp.cs
index 5f8bd56..9e9246d 100644
--- a/OpenGridServices.GridServer/GridHttp.cs
+++ b/OpenGridServices.GridServer/GridHttp.cs
@@ -49,12 +49,17 @@ namespace OpenGridServices.GridServer
                 public HttpListener Listener;

         

                 public GridHTTPServer() : base( 8001 ) {

-                        MainConsole.Instance.WriteLine("Starting up HTTP Server");

-                        HTTPD = new Thread(new ThreadStart(StartHTTP));

-                        HTTPD.Start();

+                    Start();

                 }

 

-                public void StartHTTP() {

+            public void Start()

+            {

+                MainConsole.Instance.WriteLine("Starting up HTTP Server");

+                HTTPD = new Thread(new ThreadStart(StartHTTP));

+                HTTPD.Start();

+            }

+

+            public void StartHTTP() {

                         MainConsole.Instance.WriteLine("GridHttp.cs:StartHTTP() - Spawned main thread OK");

                         Listener = new HttpListener();

 

diff --git a/OpenGridServices.GridServer/Main.cs b/OpenGridServices.GridServer/Main.cs
index 192b10c..8c83bbf 100644
--- a/OpenGridServices.GridServer/Main.cs
+++ b/OpenGridServices.GridServer/Main.cs
@@ -105,6 +105,7 @@ namespace OpenGridServices.GridServer
 

             m_console.WriteLine("Main.cs:Startup() - Starting HTTP process");

             _httpd = new GridHTTPServer();

+            _httpd.Start();

 

             m_console.WriteLine("Main.cs:Startup() - Starting sim status checker");

             SimCheckTimer = new Timer();

diff --git a/OpenGridServices.UserServer/Main.cs b/OpenGridServices.UserServer/Main.cs
index 9c128d3..9132a54 100644
--- a/OpenGridServices.UserServer/Main.cs
+++ b/OpenGridServices.UserServer/Main.cs
@@ -97,6 +97,12 @@ namespace OpenGridServices.UserServer
 

                         MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting HTTP process");

                         _httpd = new UserHTTPServer();

+

+            _httpd.AddXmlRPCHandler("login_to_simulator", _profilemanager.XmlRpcLoginMethod);

+            _httpd.AddRestHandler( "DELETE", "/usersessions/", _profilemanager.RestDeleteUserSessionMethod );

+            

+                    _httpd.Start();

+

                 }

 

 
diff --git a/OpenGridServices.UserServer/UserHttp.cs b/OpenGridServices.UserServer/UserHttp.cs
index e1385f7..191fccb 100644
--- a/OpenGridServices.UserServer/UserHttp.cs
+++ b/OpenGridServices.UserServer/UserHttp.cs
@@ -52,6 +52,10 @@ namespace OpenGridServices.UserServer
 

         public UserHTTPServer() : base( 8002 )

         {

+        }

+

+        public void Start()

+        {

             MainConsole.Instance.WriteLine("Starting up HTTP Server");

             HTTPD = new Thread(new ThreadStart(StartHTTP));

             HTTPD.Start();

@@ -89,21 +93,13 @@ namespace OpenGridServices.UserServer
             switch (req_type)

             {

                 case "usersessions":

-                    LLUUID sessionid = new LLUUID(rest_params[2]);      // get usersessions/sessionid

+                    string param = rest_params[2];

+                    string result = "";

                     if (www_req.HttpMethod == "DELETE")

                     {

-                        foreach (libsecondlife.LLUUID UUID in OpenUser_Main.userserver._profilemanager.UserProfiles.Keys)

-                        {

-                            if (OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSessionID == sessionid)

-                            {

-                                OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSessionID = null;

-                                OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSecureSessionID = null;

-                                OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].Circuits.Clear();

-                            }

-                        }

-

+                       result = OpenUser_Main.userserver._profilemanager.RestDeleteUserSessionMethod( null, null, param );

                     }

-                    return "OK";

+                    return result;

             }

 

             return "";

diff --git a/OpenSim.Framework/UserProfileManager.cs b/OpenSim.Framework/UserProfileManager.cs
index bf11910..7c4fb6f 100644
--- a/OpenSim.Framework/UserProfileManager.cs
+++ b/OpenSim.Framework/UserProfileManager.cs
@@ -48,6 +48,22 @@ namespace OpenSim.Framework.User
             return "";

         }

 

+        public string RestDeleteUserSessionMethod( string request, string path, string param )

+        {

+            LLUUID sessionid = new LLUUID(param);       // get usersessions/sessionid

+            foreach (libsecondlife.LLUUID UUID in UserProfiles.Keys)

+            {

+                if ( UserProfiles[UUID].CurrentSessionID == sessionid)

+                {

+                     UserProfiles[UUID].CurrentSessionID = null;

+                     UserProfiles[UUID].CurrentSecureSessionID = null;

+                     UserProfiles[UUID].Circuits.Clear();

+                }

+            }

+

+            return "OK";

+        }

+

         public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)

         {

             XmlRpcResponse response = new XmlRpcResponse();

diff --git a/OpenSim.RegionServer/CAPS/AdminWebFront.cs b/OpenSim.RegionServer/CAPS/AdminWebFront.cs
index d4519e8..743d1a9 100644
--- a/OpenSim.RegionServer/CAPS/AdminWebFront.cs
+++ b/OpenSim.RegionServer/CAPS/AdminWebFront.cs
@@ -48,7 +48,7 @@ namespace OpenSim.CAPS
             server.AddRestHandler("POST", "/Admin/Login", PostLogin );      

         }

 

-        private string GetWelcomePage(string request, string path)

+        private string GetWelcomePage(string request, string path, string param)

         {

             string responseString;

             responseString = "Welcome to the OpenSim Admin Page";

@@ -56,7 +56,7 @@ namespace OpenSim.CAPS
             return responseString;

         }

 

-        private string PostLogin(string requestBody, string path)

+        private string PostLogin(string requestBody, string path, string param)

         {

             string responseString;

 // Console.WriteLine(requestBody);

@@ -73,7 +73,7 @@ namespace OpenSim.CAPS
             return responseString;

         }

 

-        private string PostNewAccount(string requestBody, string path)

+        private string PostNewAccount(string requestBody, string path, string param)

         {

             string responseString;

             string firstName = "";

@@ -122,7 +122,7 @@ namespace OpenSim.CAPS
             return responseString;

         }

 

-        private string GetConnectedClientsPage(string request, string path)

+        private string GetConnectedClientsPage(string request, string path, string param)

         {

             string responseString;

             responseString = " <p> Listing connected Clients </p>";

@@ -140,7 +140,7 @@ namespace OpenSim.CAPS
             return responseString;

         }

 

-        private string AddTestScript(string request, string path)

+        private string AddTestScript(string request, string path, string param)

         {

             int index = path.LastIndexOf('/');

 

@@ -159,13 +159,13 @@ namespace OpenSim.CAPS
                 return String.Format("Couldn't parse [{0}]", lluidStr );

             }

         }

-        

-        private string GetScriptsPage(string request, string path)

+

+        private string GetScriptsPage(string request, string path, string param)

         {

             return String.Empty;

         }

-        

-        private string GetEntitiesPage(string request, string path)

+

+        private string GetEntitiesPage(string request, string path, string param)

         {

             string responseString;

             responseString = " <p> Listing current entities</p><ul>";

@@ -179,7 +179,7 @@ namespace OpenSim.CAPS
             return responseString;

         }

 

-        private string GetClientsInventory(string request, string path)

+        private string GetClientsInventory(string request, string path, string param)

         {

             string[] line;

             string delimStr = "/";

@@ -208,12 +208,12 @@ namespace OpenSim.CAPS
             return responseString;

         }

 

-        private string GetCachedAssets(string request, string path)

+        private string GetCachedAssets(string request, string path, string param)

         {

             return "";

         }

 

-        private string GetAccountsPage(string request, string path)

+        private string GetAccountsPage(string request, string path, string param)

         {

             string responseString;

             responseString = "<p> Account management </p>";

@@ -223,7 +223,7 @@ namespace OpenSim.CAPS
             return responseString;

         }

 

-        private string GetAdminPage(string request, string path)

+        private string GetAdminPage(string request, string path, string param)

         {

             return AdminPage;

         }

diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index fcc6512..9ea32b1 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -197,7 +197,7 @@ namespace OpenSim
                         return new XmlRpcResponse();

                     });

                 _httpServer.AddRestHandler("GET", "/simstatus/",

-                    delegate(string request, string path)

+                    delegate(string request, string path, string param )

                     {

                         return "OK";

                     });

diff --git a/OpenSim.Servers/BaseHttpServer.cs b/OpenSim.Servers/BaseHttpServer.cs
index 2f73f46..0a123b7 100644
--- a/OpenSim.Servers/BaseHttpServer.cs
+++ b/OpenSim.Servers/BaseHttpServer.cs
@@ -12,9 +12,30 @@ namespace OpenSim.Servers
 {

     public class BaseHttpServer

     {

+        protected class RestMethodEntry

+        {

+            private string m_path;

+            public string Path

+            {

+                get { return m_path; }

+            }

+

+            private RestMethod m_restMethod;

+            public RestMethod RestMethod

+            {

+                get { return m_restMethod; }

+            }

+        

+            public RestMethodEntry( string path, RestMethod restMethod )

+            {

+                m_path = path;

+                m_restMethod = restMethod;

+            }

+        }

+        

         protected Thread m_workerThread;

         protected HttpListener m_httpListener;

-        protected Dictionary<string, RestMethod> m_restHandlers = new Dictionary<string, RestMethod>();

+        protected Dictionary<string, RestMethodEntry> m_restHandlers = new Dictionary<string, RestMethodEntry>();

         protected Dictionary<string, XmlRpcMethod> m_rpcHandlers = new Dictionary<string, XmlRpcMethod>();

         protected int m_port;

 

@@ -29,7 +50,7 @@ namespace OpenSim.Servers
                 

             if (!this.m_restHandlers.ContainsKey(methodKey))

             {

-                this.m_restHandlers.Add(methodKey, handler);

+                this.m_restHandlers.Add(methodKey, new RestMethodEntry( path, handler ));

                 return true;

             }

 

@@ -74,7 +95,6 @@ namespace OpenSim.Servers
         protected virtual string ParseREST(string request, string path, string method)

         {

             string response;

-            RestMethod handler;

             

             string requestKey = String.Format("{0}: {1}", method, path);

                     

@@ -89,10 +109,14 @@ namespace OpenSim.Servers
                     }

                 }

             }

-            

-            if (m_restHandlers.TryGetValue(bestMatch, out handler))

+

+            RestMethodEntry restMethodEntry;

+            if (m_restHandlers.TryGetValue(bestMatch, out restMethodEntry))

             {

-                response = handler(request, path);

+                RestMethod restMethod = restMethodEntry.RestMethod;

+

+                string param = path.Substring( restMethodEntry.Path.Length );

+                response = restMethod(request, path, param);

             

             }

             else

diff --git a/OpenSim.Servers/IRestHandler.cs b/OpenSim.Servers/IRestHandler.cs
index 08737cc..c322505 100644
--- a/OpenSim.Servers/IRestHandler.cs
+++ b/OpenSim.Servers/IRestHandler.cs
@@ -4,5 +4,5 @@ using System.Text;
 

 namespace OpenSim.Servers

 {

-    public delegate string RestMethod( string request, string path );

+    public delegate string RestMethod( string request, string path, string param );

 }

diff --git a/OpenSim.sln b/OpenSim.sln
index 58be9fe..47f7a5c 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -43,139 +43,97 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{21BFC8E2-0000-0000-0000-000000000000}"

 EndProject

 Global

-  GlobalSection(SolutionConfigurationPlatforms) = preSolution

-    Debug|Any CPU = Debug|Any CPU

-    Release|Any CPU = Release|Any CPU

-  EndGlobalSection

-  GlobalSection(ProjectDependencies) = postSolution

-    ({632E1BFD-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})

-    ({632E1BFD-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({632E1BFD-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({632E1BFD-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000})

-    ({632E1BFD-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000})

-    ({632E1BFD-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000})

-    ({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})

-    ({EE9E5D96-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({EE9E5D96-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({438A9556-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({438A9556-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({438A9556-0000-0000-0000-000000000000}).7 = ({8BE16150-0000-0000-0000-000000000000})

-    ({438A9556-0000-0000-0000-000000000000}).8 = ({8BB20F0A-0000-0000-0000-000000000000})

-    ({438A9556-0000-0000-0000-000000000000}).9 = ({632E1BFD-0000-0000-0000-000000000000})

-    ({E88EF749-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({8BE16150-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({8BE16150-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({97A82740-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({66591469-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({66591469-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({66591469-0000-0000-0000-000000000000}).5 = ({8BB20F0A-0000-0000-0000-000000000000})

-    ({4F874463-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})

-    ({B0027747-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({B0027747-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000})

-    ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({8BB20F0A-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({8BB20F0A-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({E1B79ECF-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({E1B79ECF-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({6B20B603-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({6B20B603-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({7E494328-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({7E494328-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({546099CD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({546099CD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({21BFC8E2-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})

-    ({21BFC8E2-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})

-    ({21BFC8E2-0000-0000-0000-000000000000}).5 = ({8BB20F0A-0000-0000-0000-000000000000})

-  EndGlobalSection

-  GlobalSection(ProjectConfigurationPlatforms) = postSolution

-    {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-    {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-    {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

-    {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

-    {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

-  EndGlobalSection

-  GlobalSection(SolutionProperties) = preSolution

-    HideSolutionNode = FALSE

-  EndGlobalSection

+        GlobalSection(SolutionConfigurationPlatforms) = preSolution

+                Debug|Any CPU = Debug|Any CPU

+                Release|Any CPU = Release|Any CPU

+        EndGlobalSection

+        GlobalSection(ProjectConfigurationPlatforms) = postSolution

+                {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+        EndGlobalSection

+        GlobalSection(SolutionProperties) = preSolution

+                HideSolutionNode = FALSE

+        EndGlobalSection

 EndGlobal