Added headers which move boost::network::http::* types into network::http. Updated examples accordingly.

Author: glynos

include/network/http/client.hpp

@@ -0,0 +1,22 @@
+//            Copyright (c) Glyn Matthews 2012.
+// Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//          http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef __NETWORK_HTTP_CLIENT_INC__
+# define __NETWORK_HTTP_CLIENT_INC__
+
+# include <boost/network/protocol/http/client.hpp>
+# include <network/http/request.hpp>
+# include <network/http/response.hpp>
+# include <network/http/errors.hpp>
+
+namespace network {
+using boost::network::header;
+
+namespace http {
+using boost::network::http::client;
+} // namespace http
+} // namespace network
+
+#endif // __NETWORK_HTTP_CLIENT_INC__

include/network/http/errors.hpp

@@ -0,0 +1,19 @@
+//            Copyright (c) Glyn Matthews 2012.
+// Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//          http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef __NETWORK_HTTP_ERRORS_INC__
+# define __NETWORK_HTTP_ERRORS_INC__
+
+# include <boost/network/protocol/http/errors.hpp>
+
+namespace network {
+namespace http {
+namespace errors {
+using boost::network::http::errors::connection_timeout;
+} // namespace errors
+} // namespace http
+} // namespace network
+
+#endif // __NETWORK_HTTP_ERRORS_INC__

include/network/http/request.hpp

@@ -0,0 +1,17 @@
+//            Copyright (c) Glyn Matthews 2012.
+// Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//          http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef __NETWORK_HTTP_REQUEST_INC__
+# define __NETWORK_HTTP_REQUEST_INC__
+
+# include <boost/network/protocol/http/request.hpp>
+
+namespace network {
+namespace http {
+using boost::network::http::request;
+} // namespace http
+} // namespace network
+
+#endif // __NETWORK_HTTP_REQUEST_INC__

include/network/http/response.hpp

@@ -0,0 +1,17 @@
+//            Copyright (c) Glyn Matthews 2012.
+// Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//          http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef __NETWORK_HTTP_RESPONSE_INC__
+# define __NETWORK_HTTP_RESPONSE_INC__
+
+# include <boost/network/protocol/http/response.hpp>
+
+namespace network {
+namespace http {
+using boost::network::http::response;
+} // namespace http
+} // namespace network
+
+#endif // __NETWORK_HTTP_RESPONSE_INC__

libs/network/example/CMakeLists.txt

@@ -10,7 +10,6 @@ if (OPENSSL_FOUND)
 endif (OPENSSL_FOUND)
 
 add_executable(uri_builder uri_builder.cpp)
-#add_executable(http_client http_client.cpp)
 add_executable(simple_wget simple_wget.cpp)
 add_executable(atom_reader atom/atom.cpp atom/main.cpp)
 add_executable(rss_reader rss/rss.cpp rss/main.cpp)
@@ -41,19 +40,6 @@ target_link_libraries(uri_builder
     ${CMAKE_THREAD_LIBS_INIT}
     cppnetlib-uri)
 
-#target_link_libraries(http_client
-#    ${BOOST_CLIENT_LIBS}
-#    ${CMAKE_THREAD_LIBS_INIT}
-#    cppnetlib-uri
-#    cppnetlib-message
-#    cppnetlib-message-directives
-#    cppnetlib-message-wrappers
-#    cppnetlib-http-message-wrappers
-#    cppnetlib-http-message
-#    cppnetlib-constants
-#    cppnetlib-http-client
-#    cppnetlib-http-client-connections)
-
 target_link_libraries(simple_wget
     ${BOOST_CLIENT_LIBS}
     ${CMAKE_THREAD_LIBS_INIT}
@@ -126,7 +112,6 @@ target_link_libraries(hello_world_client
 
 if (OPENSSL_FOUND)
   target_link_libraries(uri_builder ${OPENSSL_LIBRARIES})
-  #target_link_libraries(http_client ${OPENSSL_LIBRARIES})
   target_link_libraries(simple_wget ${OPENSSL_LIBRARIES})
   target_link_libraries(atom_reader ${OPENSSL_LIBRARIES})
   target_link_libraries(rss_reader ${OPENSSL_LIBRARIES})
@@ -144,7 +129,6 @@ endif (OPENSSL_FOUND)
 #endif (UNIX)
 
 set_target_properties(uri_builder PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
-#set_target_properties(http_client PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
 set_target_properties(simple_wget PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
 set_target_properties(atom_reader PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
 set_target_properties(rss_reader PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)

libs/network/example/Jamfile.v2

@@ -23,9 +23,6 @@ project network_test :
 
 exe uri : uri.cpp /cpp-netlib//cppnetlib-uri ;
 
-exe http_client : http_client.cpp /cpp-netlib//cppnetlib-uri /cpp-netlib//cppnetlib-client-connections ;
-
-exe http_client1 : http_client1.cpp /cpp-netlib//cppnetlib-uri /cpp-netlib//cppnetlib-client-connections ;
 
 exe simple_wget : simple_wget.cpp /cpp-netlib//cppnetlib-uri /cpp-netlib//cppnetlib-client-connections ;
 

libs/network/example/atom/atom.cpp

@@ -9,8 +9,6 @@
 #include <stdexcept>
 #include <cassert>
 
-
-namespace boost {
 namespace network {
 namespace atom {
 feed::feed(const http::client::response &response) {
@@ -94,4 +92,3 @@ feed::feed(const http::client::response &response) {
 }
 } // namespace atom
 } // namespace network
-} // namespace boost

libs/network/example/atom/atom.hpp

@@ -9,10 +9,9 @@
 
 # include <string>
 # include <vector>
-# include <boost/network/protocol/http.hpp>
+# include <network/http/client.hpp>
 
 
-namespace boost {
 namespace network {
 namespace atom {
 class entry {
@@ -172,6 +171,5 @@ class feed {
 };
 } // namespace atom
 } // namespace network
-} // namespace boost
 
 #endif // ___ATOM_INC__

libs/network/example/atom/main.cpp

@@ -1,16 +1,17 @@
-//            Copyright (c) Glyn Matthews 2011.
+//            Copyright (c) Glyn Matthews 2011, 2012.
 // Distributed under the Boost Software License, Version 1.0.
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
 
 #include "atom.hpp"
-#include <boost/network/protocol/http/client.hpp>
+#include <network/http/client.hpp>
 #include <boost/foreach.hpp>
 #include <iostream>
 
 int main(int argc, char * argv[]) {
-    using namespace boost::network;
+    namespace http = network::http;
+	namespace atom = network::atom;
 
     if (argc != 2) {
         std::cout << "Usage: " << argv[0] << " <url>" << std::endl;
@@ -20,7 +21,7 @@ int main(int argc, char * argv[]) {
     try {
         http::client client;
         http::client::request request(argv[1]);
-        request << header("Connection", "close");
+        request << network::header("Connection", "close");
         http::client::response response = client.get(request);
         atom::feed feed(response);
 

libs/network/example/http_client.cpp

@@ -5,12 +5,13 @@
 
 
 #include "rss.hpp"
-#include <boost/network/protocol/http/client.hpp>
+#include <network/http/client.hpp>
 #include <boost/foreach.hpp>
 #include <iostream>
 
 int main(int argc, char * argv[]) {
-    using namespace boost::network;
+    namespace http = network::http;
+	namespace rss = network::rss;
 
     if (argc != 2) {
         std::cout << "Usage: " << argv[0] << " <url>" << std::endl;
@@ -20,7 +21,7 @@ int main(int argc, char * argv[]) {
     try {
         http::client client;
         http::client::request request(argv[1]);
-        request << header("Connection", "close");
+        request << network::header("Connection", "close");
         http::client::response response = client.get(request);
         rss::channel channel(response);
 

libs/network/example/http_client1.cpp

@@ -9,8 +9,6 @@
 #include <stdexcept>
 #include <cassert>
 
-
-namespace boost {
 namespace network {
 namespace rss {
 channel::channel(const http::client::response &response) {
@@ -72,4 +70,3 @@ channel::channel(const http::client::response &response) {
 }
 } // namespace rss
 } // namespace network
-} // namespace boost

libs/network/example/rss/main.cpp

@@ -9,10 +9,9 @@
 
 # include <string>
 # include <vector>
-# include <boost/network/protocol/http.hpp>
+# include <network/http/client.hpp>
 
 
-namespace boost {
 namespace network {
 namespace rss {
 class item {
@@ -107,6 +106,5 @@ class channel {
 };
 } // namespace rss
 } // namespace network
-} // namespace boost
 
 #endif // ___RSS_INC__

libs/network/example/rss/rss.cpp

@@ -14,14 +14,14 @@
 */
 
 
-#include <boost/network/protocol/http/client.hpp>
+#include <network/http/client.hpp>
 #include <network/uri.hpp>
 #include <string>
 #include <fstream>
 #include <iostream>
 
 
-namespace http = boost::network::http;
+namespace http = network::http;
 
 
 namespace {

libs/network/example/rss/rss.hpp

@@ -4,7 +4,7 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 
 #include <network/uri/uri.hpp>
-#include <boost/network/protocol/http/client.hpp>
+#include <network/http/client.hpp>
 #include "rapidjson/rapidjson.h"
 #include "rapidjson/document.h"
 #include <iostream>
@@ -14,7 +14,7 @@
 // https://dev.twitter.com/docs/using-search
 
 int main(int argc, char *argv[]) {
-    namespace http = boost::network::http;
+    namespace http = network::http;
     using namespace rapidjson;
 
     if (argc != 2) {