You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2012/04/13 11:12:44 UTC
svn commit: r1325674 [4/4] - in /thrift/trunk: ./ compiler/cpp/
compiler/cpp/src/generate/ contrib/ contrib/async-test/ contrib/fb303/
contrib/fb303/cpp/ contrib/zeromq/ lib/c_glib/ lib/c_glib/src/
lib/c_glib/src/processor/ lib/c_glib/src/protocol/ lib...
Modified: thrift/trunk/lib/cpp/test/GenericHelpers.h
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/test/GenericHelpers.h?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/test/GenericHelpers.h (original)
+++ thrift/trunk/lib/cpp/test/GenericHelpers.h Fri Apr 13 09:12:31 2012
@@ -20,9 +20,9 @@
#ifndef _THRIFT_TEST_GENERICHELPERS_H_
#define _THRIFT_TEST_GENERICHELPERS_H_ 1
-#include <protocol/TBinaryProtocol.h>
-#include <transport/TBufferTransports.h>
-#include <Thrift.h>
+#include <thrift/protocol/TBinaryProtocol.h>
+#include <thrift/transport/TBufferTransports.h>
+#include <thrift/Thrift.h>
using boost::shared_ptr;
using namespace apache::thrift::protocol;
Modified: thrift/trunk/lib/cpp/test/JSONProtoTest.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/test/JSONProtoTest.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/test/JSONProtoTest.cpp (original)
+++ thrift/trunk/lib/cpp/test/JSONProtoTest.cpp Fri Apr 13 09:12:31 2012
@@ -19,8 +19,8 @@
#include <iostream>
#include <cmath>
-#include <transport/TBufferTransports.h>
-#include <protocol/TJSONProtocol.h>
+#include <thrift/transport/TBufferTransports.h>
+#include <thrift/protocol/TJSONProtocol.h>
#include "gen-cpp/DebugProtoTest_types.h"
int main() {
Modified: thrift/trunk/lib/cpp/test/OptionalRequiredTest.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/test/OptionalRequiredTest.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/test/OptionalRequiredTest.cpp (original)
+++ thrift/trunk/lib/cpp/test/OptionalRequiredTest.cpp Fri Apr 13 09:12:31 2012
@@ -24,9 +24,9 @@
#include <cassert>
#include <map>
#include <iostream>
-#include <protocol/TDebugProtocol.h>
-#include <protocol/TBinaryProtocol.h>
-#include <transport/TBufferTransports.h>
+#include <thrift/protocol/TDebugProtocol.h>
+#include <thrift/protocol/TBinaryProtocol.h>
+#include <thrift/transport/TBufferTransports.h>
#include "gen-cpp/OptionalRequiredTest_types.h"
using std::cout;
Modified: thrift/trunk/lib/cpp/test/RWMutexStarveTest.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/test/RWMutexStarveTest.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/test/RWMutexStarveTest.cpp (original)
+++ thrift/trunk/lib/cpp/test/RWMutexStarveTest.cpp Fri Apr 13 09:12:31 2012
@@ -23,8 +23,8 @@
#include <boost/shared_ptr.hpp>
#include <boost/test/unit_test.hpp>
-#include "concurrency/Mutex.h"
-#include "concurrency/PosixThreadFactory.h"
+#include "thrift/concurrency/Mutex.h"
+#include "thrift/concurrency/PosixThreadFactory.h"
using boost::shared_ptr;
using boost::unit_test::test_suite;
Modified: thrift/trunk/lib/cpp/test/SpecializationTest.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/test/SpecializationTest.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/test/SpecializationTest.cpp (original)
+++ thrift/trunk/lib/cpp/test/SpecializationTest.cpp Fri Apr 13 09:12:31 2012
@@ -1,7 +1,7 @@
#include <iostream>
#include <cmath>
-#include <transport/TTransportUtils.h>
-#include <protocol/TBinaryProtocol.h>
+#include <thrift/transport/TTransportUtils.h>
+#include <thrift/protocol/TBinaryProtocol.h>
#include <gen-cpp/DebugProtoTest_types.h>
using std::cout;
Modified: thrift/trunk/lib/cpp/test/TBufferBaseTest.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/test/TBufferBaseTest.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/test/TBufferBaseTest.cpp (original)
+++ thrift/trunk/lib/cpp/test/TBufferBaseTest.cpp Fri Apr 13 09:12:31 2012
@@ -19,8 +19,8 @@
#include <algorithm>
#include <boost/test/auto_unit_test.hpp>
-#include <transport/TBufferTransports.h>
-#include <transport/TShortReadTransport.h>
+#include <thrift/transport/TBufferTransports.h>
+#include <thrift/transport/TShortReadTransport.h>
using std::string;
using boost::shared_ptr;
Modified: thrift/trunk/lib/cpp/test/TFDTransportTest.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/test/TFDTransportTest.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/test/TFDTransportTest.cpp (original)
+++ thrift/trunk/lib/cpp/test/TFDTransportTest.cpp Fri Apr 13 09:12:31 2012
@@ -19,8 +19,8 @@
#include <cstdlib>
#include <stdexcept>
-#include <Thrift.h>
-#include <transport/TFDTransport.h>
+#include <thrift/Thrift.h>
+#include <thrift/transport/TFDTransport.h>
using apache::thrift::transport::TTransportException;
using apache::thrift::transport::TFDTransport;
Modified: thrift/trunk/lib/cpp/test/TFileTransportTest.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/test/TFileTransportTest.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/test/TFileTransportTest.cpp (original)
+++ thrift/trunk/lib/cpp/test/TFileTransportTest.cpp Fri Apr 13 09:12:31 2012
@@ -29,7 +29,7 @@
#include <getopt.h>
#include <boost/test/unit_test.hpp>
-#include <transport/TFileTransport.h>
+#include <thrift/transport/TFileTransport.h>
using namespace apache::thrift::transport;
Modified: thrift/trunk/lib/cpp/test/TMemoryBufferTest.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/test/TMemoryBufferTest.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/test/TMemoryBufferTest.cpp (original)
+++ thrift/trunk/lib/cpp/test/TMemoryBufferTest.cpp Fri Apr 13 09:12:31 2012
@@ -21,8 +21,8 @@
#include <iostream>
#include <climits>
#include <cassert>
-#include <transport/TBufferTransports.h>
-#include <protocol/TBinaryProtocol.h>
+#include <thrift/transport/TBufferTransports.h>
+#include <thrift/protocol/TBinaryProtocol.h>
#include "gen-cpp/ThriftTest_types.h"
BOOST_AUTO_TEST_SUITE( TMemoryBufferTest )
Modified: thrift/trunk/lib/cpp/test/TPipedTransportTest.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/test/TPipedTransportTest.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/test/TPipedTransportTest.cpp (original)
+++ thrift/trunk/lib/cpp/test/TPipedTransportTest.cpp Fri Apr 13 09:12:31 2012
@@ -19,9 +19,9 @@
#include <cstdlib>
#include <stdexcept>
-#include <Thrift.h>
-#include <transport/TTransportUtils.h>
-#include <transport/TBufferTransports.h>
+#include <thrift/Thrift.h>
+#include <thrift/transport/TTransportUtils.h>
+#include <thrift/transport/TBufferTransports.h>
using namespace std;
using apache::thrift::transport::TTransportException;
using apache::thrift::transport::TPipedTransport;
Modified: thrift/trunk/lib/cpp/test/ThriftTest_extras.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/test/ThriftTest_extras.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/test/ThriftTest_extras.cpp (original)
+++ thrift/trunk/lib/cpp/test/ThriftTest_extras.cpp Fri Apr 13 09:12:31 2012
@@ -19,7 +19,7 @@
// Extra functions required for ThriftTest_types to work
-#include <protocol/TDebugProtocol.h>
+#include <thrift/protocol/TDebugProtocol.h>
#include "gen-cpp/ThriftTest_types.h"
Modified: thrift/trunk/lib/cpp/test/TransportTest.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/test/TransportTest.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/test/TransportTest.cpp (original)
+++ thrift/trunk/lib/cpp/test/TransportTest.cpp Fri Apr 13 09:12:31 2012
@@ -34,11 +34,11 @@
#include <boost/type_traits.hpp>
#include <boost/test/unit_test.hpp>
-#include <transport/TBufferTransports.h>
-#include <transport/TFDTransport.h>
-#include <transport/TFileTransport.h>
-#include <transport/TZlibTransport.h>
-#include <transport/TSocket.h>
+#include <thrift/transport/TBufferTransports.h>
+#include <thrift/transport/TFDTransport.h>
+#include <thrift/transport/TFileTransport.h>
+#include <thrift/transport/TZlibTransport.h>
+#include <thrift/transport/TSocket.h>
using namespace apache::thrift::transport;
Modified: thrift/trunk/lib/cpp/test/ZlibTest.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/test/ZlibTest.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/test/ZlibTest.cpp (original)
+++ thrift/trunk/lib/cpp/test/ZlibTest.cpp Fri Apr 13 09:12:31 2012
@@ -36,8 +36,8 @@
#include <boost/shared_array.hpp>
#include <boost/test/unit_test.hpp>
-#include <transport/TBufferTransports.h>
-#include <transport/TZlibTransport.h>
+#include <thrift/transport/TBufferTransports.h>
+#include <thrift/transport/TZlibTransport.h>
using namespace std;
using namespace boost;
Modified: thrift/trunk/test/cpp/src/StressTest.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/test/cpp/src/StressTest.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/test/cpp/src/StressTest.cpp (original)
+++ thrift/trunk/test/cpp/src/StressTest.cpp Fri Apr 13 09:12:31 2012
@@ -17,19 +17,19 @@
* under the License.
*/
-#include <concurrency/ThreadManager.h>
-#include <concurrency/PlatformThreadFactory.h>
-#include <concurrency/Monitor.h>
-#include <concurrency/Util.h>
-#include <concurrency/Mutex.h>
-#include <protocol/TBinaryProtocol.h>
-#include <server/TSimpleServer.h>
-#include <server/TThreadPoolServer.h>
-#include <server/TThreadedServer.h>
-#include <transport/TServerSocket.h>
-#include <transport/TSocket.h>
-#include <transport/TTransportUtils.h>
-#include <transport/TFileTransport.h>
+#include <thrift/concurrency/ThreadManager.h>
+#include <thrift/concurrency/PlatformThreadFactory.h>
+#include <thrift/concurrency/Monitor.h>
+#include <thrift/concurrency/Util.h>
+#include <thrift/concurrency/Mutex.h>
+#include <thrift/protocol/TBinaryProtocol.h>
+#include <thrift/server/TSimpleServer.h>
+#include <thrift/server/TThreadPoolServer.h>
+#include <thrift/server/TThreadedServer.h>
+#include <thrift/transport/TServerSocket.h>
+#include <thrift/transport/TSocket.h>
+#include <thrift/transport/TTransportUtils.h>
+#include <thrift/transport/TFileTransport.h>
#include <TLogging.h>
#include "Service.h"
Modified: thrift/trunk/test/cpp/src/StressTestNonBlocking.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/test/cpp/src/StressTestNonBlocking.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/test/cpp/src/StressTestNonBlocking.cpp (original)
+++ thrift/trunk/test/cpp/src/StressTestNonBlocking.cpp Fri Apr 13 09:12:31 2012
@@ -17,20 +17,20 @@
* under the License.
*/
-#include <concurrency/ThreadManager.h>
-#include <concurrency/PlatformThreadFactory.h>
-#include <concurrency/Monitor.h>
-#include <concurrency/Util.h>
-#include <concurrency/Mutex.h>
-#include <protocol/TBinaryProtocol.h>
-#include <server/TSimpleServer.h>
-#include <server/TThreadPoolServer.h>
-#include <server/TThreadedServer.h>
-#include <server/TNonblockingServer.h>
-#include <transport/TServerSocket.h>
-#include <transport/TSocket.h>
-#include <transport/TTransportUtils.h>
-#include <transport/TFileTransport.h>
+#include <thrift/concurrency/ThreadManager.h>
+#include <thrift/concurrency/PlatformThreadFactory.h>
+#include <thrift/concurrency/Monitor.h>
+#include <thrift/concurrency/Util.h>
+#include <thrift/concurrency/Mutex.h>
+#include <thrift/protocol/TBinaryProtocol.h>
+#include <thrift/server/TSimpleServer.h>
+#include <thrift/server/TThreadPoolServer.h>
+#include <thrift/server/TThreadedServer.h>
+#include <thrift/server/TNonblockingServer.h>
+#include <thrift/transport/TServerSocket.h>
+#include <thrift/transport/TSocket.h>
+#include <thrift/transport/TTransportUtils.h>
+#include <thrift/transport/TFileTransport.h>
#include <TLogging.h>
#include "Service.h"
Modified: thrift/trunk/test/cpp/src/TestClient.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/test/cpp/src/TestClient.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/test/cpp/src/TestClient.cpp (original)
+++ thrift/trunk/test/cpp/src/TestClient.cpp Fri Apr 13 09:12:31 2012
@@ -23,14 +23,14 @@
#include <iostream>
#include <unistd.h>
#include <sys/time.h>
-#include <protocol/TBinaryProtocol.h>
-#include <protocol/TJSONProtocol.h>
-#include <transport/THttpClient.h>
-#include <transport/TTransportUtils.h>
-#include <transport/TSocket.h>
-#include <transport/TSSLSocket.h>
-#include <async/TEvhttpClientChannel.h>
-#include <server/TNonblockingServer.h> // <event.h>
+#include <thrift/protocol/TBinaryProtocol.h>
+#include <thrift/protocol/TJSONProtocol.h>
+#include <thrift/transport/THttpClient.h>
+#include <thrift/transport/TTransportUtils.h>
+#include <thrift/transport/TSocket.h>
+#include <thrift/transport/TSSLSocket.h>
+#include <thrift/async/TEvhttpClientChannel.h>
+#include <thrift/server/TNonblockingServer.h> // <event.h>
#include <boost/shared_ptr.hpp>
#include <boost/program_options.hpp>
Modified: thrift/trunk/test/cpp/src/TestServer.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/test/cpp/src/TestServer.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/test/cpp/src/TestServer.cpp (original)
+++ thrift/trunk/test/cpp/src/TestServer.cpp Fri Apr 13 09:12:31 2012
@@ -20,23 +20,23 @@
#define __STDC_FORMAT_MACROS
#include <inttypes.h>
-#include <concurrency/ThreadManager.h>
-#include <concurrency/PlatformThreadFactory.h>
-#include <protocol/TBinaryProtocol.h>
-#include <protocol/TJSONProtocol.h>
-#include <server/TSimpleServer.h>
-#include <server/TThreadedServer.h>
-#include <server/TThreadPoolServer.h>
-#include <async/TEvhttpServer.h>
-#include <async/TAsyncBufferProcessor.h>
-#include <async/TAsyncProtocolProcessor.h>
-#include <server/TNonblockingServer.h>
-#include <transport/TServerSocket.h>
-#include <transport/TSSLServerSocket.h>
-#include <transport/TSSLSocket.h>
-#include <transport/THttpServer.h>
-#include <transport/THttpTransport.h>
-#include <transport/TTransportUtils.h>
+#include <thrift/concurrency/ThreadManager.h>
+#include <thrift/concurrency/PlatformThreadFactory.h>
+#include <thrift/protocol/TBinaryProtocol.h>
+#include <thrift/protocol/TJSONProtocol.h>
+#include <thrift/server/TSimpleServer.h>
+#include <thrift/server/TThreadedServer.h>
+#include <thrift/server/TThreadPoolServer.h>
+#include <thrift/async/TEvhttpServer.h>
+#include <thrift/async/TAsyncBufferProcessor.h>
+#include <thrift/async/TAsyncProtocolProcessor.h>
+#include <thrift/server/TNonblockingServer.h>
+#include <thrift/transport/TServerSocket.h>
+#include <thrift/transport/TSSLServerSocket.h>
+#include <thrift/transport/TSSLSocket.h>
+#include <thrift/transport/THttpServer.h>
+#include <thrift/transport/THttpTransport.h>
+#include <thrift/transport/TTransportUtils.h>
#include "ThriftTest.h"
#include <iostream>
Modified: thrift/trunk/test/threads/ThreadsClient.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/test/threads/ThreadsClient.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/test/threads/ThreadsClient.cpp (original)
+++ thrift/trunk/test/threads/ThreadsClient.cpp Fri Apr 13 09:12:31 2012
@@ -21,13 +21,13 @@
// You should copy it to another filename to avoid overwriting it.
#include "ThreadsTest.h"
-#include <protocol/TBinaryProtocol.h>
-#include <server/TThreadPoolServer.h>
-#include <transport/TSocket.h>
-#include <transport/TTransportUtils.h>
-#include <concurrency/Monitor.h>
-#include <concurrency/ThreadManager.h>
-#include <concurrency/PlatformThreadFactory.h>
+#include <thrift/protocol/TBinaryProtocol.h>
+#include <thrift/server/TThreadPoolServer.h>
+#include <thrift/transport/TSocket.h>
+#include <thrift/transport/TTransportUtils.h>
+#include <thrift/concurrency/Monitor.h>
+#include <thrift/concurrency/ThreadManager.h>
+#include <thrift/concurrency/PlatformThreadFactory.h>
using boost::shared_ptr;
using namespace apache::thrift;
Modified: thrift/trunk/test/threads/ThreadsServer.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/test/threads/ThreadsServer.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/test/threads/ThreadsServer.cpp (original)
+++ thrift/trunk/test/threads/ThreadsServer.cpp Fri Apr 13 09:12:31 2012
@@ -21,14 +21,14 @@
// You should copy it to another filename to avoid overwriting it.
#include "ThreadsTest.h"
-#include <protocol/TBinaryProtocol.h>
-#include <server/TThreadPoolServer.h>
-#include <server/TThreadedServer.h>
-#include <transport/TServerSocket.h>
-#include <transport/TTransportUtils.h>
-#include <concurrency/Monitor.h>
-#include <concurrency/ThreadManager.h>
-#include <concurrency/PlatformThreadFactory.h>
+#include <thrift/protocol/TBinaryProtocol.h>
+#include <thrift/server/TThreadPoolServer.h>
+#include <thrift/server/TThreadedServer.h>
+#include <thrift/transport/TServerSocket.h>
+#include <thrift/transport/TTransportUtils.h>
+#include <thrift/concurrency/Monitor.h>
+#include <thrift/concurrency/ThreadManager.h>
+#include <thrift/concurrency/PlatformThreadFactory.h>
using boost::shared_ptr;
using namespace apache::thrift;
Modified: thrift/trunk/tutorial/cpp/CppClient.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/tutorial/cpp/CppClient.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/tutorial/cpp/CppClient.cpp (original)
+++ thrift/trunk/tutorial/cpp/CppClient.cpp Fri Apr 13 09:12:31 2012
@@ -21,9 +21,9 @@
#include <unistd.h>
#include <sys/time.h>
-#include <protocol/TBinaryProtocol.h>
-#include <transport/TSocket.h>
-#include <transport/TTransportUtils.h>
+#include <thrift/protocol/TBinaryProtocol.h>
+#include <thrift/transport/TSocket.h>
+#include <thrift/transport/TTransportUtils.h>
#include "../gen-cpp/Calculator.h"
Modified: thrift/trunk/tutorial/cpp/CppServer.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/tutorial/cpp/CppServer.cpp?rev=1325674&r1=1325673&r2=1325674&view=diff
==============================================================================
--- thrift/trunk/tutorial/cpp/CppServer.cpp (original)
+++ thrift/trunk/tutorial/cpp/CppServer.cpp Fri Apr 13 09:12:31 2012
@@ -17,14 +17,14 @@
* under the License.
*/
-#include <concurrency/ThreadManager.h>
-#include <concurrency/PosixThreadFactory.h>
-#include <protocol/TBinaryProtocol.h>
-#include <server/TSimpleServer.h>
-#include <server/TThreadPoolServer.h>
-#include <server/TThreadedServer.h>
-#include <transport/TServerSocket.h>
-#include <transport/TTransportUtils.h>
+#include <thrift/concurrency/ThreadManager.h>
+#include <thrift/concurrency/PosixThreadFactory.h>
+#include <thrift/protocol/TBinaryProtocol.h>
+#include <thrift/server/TSimpleServer.h>
+#include <thrift/server/TThreadPoolServer.h>
+#include <thrift/server/TThreadedServer.h>
+#include <thrift/transport/TServerSocket.h>
+#include <thrift/transport/TTransportUtils.h>
#include <iostream>
#include <stdexcept>