Removed dead HTTP client adapter code

Partial conversion of group manager
clean up some debug code in web profiles.

6 files changed, 0 insertions, 469 deletions

diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index 51b8ed6c62..abdb418224 100755
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -48,7 +48,6 @@ set(llmessage_SOURCE_FILES
     llhost.cpp
     llhttpassetstorage.cpp
     llhttpclient.cpp
-    llhttpclientadapter.cpp
     llhttpconstants.cpp
     llhttpnode.cpp
 	llhttpsdhandler.cpp
@@ -143,7 +142,6 @@ set(llmessage_HEADER_FILES
     llhttpassetstorage.h
     llhttpclient.h
     llhttpclientinterface.h
-    llhttpclientadapter.h
     llhttpconstants.h
     llhttpnode.h
     llhttpnodeadapter.h
@@ -281,7 +279,6 @@ if (LL_TESTS)
 
   LL_ADD_INTEGRATION_TEST(llavatarnamecache "" "${test_libs}")
   LL_ADD_INTEGRATION_TEST(llhost "" "${test_libs}")
-  LL_ADD_INTEGRATION_TEST(llhttpclientadapter "" "${test_libs}")
   LL_ADD_INTEGRATION_TEST(llpartdata "" "${test_libs}")
   LL_ADD_INTEGRATION_TEST(llxfer_file "" "${test_libs}")
 endif (LL_TESTS)
diff --git a/indra/llmessage/llhttpclientadapter.cpp b/indra/llmessage/llhttpclientadapter.cpp
deleted file mode 100755
index 8c2a0ad9cf..0000000000
--- a/indra/llmessage/llhttpclientadapter.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/** 
- * @file llhttpclientadapter.cpp
- * @brief 
- *
- * $LicenseInfo:firstyear=2009&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#include "llhttpclientadapter.h"
-#include "llhttpclient.h"
-// 
-// LLHTTPClientAdapter::~LLHTTPClientAdapter() 
-// {
-// }
-// 
-// void LLHTTPClientAdapter::get(const std::string& url, LLCurl::ResponderPtr responder) 
-// {
-// 	LLSD empty_pragma_header;
-// 	// Pragma is required to stop curl adding "no-cache"
-// 	// Space is required to stop llurlrequest from turning off proxying
-// 	empty_pragma_header[HTTP_OUT_HEADER_PRAGMA] = " "; 
-// 	LLHTTPClient::get(url, responder, empty_pragma_header);
-// }
-// 
-// void LLHTTPClientAdapter::get(const std::string& url, LLCurl::ResponderPtr responder, const LLSD& headers) 
-// {
-// 	LLSD empty_pragma_header = headers;
-// 	if (!empty_pragma_header.has(HTTP_OUT_HEADER_PRAGMA))
-// 	{
-// 		// as above
-// 		empty_pragma_header[HTTP_OUT_HEADER_PRAGMA] = " ";
-// 	}
-// 	LLHTTPClient::get(url, responder, empty_pragma_header);
-// }
-// 
-// void LLHTTPClientAdapter::put(const std::string& url, const LLSD& body, LLCurl::ResponderPtr responder) 
-// {
-// 	LLHTTPClient::put(url, body, responder);
-// }
-// 
-// void LLHTTPClientAdapter::put(
-// 		const std::string& url,
-// 		const LLSD& body,
-// 		LLCurl::ResponderPtr responder,
-// 		const LLSD& headers)
-// {
-// 	LLHTTPClient::put(url, body, responder, headers);
-// }
-// 
-// void LLHTTPClientAdapter::del(
-// 	const std::string& url,
-// 	LLCurl::ResponderPtr responder)
-// {
-// 	LLHTTPClient::del(url, responder);
-// }
diff --git a/indra/llmessage/llhttpclientadapter.h b/indra/llmessage/llhttpclientadapter.h
deleted file mode 100755
index 0067703895..0000000000
--- a/indra/llmessage/llhttpclientadapter.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/** 
- * @file llhttpclientadepter.h
- * @brief 
- *
- * $LicenseInfo:firstyear=2008&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_HTTPCLIENTADAPTER_H
-#define LL_HTTPCLIENTADAPTER_H
-
-#include "llhttpclientinterface.h"
-#include "llsingleton.h"	// LLSingleton<>
-
-/*
-class LLHTTPClientAdapter : public LLHTTPClientInterface, public LLSingleton<LLHTTPClientAdapter>
-{
-public:
-	virtual ~LLHTTPClientAdapter();
-	virtual void get(const std::string& url, LLCurl::ResponderPtr responder);
-	virtual void get(const std::string& url, LLCurl::ResponderPtr responder, const LLSD& headers);
-	virtual void put(const std::string& url, const LLSD& body, LLCurl::ResponderPtr responder);
-	virtual void put(
-		const std::string& url,
-		const LLSD& body,
-		LLCurl::ResponderPtr responder,
-		const LLSD& headers);
-	virtual void del(
-		const std::string& url,
-		LLCurl::ResponderPtr responder);
-};
-*/
-
-#endif
-
diff --git a/indra/llmessage/tests/llhttpclientadapter_test.cpp b/indra/llmessage/tests/llhttpclientadapter_test.cpp
deleted file mode 100755
index e0a82e237b..0000000000
--- a/indra/llmessage/tests/llhttpclientadapter_test.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-/** 
- * @file llhttpclientadapter_test.cpp
- * @brief Tests for LLHTTPClientAdapter
- *
- * $LicenseInfo:firstyear=2008&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-#if 0
-#include "llhttpclientadapter.h"
-
-#include "../test/lltut.h"
-#include "llhttpclient.h"
-#include "llcurl_stub.cpp"
-
-float const HTTP_REQUEST_EXPIRY_SECS = 1.0F;
-
-std::vector<std::string> get_urls;
-std::vector< LLCurl::ResponderPtr > get_responders;
-void LLHTTPClient::get(const std::string& url, LLCurl::ResponderPtr responder, const LLSD& headers, const F32 timeout, bool follow_redirects)
-{
-	get_urls.push_back(url);
-	get_responders.push_back(responder);
-}
-
-std::vector<std::string> put_urls;
-std::vector<LLSD> put_body;
-std::vector<LLSD> put_headers;
-std::vector<LLCurl::ResponderPtr> put_responders;
-
-void LLHTTPClient::put(const std::string& url, const LLSD& body, LLCurl::ResponderPtr responder, const LLSD& headers, const F32 timeout)
-{
-	put_urls.push_back(url);
-	put_responders.push_back(responder);
-	put_body.push_back(body);
-	put_headers.push_back(headers);
-
-}
-
-std::vector<std::string> delete_urls;
-std::vector<LLCurl::ResponderPtr> delete_responders;
-
-void LLHTTPClient::del(
-	const std::string& url,
-	LLCurl::ResponderPtr responder,
-	const LLSD& headers,
-	const F32 timeout)
-{
-	delete_urls.push_back(url);
-	delete_responders.push_back(responder);
-}
-
-namespace tut
-{
-	struct LLHTTPClientAdapterData
-	{
-		LLHTTPClientAdapterData()
-		{
-			get_urls.clear();
-			get_responders.clear();
-			put_urls.clear();
-			put_responders.clear();
-			put_body.clear();
-			put_headers.clear();
-			delete_urls.clear();
-			delete_responders.clear();
-		}
-	};
-
-	typedef test_group<LLHTTPClientAdapterData> factory;
-	typedef factory::object object;
-}
-
-namespace
-{
-	tut::factory tf("LLHTTPClientAdapterData");
-}
-
-namespace tut
-{
-	// Ensure we can create the object
-	template<> template<>
-	void object::test<1>()
-	{
-		LLHTTPClientAdapter adapter;
-	}
-
-	// Does the get pass the appropriate arguments to the LLHTTPClient
-	template<> template<>
-	void object::test<2>()
-	{
-		LLHTTPClientAdapter adapter;
-
-		LLCurl::ResponderPtr responder = new LLCurl::Responder();
-
-		adapter.get("Made up URL", responder);
-		ensure_equals(get_urls.size(), 1);
-		ensure_equals(get_urls[0], "Made up URL");
-	}
-
-	// Ensure the responder matches the one passed to get
-	template<> template<>
-	void object::test<3>()
-	{
-		LLHTTPClientAdapter adapter;
-		LLCurl::ResponderPtr responder = new LLCurl::Responder();
-
-		adapter.get("Made up URL", responder);
-
-		ensure_equals(get_responders.size(), 1);
-		ensure_equals(get_responders[0].get(), responder.get());
-	}
-	
-	// Ensure the correct url is used in the put
-	template<> template<>
-	void object::test<4>()
-	{
-		LLHTTPClientAdapter adapter;
-
-		LLCurl::ResponderPtr responder = new LLCurl::Responder();
-
-		LLSD body;
-		body["TestBody"] = "Foobar";
-
-		adapter.put("Made up URL", body, responder);
-		ensure_equals(put_urls.size(), 1);
-		ensure_equals(put_urls[0], "Made up URL");
-	}
-
-	// Ensure the correct responder is used by put
-	template<> template<>
-	void object::test<5>()
-	{
-		LLHTTPClientAdapter adapter;
-
-		LLCurl::ResponderPtr responder = new LLCurl::Responder();
-
-		LLSD body;
-		body["TestBody"] = "Foobar";
-
-		adapter.put("Made up URL", body, responder);
-
-		ensure_equals(put_responders.size(), 1);
-		ensure_equals(put_responders[0].get(), responder.get());
-	}
-
-	// Ensure the message body is passed through the put properly
-	template<> template<>
-	void object::test<6>()
-	{
-		LLHTTPClientAdapter adapter;
-
-		LLCurl::ResponderPtr responder = new LLCurl::Responder();
-
-		LLSD body;
-		body["TestBody"] = "Foobar";
-
-		adapter.put("Made up URL", body, responder);
-
-		ensure_equals(put_body.size(), 1);
-		ensure_equals(put_body[0]["TestBody"].asString(), "Foobar");
-	}
-
-	// Ensure that headers are passed through put properly
-	template<> template<>
-	void object::test<7>()
-	{
-		LLHTTPClientAdapter adapter;
-
-		LLCurl::ResponderPtr responder = new LLCurl::Responder();
-
-		LLSD body = LLSD::emptyMap();
-		body["TestBody"] = "Foobar";
-
-		LLSD headers = LLSD::emptyMap();
-		headers["booger"] = "omg";
-
-		adapter.put("Made up URL", body, responder, headers);
-
-		ensure_equals("Header count", put_headers.size(), 1);
-		ensure_equals(
-			"First header",
-			put_headers[0]["booger"].asString(),
-			"omg");
-	}
-
-	// Ensure that del() passes appropriate arguments to the LLHTTPClient
-	template<> template<>
-	void object::test<8>()
-	{
-		LLHTTPClientAdapter adapter;
-
-		LLCurl::ResponderPtr responder = new LLCurl::Responder();
-
-		adapter.del("Made up URL", responder);
-
-		ensure_equals("URL count", delete_urls.size(), 1);
-		ensure_equals("Received URL", delete_urls[0], "Made up URL");
-
-		ensure_equals("Responder count", delete_responders.size(), 1);
-		//ensure_equals("Responder", delete_responders[0], responder);
-	}
-}
-
-#endif
\ No newline at end of file
diff --git a/indra/llmessage/tests/lltesthttpclientadapter.cpp b/indra/llmessage/tests/lltesthttpclientadapter.cpp
deleted file mode 100755
index 4539e4a540..0000000000
--- a/indra/llmessage/tests/lltesthttpclientadapter.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/** 
- * @file 
- * @brief 
- *
- * $LicenseInfo:firstyear=2008&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-#include "lltesthttpclientadapter.h"
-
-LLTestHTTPClientAdapter::LLTestHTTPClientAdapter()
-{
-}
-
-LLTestHTTPClientAdapter::~LLTestHTTPClientAdapter()
-{
-}
-
-void LLTestHTTPClientAdapter::get(const std::string& url, LLCurl::ResponderPtr responder)
-{
-	mGetUrl.push_back(url);
-	mGetResponder.push_back(responder);
-}
-
-void LLTestHTTPClientAdapter::put(const std::string& url, const LLSD& body, LLCurl::ResponderPtr responder)
-{
-	mPutUrl.push_back(url);
-	mPutBody.push_back(body);
-	mPutResponder.push_back(responder);
-}
-
-U32 LLTestHTTPClientAdapter::putCalls() const 
-{ 
-	return mPutUrl.size(); 
-}
-
-void LLTestHTTPClientAdapter::get(const std::string& url, LLCurl::ResponderPtr responder, const LLSD& headers)
-{
-	mGetUrl.push_back(url);
-	mGetHeaders.push_back(headers);
-	mGetResponder.push_back(responder);
-}
-
-
diff --git a/indra/llmessage/tests/lltesthttpclientadapter.h b/indra/llmessage/tests/lltesthttpclientadapter.h
deleted file mode 100755
index c29cbb3a2a..0000000000
--- a/indra/llmessage/tests/lltesthttpclientadapter.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/** 
- * @file 
- * @brief 
- *
- * $LicenseInfo:firstyear=2008&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-/* Macro Definitions */
-#ifndef LL_LLTESTHTTPCLIENTADAPTER_H
-#define LL_LLTESTHTTPCLIENTADAPTER_H
-
-
-#include "linden_common.h"
-#include "llhttpclientinterface.h"
-
-class LLTestHTTPClientAdapter : public LLHTTPClientInterface
-{
-public:
-	LLTestHTTPClientAdapter();
-	virtual ~LLTestHTTPClientAdapter();
-	virtual void get(const std::string& url, LLCurl::ResponderPtr responder);
-	virtual void get(const std::string& url, LLCurl::ResponderPtr responder, const LLSD& headers);
-
-	virtual void put(const std::string& url, const LLSD& body, LLCurl::ResponderPtr responder);
-	U32 putCalls() const;
-
-	std::vector<LLSD> mPutBody;
-	std::vector<LLSD> mGetHeaders;
-	std::vector<std::string> mPutUrl;
-	std::vector<std::string> mGetUrl;
-	std::vector<LLCurl::ResponderPtr> mPutResponder;
-	std::vector<LLCurl::ResponderPtr> mGetResponder;
-};
-
-
-
-#endif //LL_LLSIMULATORPRESENCESENDER_H
-